diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 06:00:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 06:00:09 -0400 |
| commit | 84e12d992a54bc64590989b50d292e510a7d73cd (patch) | |
| tree | a666515dc97bb33415cd33ee734b3a3a00b4e961 /arch | |
| parent | 439c6109922c8faa920c9b8680d63937189d6915 (diff) | |
| parent | bb4e506565cfc0a2f534dfda1fb7ca5c26f7a604 (diff) | |
Merge tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH:
"Here are five staging driver fixes for 3.15-rc6 that resolve some
reported issues. They are for the imx and rtl8723au drivers"
* tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: rtl8723au: Do not reset wdev->iftype in netdev_close()
staging: rtl8723au: Use correct pipe type for USB interrupts
imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus'
imx-drm: imx-drm-core: skip components whose parent device is disabled
imx-drm: imx-drm-core: fix imx_drm_encoder_get_mux_id
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>; |