diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:53 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:53 +0100 |
| commit | b08ba4cdea50ace8a6752f4618b4c1270cc5f73e (patch) | |
| tree | eb0b79cd71c6d54b671fa2e781a467e6ad3cbcbf /arch | |
| parent | ab9e40722736523fc05ecc566f918fdfd8503d92 (diff) | |
| parent | 776180c795b58cb149da4f73b178ac205f1d725c (diff) | |
Merge branch 'lsk-3.10-armlt-drm-hdlcd' into integration-lsk-3.10-juno-android
Conflicts:
arch/arm64/boot/dts/juno.dts
linaro/configs/vexpress64.conf
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 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/juno.dts | 50 |
3 files changed, 52 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"; }; diff --git a/arch/arm64/boot/dts/juno.dts b/arch/arm64/boot/dts/juno.dts index a905e8f887c4..e0f6c5f9bbab 100644 --- a/arch/arm64/boot/dts/juno.dts +++ b/arch/arm64/boot/dts/juno.dts @@ -359,6 +359,56 @@ clock-names = "apb_pclk"; }; + hdlcd@7ff60000 { + compatible = "arm,hdlcd"; + reg = <0 0x7ff60000 0 0x1000>; + interrupts = <0 85 4>; + clocks = <&pixel_clk 0>; + clock-names = "pxlclk"; + i2c-slave = <&dvi0>; + + /* display-timings { + native-mode = <&timing0>; + timing0: timing@0 { + /* 1024 x 768 framebufer, standard VGA timings * / + clock-frequency = <65000>; + hactive = <1024>; + vactive = <768>; + hfront-porch = <24>; + hback-porch = <160>; + hsync-len = <136>; + vfront-porch = <3>; + vback-porch = <29>; + vsync-len = <6>; + }; + }; */ + }; + + /* hdlcd@7ff50000 { + compatible = "arm,hdlcd"; + reg = <0 0x7ff50000 0 0x1000>; + interrupts = <0 93 4>; + clocks = <&pixel_clk 1>; + clock-names = "pxlclk"; + i2c-slave = <&dvi1>; + + display-timings { + native-mode = <&timing1>; + timing1: timing@1 { + /* 1024 x 768 framebufer, standard VGA timings * / + clock-frequency = <65000>; + hactive = <1024>; + vactive = <768>; + hfront-porch = <24>; + hback-porch = <160>; + hsync-len = <136>; + vfront-porch = <3>; + vback-porch = <29>; + vsync-len = <6>; + }; + }; + }; */ + gpu: gpu@0x2d000000 { compatible = "arm,malit6xx", "arm,mali"; #cooling-cells = <2>; /* min followed by max */ |