diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-06 09:25:10 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-06 09:25:10 -0400 |
| commit | 3519acb3b0c294ef57cc015302b061b4fe85a208 (patch) | |
| tree | e1704a886d344664f471a22901b1641345d23680 /arch | |
| parent | 86281966c7395aa9a13a20c52e26005f5e142451 (diff) | |
| parent | a3fe964135d0e4b925eaf4a5891c84daa7885c86 (diff) | |
Merge branch 'imx-drm-fixes-urgent' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-linus
imx drm fixes from Russell
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx53-mba53.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx53-mba53.dts b/arch/arm/boot/dts/imx53-mba53.dts index 7c8c12969892..a3431d784870 100644 --- a/arch/arm/boot/dts/imx53-mba53.dts +++ b/arch/arm/boot/dts/imx53-mba53.dts | |||
| @@ -244,7 +244,7 @@ | |||
| 244 | &tve { | 244 | &tve { |
| 245 | pinctrl-names = "default"; | 245 | pinctrl-names = "default"; |
| 246 | pinctrl-0 = <&pinctrl_vga_sync_1>; | 246 | pinctrl-0 = <&pinctrl_vga_sync_1>; |
| 247 | i2c-ddc-bus = <&i2c3>; | 247 | ddc-i2c-bus = <&i2c3>; |
| 248 | fsl,tve-mode = "vga"; | 248 | fsl,tve-mode = "vga"; |
| 249 | fsl,hsync-pin = <4>; | 249 | fsl,hsync-pin = <4>; |
| 250 | fsl,vsync-pin = <6>; | 250 | fsl,vsync-pin = <6>; |