| From 9a0abd69551523478851347de9c18a038357241e Mon Sep 17 00:00:00 2001 |
| From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Date: Thu, 29 Aug 2013 17:14:49 +0200 |
| Subject: ARM: shmobile: update SDHI DT compatibility string to the |
| <unit>-<soc> format |
| |
| Currently DT compatibility strings of both types can be found in the kernel |
| sources: <unit>-<soc> and <soc>-<unit>, whereas a unique format should be |
| followed and the former one is preferred. This patch converts the SDHI |
| MMC driver and its users to the common standard. This is safe for now, since |
| ATM no real products are using this driver with DT. |
| |
| Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> |
| Acked-by: Chris Ball <cjb@laptop.org> |
| [Removed r8a7740.dtsi portion as it is not applicable] |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| (cherry picked from commit df1d0584b2292df5b9d576d7e5246e94616220a1) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 17 ++++++++++------- |
| arch/arm/boot/dts/r8a73a4.dtsi | 6 +++--- |
| arch/arm/boot/dts/r8a7790.dtsi | 8 ++++---- |
| arch/arm/boot/dts/sh73a0.dtsi | 6 +++--- |
| drivers/mmc/host/sh_mobile_sdhi.c | 16 ++++++++-------- |
| 5 files changed, 28 insertions(+), 25 deletions(-) |
| |
| --- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt |
| +++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt |
| @@ -9,12 +9,15 @@ compulsory and any optional properties, |
| described in mmc.txt, can be used. Additionally the following tmio_mmc-specific |
| optional bindings can be used. |
| |
| +Required properties: |
| +- compatible: "renesas,sdhi-shmobile" - a generic sh-mobile SDHI unit |
| + "renesas,sdhi-sh7372" - SDHI IP on SH7372 SoC |
| + "renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC |
| + "renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC |
| + "renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC |
| + "renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC |
| + "renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC |
| + "renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC |
| + |
| Optional properties: |
| - toshiba,mmc-wrprotect-disable: write-protect detection is unavailable |
| - |
| -When used with Renesas SDHI hardware, the following compatibility strings |
| -configure various model-specific properties: |
| - |
| -"renesas,sh7372-sdhi": (default) compatible with SH7372 |
| -"renesas,r8a7740-sdhi": compatible with R8A7740: certain MMC/SD commands have to |
| - wait for the interface to become idle. |
| --- a/arch/arm/boot/dts/r8a73a4.dtsi |
| +++ b/arch/arm/boot/dts/r8a73a4.dtsi |
| @@ -193,7 +193,7 @@ |
| }; |
| |
| sdhi0: sdhi@ee100000 { |
| - compatible = "renesas,r8a73a4-sdhi"; |
| + compatible = "renesas,sdhi-r8a73a4"; |
| reg = <0 0xee100000 0 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 165 4>; |
| @@ -202,7 +202,7 @@ |
| }; |
| |
| sdhi1: sdhi@ee120000 { |
| - compatible = "renesas,r8a73a4-sdhi"; |
| + compatible = "renesas,sdhi-r8a73a4"; |
| reg = <0 0xee120000 0 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 166 4>; |
| @@ -211,7 +211,7 @@ |
| }; |
| |
| sdhi2: sdhi@ee140000 { |
| - compatible = "renesas,r8a73a4-sdhi"; |
| + compatible = "renesas,sdhi-r8a73a4"; |
| reg = <0 0xee140000 0 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 167 4>; |
| --- a/arch/arm/boot/dts/r8a7790.dtsi |
| +++ b/arch/arm/boot/dts/r8a7790.dtsi |
| @@ -151,7 +151,7 @@ |
| }; |
| |
| sdhi0: sdhi@ee100000 { |
| - compatible = "renesas,r8a7790-sdhi"; |
| + compatible = "renesas,sdhi-r8a7790"; |
| reg = <0 0xee100000 0 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 165 4>; |
| @@ -160,7 +160,7 @@ |
| }; |
| |
| sdhi1: sdhi@ee120000 { |
| - compatible = "renesas,r8a7790-sdhi"; |
| + compatible = "renesas,sdhi-r8a7790"; |
| reg = <0 0xee120000 0 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 166 4>; |
| @@ -169,7 +169,7 @@ |
| }; |
| |
| sdhi2: sdhi@ee140000 { |
| - compatible = "renesas,r8a7790-sdhi"; |
| + compatible = "renesas,sdhi-r8a7790"; |
| reg = <0 0xee140000 0 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 167 4>; |
| @@ -178,7 +178,7 @@ |
| }; |
| |
| sdhi3: sdhi@ee160000 { |
| - compatible = "renesas,r8a7790-sdhi"; |
| + compatible = "renesas,sdhi-r8a7790"; |
| reg = <0 0xee160000 0 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 168 4>; |
| --- a/arch/arm/boot/dts/sh73a0.dtsi |
| +++ b/arch/arm/boot/dts/sh73a0.dtsi |
| @@ -196,7 +196,7 @@ |
| }; |
| |
| sdhi0: sdhi@ee100000 { |
| - compatible = "renesas,r8a7740-sdhi"; |
| + compatible = "renesas,sdhi-r8a7740"; |
| reg = <0xee100000 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 83 4 |
| @@ -208,7 +208,7 @@ |
| |
| /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */ |
| sdhi1: sdhi@ee120000 { |
| - compatible = "renesas,r8a7740-sdhi"; |
| + compatible = "renesas,sdhi-r8a7740"; |
| reg = <0xee120000 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 88 4 |
| @@ -219,7 +219,7 @@ |
| }; |
| |
| sdhi2: sdhi@ee140000 { |
| - compatible = "renesas,r8a7740-sdhi"; |
| + compatible = "renesas,sdhi-r8a7740"; |
| reg = <0xee140000 0x100>; |
| interrupt-parent = <&gic>; |
| interrupts = <0 104 4 |
| --- a/drivers/mmc/host/sh_mobile_sdhi.c |
| +++ b/drivers/mmc/host/sh_mobile_sdhi.c |
| @@ -113,14 +113,14 @@ static const struct sh_mobile_sdhi_ops s |
| }; |
| |
| static const struct of_device_id sh_mobile_sdhi_of_match[] = { |
| - { .compatible = "renesas,shmobile-sdhi" }, |
| - { .compatible = "renesas,sh7372-sdhi" }, |
| - { .compatible = "renesas,sh73a0-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,r8a73a4-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,r8a7740-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,r8a7778-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,r8a7779-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,r8a7790-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-shmobile" }, |
| + { .compatible = "renesas,sdhi-sh7372" }, |
| + { .compatible = "renesas,sdhi-sh73a0", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a73a4", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a7778", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a7779", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| {}, |
| }; |
| MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match); |