diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 15:01:25 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 15:01:25 -0500 |
| commit | 459d2a9f5fcf125ba736f7843189ccdfba11b1ff (patch) | |
| tree | 6664f0ae653081521a3e1df0c506a2532ae6168e /arch/arm/boot/dts/imx28.dtsi | |
| parent | 1428c20f7c38e9fbf59923d1b9615ebdaf2862b7 (diff) | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
Merge tag 'v3.7-rc7' into asoc-ux500
Linux 3.7-rc7
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 | }; |