diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-31 18:08:10 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-31 18:08:10 -0500 |
| commit | a00928f55841f8a7d28120f967068255b89d41b1 (patch) | |
| tree | 76019137f7e4e15ca5bc49a0f677ba3a49bf759a | |
| parent | c2292c28263d6b5d69e4e88a24cb6952d5dab973 (diff) | |
| parent | 2450badfc19b67340d3570665cc02a22df03dfab (diff) | |
Merge tag 'renesas-dt-fixes2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Second Round of Renesas ARM Based SoC DT Fixes for v3.14
Correct i2c clock references for r8a7790 (R-Car H2) SoC
The error was introduced in 72197ca7a1cb1cea5 ("ARM: shmobile: r8a7790:
Reference clocks") which is queued up for v3.14.
* tag 'renesas-dt-fixes2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/r8a7790.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index f48487c2a970..71b1251f79c7 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi | |||
| @@ -197,7 +197,7 @@ | |||
| 197 | reg = <0 0xe6508000 0 0x40>; | 197 | reg = <0 0xe6508000 0 0x40>; |
| 198 | interrupt-parent = <&gic>; | 198 | interrupt-parent = <&gic>; |
| 199 | interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>; | 199 | interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>; |
| 200 | clocks = <&mstp3_clks R8A7790_CLK_I2C0>; | 200 | clocks = <&mstp9_clks R8A7790_CLK_I2C0>; |
| 201 | status = "disabled"; | 201 | status = "disabled"; |
| 202 | }; | 202 | }; |
| 203 | 203 | ||
| @@ -208,7 +208,7 @@ | |||
| 208 | reg = <0 0xe6518000 0 0x40>; | 208 | reg = <0 0xe6518000 0 0x40>; |
| 209 | interrupt-parent = <&gic>; | 209 | interrupt-parent = <&gic>; |
| 210 | interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>; | 210 | interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>; |
| 211 | clocks = <&mstp3_clks R8A7790_CLK_I2C1>; | 211 | clocks = <&mstp9_clks R8A7790_CLK_I2C1>; |
| 212 | status = "disabled"; | 212 | status = "disabled"; |
| 213 | }; | 213 | }; |
| 214 | 214 | ||
| @@ -219,7 +219,7 @@ | |||
| 219 | reg = <0 0xe6530000 0 0x40>; | 219 | reg = <0 0xe6530000 0 0x40>; |
| 220 | interrupt-parent = <&gic>; | 220 | interrupt-parent = <&gic>; |
| 221 | interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>; | 221 | interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>; |
| 222 | clocks = <&mstp3_clks R8A7790_CLK_I2C2>; | 222 | clocks = <&mstp9_clks R8A7790_CLK_I2C2>; |
| 223 | status = "disabled"; | 223 | status = "disabled"; |
| 224 | }; | 224 | }; |
| 225 | 225 | ||
| @@ -230,7 +230,7 @@ | |||
| 230 | reg = <0 0xe6540000 0 0x40>; | 230 | reg = <0 0xe6540000 0 0x40>; |
| 231 | interrupt-parent = <&gic>; | 231 | interrupt-parent = <&gic>; |
| 232 | interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>; | 232 | interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>; |
| 233 | clocks = <&mstp3_clks R8A7790_CLK_I2C3>; | 233 | clocks = <&mstp9_clks R8A7790_CLK_I2C3>; |
| 234 | status = "disabled"; | 234 | status = "disabled"; |
| 235 | }; | 235 | }; |
| 236 | 236 | ||
