summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2013-03-13 19:28:36 +0100
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:42:55 +0900
commit7fe80b747a60d3d0d9170b6659fe7eb6c5238958 (patch)
tree139c20cced38d90bd5c81f93b0e8a27078abda26 /arch/arm/boot/dts
parent4b602e143327def7364d4665ed1f0826cc881532 (diff)
downloadlinux-3.10-7fe80b747a60d3d0d9170b6659fe7eb6c5238958.tar.gz
linux-3.10-7fe80b747a60d3d0d9170b6659fe7eb6c5238958.tar.bz2
linux-3.10-7fe80b747a60d3d0d9170b6659fe7eb6c5238958.zip
ARM: dts: exynos4: Make ISP I2C1 device node a child of fimc-is node
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/exynos4x12.dtsi15
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 5ec724506a8..c2cdbffba7f 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -190,14 +190,6 @@
};
};
- i2c0_isp: i2c-isp@12130000 {
- compatible = "samsung,exynos4212-is-i2c",
- "samsung,s3c2440-i2c";
- reg = <0x12130000 0x100>;
- #address-cells = <1>;
- #size-cells = <0>;
- };
-
camera {
clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>,
<&clock 388>, <&clock 389>, <&clock 17>;
@@ -293,6 +285,13 @@
pmu {
reg = <0x10020000 0x3000>;
};
+
+ i2c1_isp: i2c-isp@12140000 {
+ compatible = "samsung,exynos4212-i2c-isp";
+ reg = <0x12130000 0x100>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
};