diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-28 12:24:08 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-28 12:24:20 -0700 |
| commit | 775c4f66fd855e68a98fc5049003810fe98e2e20 (patch) | |
| tree | f5d8e44d5a335b60ee6e3d480a3f3a854b85d974 /arch/arm/boot/dts | |
| parent | a4591dcf743ac841f9a7d81399405b8fe77c87bf (diff) | |
| parent | 096ee6adcfb79a13ae04150023725c8a67e00ae8 (diff) | |
| download | op-kernel-dev-775c4f66fd855e68a98fc5049003810fe98e2e20.zip op-kernel-dev-775c4f66fd855e68a98fc5049003810fe98e2e20.tar.gz | |
Merge tag 'late-exynos-v3-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into late/dt
From Kukjin Kim:
This allows that device tree enables platform to setup a runtime IO
mapping for the chip id
* tag 'late-exynos-v3-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Add chip-id controller node on Exynos4/5 SoC
ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index b8771c5..7cfbbd3 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -38,6 +38,11 @@ i2c7 = &i2c_7; }; + chipid@10000000 { + compatible = "samsung,exynos4210-chipid"; + reg = <0x10000000 0x100>; + }; + pd_mfc: mfc-power-domain@10023C40 { compatible = "samsung,exynos4210-pd"; reg = <0x10023C40 0x20>; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index af66e6b..53c37f0 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -51,6 +51,11 @@ pinctrl3 = &pinctrl_3; }; + chipid@10000000 { + compatible = "samsung,exynos4210-chipid"; + reg = <0x10000000 0x100>; + }; + pd_gsc: gsc-power-domain@0x10044000 { compatible = "samsung,exynos4210-pd"; reg = <0x10044000 0x20>; |
