diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-06 15:25:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-06 15:25:10 +0200 |
| commit | 3519acb3b0c294ef57cc015302b061b4fe85a208 (patch) | |
| tree | e1704a886d344664f471a22901b1641345d23680 /arch | |
| parent | Merge tag 'iio-fixes-for-3.15b' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus' (diff) | |
| download | linux-3519acb3b0c294ef57cc015302b061b4fe85a208.tar.xz linux-3519acb3b0c294ef57cc015302b061b4fe85a208.zip | |
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 @@ &tve { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_vga_sync_1>; - i2c-ddc-bus = <&i2c3>; + ddc-i2c-bus = <&i2c3>; fsl,tve-mode = "vga"; fsl,hsync-pin = <4>; fsl,vsync-pin = <6>; |