aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2015-10-09 17:27:47 -0400
committerEric Anholt <eric@anholt.net>2015-10-23 05:04:02 -0400
commit121432c7a02f3818eefcad88c9ec428b7139b84a (patch)
treeefebcd350e1a51a62f00d2553fefc749682d9c3d
parent94cb7f76caa0b337acea7c9442a75083a0712c18 (diff)
ARM: bcm2835: Add the DDC I2C controller to the device tree.
We need to use it for getting video modes over HDMI. Signed-off-by: Eric Anholt <eric@anholt.net> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
-rw-r--r--arch/arm/boot/dts/bcm2835-rpi.dtsi4
-rw-r--r--arch/arm/boot/dts/bcm2835.dtsi10
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index ab5474e5d1c8..3572f0367baf 100644
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -52,6 +52,10 @@
52 clock-frequency = <100000>; 52 clock-frequency = <100000>;
53}; 53};
54 54
55&i2c2 {
56 status = "okay";
57};
58
55&sdhci { 59&sdhci {
56 status = "okay"; 60 status = "okay";
57 bus-width = <4>; 61 bus-width = <4>;
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 46804b3c4387..aef64de77495 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -167,6 +167,16 @@
167 status = "disabled"; 167 status = "disabled";
168 }; 168 };
169 169
170 i2c2: i2c@7e805000 {
171 compatible = "brcm,bcm2835-i2c";
172 reg = <0x7e805000 0x1000>;
173 interrupts = <2 21>;
174 clocks = <&clocks BCM2835_CLOCK_VPU>;
175 #address-cells = <1>;
176 #size-cells = <0>;
177 status = "disabled";
178 };
179
170 usb@7e980000 { 180 usb@7e980000 {
171 compatible = "brcm,bcm2835-usb"; 181 compatible = "brcm,bcm2835-usb";
172 reg = <0x7e980000 0x10000>; 182 reg = <0x7e980000 0x10000>;