diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 14:30:32 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 14:30:32 -0500 |
| commit | 24025f6f5821bf3715b283f6490212ac44d6a4fe (patch) | |
| tree | cb6fe5b1f7f389f1a5f38c10fb390c9fdb7be7f8 /arch/arm/boot/dts/Makefile | |
| parent | e642779b4994638d063e2f3ceedb99a565d98dfa (diff) | |
| parent | c47d244a646d08e2161b7fa22c5512e7988762ae (diff) | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a008e63f79ed..e1e2a6d119f2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
| @@ -25,6 +25,7 @@ dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ | |||
| 25 | dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ | 25 | dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ |
| 26 | exynos4210-smdkv310.dtb \ | 26 | exynos4210-smdkv310.dtb \ |
| 27 | exynos4210-trats.dtb \ | 27 | exynos4210-trats.dtb \ |
| 28 | exynos4412-smdk4412.dtb \ | ||
| 28 | exynos5250-smdk5250.dtb | 29 | exynos5250-smdk5250.dtb |
| 29 | dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb | 30 | dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb |
| 30 | dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ | 31 | dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ |