提交 2c2012b4 编写于 作者: K Krzysztof Kozlowski

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.
...@@ -76,6 +76,11 @@ ...@@ -76,6 +76,11 @@
reg = <0x10000000 0x100>; reg = <0x10000000 0x100>;
}; };
sromc@12570000 {
compatible = "samsung,exynos-srom";
reg = <0x12570000 0x14>;
};
mipi_phy: video-phy@10020710 { mipi_phy: video-phy@10020710 {
compatible = "samsung,s5pv210-mipi-video-phy"; compatible = "samsung,s5pv210-mipi-video-phy";
#phy-cells = <1>; #phy-cells = <1>;
......
...@@ -30,6 +30,11 @@ ...@@ -30,6 +30,11 @@
reg = <0x10000000 0x100>; reg = <0x10000000 0x100>;
}; };
sromc@12250000 {
compatible = "samsung,exynos-srom";
reg = <0x12250000 0x14>;
};
combiner: interrupt-controller@10440000 { combiner: interrupt-controller@10440000 {
compatible = "samsung,exynos4210-combiner"; compatible = "samsung,exynos4210-combiner";
#interrupt-cells = <2>; #interrupt-cells = <2>;
......
...@@ -101,6 +101,11 @@ ...@@ -101,6 +101,11 @@
reg = <0x10000000 0x100>; reg = <0x10000000 0x100>;
}; };
sromc: sromc@12250000 {
compatible = "samsung,exynos-srom";
reg = <0x12250000 0x14>;
};
pmu_system_controller: system-controller@10040000 { pmu_system_controller: system-controller@10040000 {
compatible = "samsung,exynos5410-pmu", "syscon"; compatible = "samsung,exynos5410-pmu", "syscon";
reg = <0x10040000 0x5000>; reg = <0x10040000 0x5000>;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册