• Linus Torvalds's avatar
    Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 7400c12e
    Linus Torvalds authored
    SoC-level changes for tegra and omap
    
    This adds support for the new tegra30 SoC, as well as small
    changes to support minor variations of existing omap SoCs.
    
    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits)
      arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF
      arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC
      arm/tegra: Delete tegra_init_clock()
      arm/tegra: Fix section mismatch errors in tegra30 pinmux
      arm/tegra: Fix section mismatch errors in tegra20 pinmux
      arm/tegra: refresh defconfig for tegra30
      arm/tegra: add support for tegra30 based board cardhu
      arm/tegra: implement support for tegra30
      arm/tegra: pinmux tables and definitions for tegra30
      arm/tegra: add new fields to struct tegra_pingroup_desc
      arm/tegra: prepare pinmux code for multiple tegra variants
      arm/tegra: rename tegra20 pinmux files
      arm/tegra: generalize L2 cache initialization
      arm/tegra: use PMC reset
      arm/tegra: rename board-dt.c to board-dt-tegra20.c
      arm/tegra: prepare early init for multiple tegra variants
      arm/tegra: don't export clk_measure_input_freq
      arm/tegra: prepare clock code for multiple tegra variants
      arm/tegra: cleanup tegra20 support
      arm/tegra: clk_get should not be fatal
      ...
    
    Fix up trivial conflict in arch/arm/mach-tegra/board-dt-tegra20.c
    7400c12e
serial.h 3.45 KB