• Linus Torvalds's avatar
    Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6a57d104
    Linus Torvalds authored
    Pull ARM Soc updates, take 2, from Olof Johansson:
     "This is the second batch of SoC updates for the 3.8 merge window,
      containing parts that had dependencies on earlier branches such that
      we couldn't include them with the first branch.
    
      These are general updates for Samsung Exynos, Renesas/shmobile and a
      topic branch that adds SMP support to Altera's socfpga platform."
    
    Fix up conflicts mostly as per Olof.
    
    * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: EXYNOS: Clock settings for SATA and SATA PHY
      ARM: EXYNOS: Add ARM down clock support
      ARM: EXYNOS: Fix i2c suspend/resume for legacy controller
      ARM: EXYNOS: Add aliases for i2c controller
      ARM: EXYNOS: Setup legacy i2c controller interrupts
      sh: clkfwk: fixup unsed variable warning
      Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode"
      Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode"
      Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode"
      ARM: highbank: use common debug_ll_io_init
      ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
      ARM: shmobile: sh7372: remove fsidivx clock
      ARM: socfpga: mark secondary_trampoline as cpuinit
      socfpga: map uart into virtual address space so that early_printk() works
      ARM: socfpga: fix build break for allyesconfig
      ARM: socfpga: Enable SMP for socfpga
      ARM: EXYNOS: Add dp clock support for EXYNOS5
      ARM: SAMSUNG: call clk_get_rate for debugfs rate files
      ARM: SAMSUNG: add clock_tree debugfs file in clock
    6a57d104
exynos5250.dtsi 12.6 KB