diff options
| author | Jonas Andersson <jonas@microbit.se> | 2013-05-23 07:38:05 -0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-05-24 01:41:00 -0400 |
| commit | 37523dc5ec2fead0eb5235fd9334f0419013a1f2 (patch) | |
| tree | e8d577a848988aeeb6a855d9345b4c0f214abe80 | |
| parent | cc9a3e99949af4bcaf9027fc57f824b595a5fcac (diff) | |
ARM: dts: imx: fix clocks for cspi
The CSPI controller has only one clock, but the driver spi-imx.c needs
clock "per" to calculate bitrate divisor.
Signed-off-by: Jonas Andersson <jonas@microbit.se>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/imx25.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx27.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx51.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx53.dtsi | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index d2550e0bca24..701153992c69 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi | |||
| @@ -141,8 +141,8 @@ | |||
| 141 | #size-cells = <0>; | 141 | #size-cells = <0>; |
| 142 | compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; | 142 | compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; |
| 143 | reg = <0x43fa4000 0x4000>; | 143 | reg = <0x43fa4000 0x4000>; |
| 144 | clocks = <&clks 62>; | 144 | clocks = <&clks 62>, <&clks 62>; |
| 145 | clock-names = "ipg"; | 145 | clock-names = "ipg", "per"; |
| 146 | interrupts = <14>; | 146 | interrupts = <14>; |
| 147 | status = "disabled"; | 147 | status = "disabled"; |
| 148 | }; | 148 | }; |
| @@ -182,8 +182,8 @@ | |||
| 182 | compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; | 182 | compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; |
| 183 | reg = <0x50004000 0x4000>; | 183 | reg = <0x50004000 0x4000>; |
| 184 | interrupts = <0>; | 184 | interrupts = <0>; |
| 185 | clocks = <&clks 80>; | 185 | clocks = <&clks 80>, <&clks 80>; |
| 186 | clock-names = "ipg"; | 186 | clock-names = "ipg", "per"; |
| 187 | status = "disabled"; | 187 | status = "disabled"; |
| 188 | }; | 188 | }; |
| 189 | 189 | ||
| @@ -210,8 +210,8 @@ | |||
| 210 | #size-cells = <0>; | 210 | #size-cells = <0>; |
| 211 | compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; | 211 | compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; |
| 212 | reg = <0x50010000 0x4000>; | 212 | reg = <0x50010000 0x4000>; |
| 213 | clocks = <&clks 79>; | 213 | clocks = <&clks 79>, <&clks 79>; |
| 214 | clock-names = "ipg"; | 214 | clock-names = "ipg", "per"; |
| 215 | interrupts = <13>; | 215 | interrupts = <13>; |
| 216 | status = "disabled"; | 216 | status = "disabled"; |
| 217 | }; | 217 | }; |
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi index ff4bd4873edf..75bd11386516 100644 --- a/arch/arm/boot/dts/imx27.dtsi +++ b/arch/arm/boot/dts/imx27.dtsi | |||
| @@ -131,7 +131,7 @@ | |||
| 131 | compatible = "fsl,imx27-cspi"; | 131 | compatible = "fsl,imx27-cspi"; |
| 132 | reg = <0x1000e000 0x1000>; | 132 | reg = <0x1000e000 0x1000>; |
| 133 | interrupts = <16>; | 133 | interrupts = <16>; |
| 134 | clocks = <&clks 53>, <&clks 0>; | 134 | clocks = <&clks 53>, <&clks 53>; |
| 135 | clock-names = "ipg", "per"; | 135 | clock-names = "ipg", "per"; |
| 136 | status = "disabled"; | 136 | status = "disabled"; |
| 137 | }; | 137 | }; |
| @@ -142,7 +142,7 @@ | |||
| 142 | compatible = "fsl,imx27-cspi"; | 142 | compatible = "fsl,imx27-cspi"; |
| 143 | reg = <0x1000f000 0x1000>; | 143 | reg = <0x1000f000 0x1000>; |
| 144 | interrupts = <15>; | 144 | interrupts = <15>; |
| 145 | clocks = <&clks 52>, <&clks 0>; | 145 | clocks = <&clks 52>, <&clks 52>; |
| 146 | clock-names = "ipg", "per"; | 146 | clock-names = "ipg", "per"; |
| 147 | status = "disabled"; | 147 | status = "disabled"; |
| 148 | }; | 148 | }; |
| @@ -223,7 +223,7 @@ | |||
| 223 | compatible = "fsl,imx27-cspi"; | 223 | compatible = "fsl,imx27-cspi"; |
| 224 | reg = <0x10017000 0x1000>; | 224 | reg = <0x10017000 0x1000>; |
| 225 | interrupts = <6>; | 225 | interrupts = <6>; |
| 226 | clocks = <&clks 51>, <&clks 0>; | 226 | clocks = <&clks 51>, <&clks 51>; |
| 227 | clock-names = "ipg", "per"; | 227 | clock-names = "ipg", "per"; |
| 228 | status = "disabled"; | 228 | status = "disabled"; |
| 229 | }; | 229 | }; |
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 21bb786c5b31..53fdde69bbf4 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi | |||
| @@ -631,7 +631,7 @@ | |||
| 631 | compatible = "fsl,imx51-cspi", "fsl,imx35-cspi"; | 631 | compatible = "fsl,imx51-cspi", "fsl,imx35-cspi"; |
| 632 | reg = <0x83fc0000 0x4000>; | 632 | reg = <0x83fc0000 0x4000>; |
| 633 | interrupts = <38>; | 633 | interrupts = <38>; |
| 634 | clocks = <&clks 55>, <&clks 0>; | 634 | clocks = <&clks 55>, <&clks 55>; |
| 635 | clock-names = "ipg", "per"; | 635 | clock-names = "ipg", "per"; |
| 636 | status = "disabled"; | 636 | status = "disabled"; |
| 637 | }; | 637 | }; |
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index 845982eaac22..eb83aa039b8b 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi | |||
| @@ -714,7 +714,7 @@ | |||
| 714 | compatible = "fsl,imx53-cspi", "fsl,imx35-cspi"; | 714 | compatible = "fsl,imx53-cspi", "fsl,imx35-cspi"; |
| 715 | reg = <0x63fc0000 0x4000>; | 715 | reg = <0x63fc0000 0x4000>; |
| 716 | interrupts = <38>; | 716 | interrupts = <38>; |
| 717 | clocks = <&clks 55>, <&clks 0>; | 717 | clocks = <&clks 55>, <&clks 55>; |
| 718 | clock-names = "ipg", "per"; | 718 | clock-names = "ipg", "per"; |
| 719 | status = "disabled"; | 719 | status = "disabled"; |
| 720 | }; | 720 | }; |
