diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-13 16:25:38 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-13 16:25:38 -0500 |
| commit | 89ab216b33ba9405880fd3d89531305a931bc70f (patch) | |
| tree | 8f6428ce51ecaed6f6e1379c036dbe341eb71e34 /arch/arm/boot/dts/imx28.dtsi | |
| parent | c9d501e5cb0238910337213e12a09127221c35d8 (diff) | |
| parent | 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91 (diff) | |
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
Diffstat (limited to 'arch/arm/boot/dts/imx28.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index e16d63155480..55c57ea6169e 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi | |||
| @@ -85,6 +85,7 @@ | |||
| 85 | interrupts = <88>, <41>; | 85 | interrupts = <88>, <41>; |
| 86 | interrupt-names = "gpmi-dma", "bch"; | 86 | interrupt-names = "gpmi-dma", "bch"; |
| 87 | clocks = <&clks 50>; | 87 | clocks = <&clks 50>; |
| 88 | clock-names = "gpmi_io"; | ||
| 88 | fsl,gpmi-dma-channel = <4>; | 89 | fsl,gpmi-dma-channel = <4>; |
| 89 | status = "disabled"; | 90 | status = "disabled"; |
| 90 | }; | 91 | }; |