| From 61b695b5f120bf2c75af557e40ccc6352ad89266 Mon Sep 17 00:00:00 2001 |
| From: Ben Dooks <ben.dooks@codethink.co.uk> |
| Date: Mon, 16 Dec 2013 12:38:48 +0000 |
| Subject: ARM: shmobile: r8a7790: fix shdi resource sizes |
| |
| The r8a7790.dtsi file has four sdhi nodes which the first two have the wrong |
| resource size for their register block. This causes the sh_modbile_sdhi driver |
| to fail to communicate with card at-all. |
| |
| Change sdhi{0,1} node size from 0x100 to 0x200 to correct these nodes |
| as per Kuninori Morimoto's response to the original patch where all four |
| nodes where changed. sdhi{2,3} are the correct size. |
| |
| This bug has been present since sdhi resources were added to the r8a7790 by |
| 8c9b1aa41853272a ("ARM: shmobile: r8a7790: add MMCIF and SDHI DT |
| templates") in v3.11-rc2. |
| |
| Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> |
| Tested-by: William Towle <william.towle@codethink.co.uk> |
| Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit d721a15c300c5f638a11573a6dd492158e737d6a) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7790.dtsi | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi |
| index 68b7b87e535f..c6001032d9a7 100644 |
| --- a/arch/arm/boot/dts/r8a7790.dtsi |
| +++ b/arch/arm/boot/dts/r8a7790.dtsi |
| @@ -254,7 +254,7 @@ |
| |
| sdhi0: sd@ee100000 { |
| compatible = "renesas,sdhi-r8a7790"; |
| - reg = <0 0xee100000 0 0x100>; |
| + reg = <0 0xee100000 0 0x200>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| @@ -263,7 +263,7 @@ |
| |
| sdhi1: sd@ee120000 { |
| compatible = "renesas,sdhi-r8a7790"; |
| - reg = <0 0xee120000 0 0x100>; |
| + reg = <0 0xee120000 0 0x200>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| -- |
| 1.8.5.rc3 |
| |