• Olof Johansson's avatar
    Merge branch 'next/dt-samsung' of... · 24025f6f
    Olof Johansson authored
    Merge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
    
    From Kukjin Kim:
    
    Here is Samsung DT for v3.8 and this is including DT for EXYNOS4X12
    SoC, SMDK4412 board, pinctrl for exynos4x12, TMU, MFC, SATA and SATA
    PHY.
    
    As I commented on [4/7], this branch merged pinctrl/samsung to support
    pinctrl for exynos4x12 without useless merge conflicts.
    
    * 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (32 commits)
      ARM: EXYNOS: DT Support for SATA and SATA PHY
      ARM: dts: Remove broken-voltage property from sdhci node for exynos4210-trats
      ARM: dts: Add node for touchscreen for exynos4210-trats
      ARM: dts: Add node for touchscreen voltage regulator for exynos4210-trats
      ARM: dts: Add node for i2c3 bus for exynos4210-trats
      ARM: dts: Add nodes for GPIO keys available on Trats
      ARM: dts: Update for pinctrl-samsung driver for exynos4210-trats
      ARM: dts: Add nodes for pin controllers for exynos4x12
      pinctrl: samsung: Add support for EXYNOS4X12
      gpio: samsung: Skip registration if pinctrl driver is present on EXYNOS4X12
      ARM: EXYNOS: Skip wakeup-int setup if pinctrl driver is used on EXYNOS4X12
      ARM: dts: add board dts file for EXYNOS4412 based SMDK board
      ARM: dts: Add support for EXYNOS4X12 SoCs
      ARM: EXYNOS: Add devicetree node for TMU driver for exynos5
      ARM: EXYNOS: Add devicetree node for TMU driver for exynos4
      ARM: EXYNOS: Add MFC device tree support
      ARM: dts: Enable serial controllers on Origen and SMDKV310
      Documentation: Update samsung-pinctrl device tree bindings documentation
      pinctrl: samsung: Add GPIO to IRQ translation
      pinctrl: exynos: Set pin function to EINT in irq_set_type of wake-up EINT
      ...
    
    Add/add conflicts in:
    	arch/arm/boot/dts/exynos5250-smdk5250.dts
    	arch/arm/boot/dts/exynos5250.dtsi
    	arch/arm/mach-exynos/mach-exynos5-dt.c
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    24025f6f
mach-exynos5-dt.c 4.9 KB