diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2016-01-25 04:48:07 +0300 |
|---|---|---|
| committer | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2016-01-25 04:48:07 +0300 |
| commit | 2c2012b4e2200cd7009405742ca7e5b709d0b21f (patch) | |
| tree | da2b7610382f52fe23bfe74374eaaeda5e7023a4 /arch/arm/boot/dts | |
| parent | 1eca825f5dfeeb657e99cb07b271602adec622a6 (diff) | |
| parent | d2deef6c61e65d1e0cee40c1d74fa99007da8c84 (diff) | |
| download | linux-2c2012b4e2200cd7009405742ca7e5b709d0b21f.tar.xz | |
Merge tag 'samsung-dt-srom-4.6' into next/dt
Device Tree changes for v4.6 adding the nodes for Exynos SROM controller
driver. The driver saves and restores SROM registers during suspend to RAM.
DT changes should go in before removal of SROM support from mach-exynos.
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5410.dtsi | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 045785c44c04..ca621a92319e 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -76,6 +76,11 @@ reg = <0x10000000 0x100>; }; + sromc@12570000 { + compatible = "samsung,exynos-srom"; + reg = <0x12570000 0x14>; + }; + mipi_phy: video-phy@10020710 { compatible = "samsung,s5pv210-mipi-video-phy"; #phy-cells = <1>; diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index e2439e87ee4a..b61d1f637510 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -30,6 +30,11 @@ reg = <0x10000000 0x100>; }; + sromc@12250000 { + compatible = "samsung,exynos-srom"; + reg = <0x12250000 0x14>; + }; + combiner: interrupt-controller@10440000 { compatible = "samsung,exynos4210-combiner"; #interrupt-cells = <2>; diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi index b0a27c095e22..88f6a1be0593 100644 --- a/arch/arm/boot/dts/exynos5410.dtsi +++ b/arch/arm/boot/dts/exynos5410.dtsi @@ -101,6 +101,11 @@ reg = <0x10000000 0x100>; }; + sromc: sromc@12250000 { + compatible = "samsung,exynos-srom"; + reg = <0x12250000 0x14>; + }; + pmu_system_controller: system-controller@10040000 { compatible = "samsung,exynos5410-pmu", "syscon"; reg = <0x10040000 0x5000>; |