diff options
| author | Liviu Dudau <Liviu.Dudau@arm.com> | 2013-12-12 18:27:00 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-06-30 10:12:45 +0100 |
| commit | f85e789ec45d7ae23400a7d93826df7e4dac660c (patch) | |
| tree | 3ba6265aaeaf113036babc05b6b66dce4de35c09 /arch | |
| parent | dc26e5ce62b57d8e4cd698832a86a621d5abb6d0 (diff) | |
arm: vexpress: Update the hdlcd node in DT to match bindings.
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Conflicts:
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi index 9584232ee6b6..314e0d9b0002 100644 --- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi @@ -201,7 +201,7 @@ #address-cells = <1>; #size-cells = <0>; - dvi-transmitter@39 { + dvi_i2c_slave: dvi-transmitter@39 { compatible = "sil,sii9022-tpi", "sil,sii9022"; reg = <0x39>; }; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts index f1dc620c5c45..a6650860af23 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts @@ -147,6 +147,7 @@ interrupts = <0 85 4>; mode = "1024x768-16@60"; framebuffer = <0 0xff000000 0 0x01000000>; + i2c-slave = <&dvi_i2c_slave>; clocks = <&oscclk5>; clock-names = "pxlclk"; }; |