diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-03-28 11:04:53 -0700 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2016-03-28 11:04:53 -0700 |
| commit | 9b8284b6d0351d5fd5f9d8c526de185edd066689 (patch) | |
| tree | 9331b4efc858546f9b16a39ad0b8f4872e151d15 /arch | |
| parent | 2ec8b7f8a380a92b8e2d60a9a074326fed138f55 (diff) | |
| parent | b976c5f1d8be3905d3d91d8598ab1b9e97b10b22 (diff) | |
Merge branch 'vf610-dcu-drm-4.4' into toradex_vf_4.4-next
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/vfxxx.dtsi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi index 98666b403546..11a15f0affe6 100644 --- a/arch/arm/boot/dts/vfxxx.dtsi +++ b/arch/arm/boot/dts/vfxxx.dtsi @@ -455,8 +455,9 @@ compatible = "fsl,vf610-dcu"; reg = <0x40058000 0x1200>; interrupts = <30 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clks VF610_CLK_DCU0>; - clock-names = "dcu"; + clocks = <&clks VF610_CLK_DCU0>, + <&clks VF610_CLK_DCU0_DIV>; + clock-names = "dcu", "pix"; fsl,tcon = <&tcon0>; status = "disabled"; }; |