| From 70340c23abe732d397b5c9ea926ca42519dc074c Mon Sep 17 00:00:00 2001 |
| From: Ryo Kataoka <ryo.kataoka.wt@renesas.com> |
| Date: Sun, 5 Apr 2015 01:55:12 +0900 |
| Subject: [PATCH 016/129] ARM: shmobile: r8a7791: Remove MSIOF address from |
| device tree |
| |
| MSIOF Base Address H'E6xx can be accessed by CPU and DMAC. |
| MSIOF Base Address H'E7xx for DMAC was removed from H/W manual. |
| |
| Signed-off-by: Ryo Kataoka <ryo.kataoka.wt@renesas.com> |
| Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> |
| Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit cb6d08a2b61fc0025a0148d06b71b8a7d0920e98) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +- |
| arch/arm/boot/dts/r8a7791.dtsi | 6 +++--- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/Documentation/devicetree/bindings/spi/sh-msiof.txt |
| +++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt |
| @@ -60,7 +60,7 @@ Example: |
| |
| msiof0: spi@e6e20000 { |
| compatible = "renesas,msiof-r8a7791"; |
| - reg = <0 0xe6e20000 0 0x0064>, <0 0xe7e20000 0 0x0064>; |
| + reg = <0 0xe6e20000 0 0x0064>; |
| interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>; |
| clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>; |
| dmas = <&dmac0 0x51>, <&dmac0 0x52>; |
| --- a/arch/arm/boot/dts/r8a7791.dtsi |
| +++ b/arch/arm/boot/dts/r8a7791.dtsi |
| @@ -1300,7 +1300,7 @@ |
| |
| msiof0: spi@e6e20000 { |
| compatible = "renesas,msiof-r8a7791"; |
| - reg = <0 0xe6e20000 0 0x0064>, <0 0xe7e20000 0 0x0064>; |
| + reg = <0 0xe6e20000 0 0x0064>; |
| interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>; |
| clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>; |
| dmas = <&dmac0 0x51>, <&dmac0 0x52>; |
| @@ -1312,7 +1312,7 @@ |
| |
| msiof1: spi@e6e10000 { |
| compatible = "renesas,msiof-r8a7791"; |
| - reg = <0 0xe6e10000 0 0x0064>, <0 0xe7e10000 0 0x0064>; |
| + reg = <0 0xe6e10000 0 0x0064>; |
| interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>; |
| clocks = <&mstp2_clks R8A7791_CLK_MSIOF1>; |
| dmas = <&dmac0 0x55>, <&dmac0 0x56>; |
| @@ -1324,7 +1324,7 @@ |
| |
| msiof2: spi@e6e00000 { |
| compatible = "renesas,msiof-r8a7791"; |
| - reg = <0 0xe6e00000 0 0x0064>, <0 0xe7e00000 0 0x0064>; |
| + reg = <0 0xe6e00000 0 0x0064>; |
| interrupts = <0 158 IRQ_TYPE_LEVEL_HIGH>; |
| clocks = <&mstp2_clks R8A7791_CLK_MSIOF2>; |
| dmas = <&dmac0 0x41>, <&dmac0 0x42>; |
