[v3 0/2] Fix incorrect capability

[v3 0/2] Fix incorrect capability

[Jaedon Shin]

Hi all,

This patch serise fixes incorrect capability bit about ADMA 64-bit on
MIPS based BRCMSTB SoCs. This also includes the change of DT bindings.

Jaedon Shin (2):
  mmc: DT: sdhci-brcmstb: Bindings document for common sdhci-brcmstb
  mmc: sdhci-brcmstb: Fix incorrect capability

 .../mmc/{brcm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt}        | 8 +++++---
 drivers/mmc/host/sdhci-brcmstb.c                                  | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)
 rename Documentation/devicetree/bindings/mmc/{brcm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt} (81%)

-- 
2.9.3

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[v3 1/2] mmc: DT: sdhci-brcmstb: Bindings document for common sdhci-brcmstb

[Jaedon Shin]

- Renames the DT binding document to common for ARM and MIPS based SoCs
- Adds a compatible string "brcm,bcm7445-sdhci" that is representation
  for the Broadcom BCM7445 and family. It is initial and typical 28nm
  generation ARM based SoC.

Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com>
---
 .../mmc/{brcm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt}        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename Documentation/devicetree/bindings/mmc/{brcm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt} (81%)

diff --git a/Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
similarity index 81%
rename from Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt
rename to Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
index 82847174c37d..555229367935 100644
--- a/Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt
+++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
@@ -8,14 +8,16 @@ on Device Tree properties to enable them for SoC/Board combinations
 that support them.
 
 Required properties:
-- compatible: "brcm,bcm7425-sdhci"
+- compatible: should be one of the following
+  - "brcm,bcm7425-sdhci"
+  - "brcm,bcm7445-sdhci"
 
 Refer to clocks/clock-bindings.txt for generic clock consumer properties.
 
 Example:
 
 	sdhci@f03e0100 {
-		compatible = "brcm,bcm7425-sdhci";
+		compatible = "brcm,bcm7445-sdhci";
 		reg = <0xf03e0000 0x100>;
 		interrupts = <0x0 0x26 0x0>;
 		sdhci,auto-cmd12;
@@ -27,7 +29,7 @@ Example:
 	sdhci@f03e0300 {
 		non-removable;
 		bus-width = <0x8>;
-		compatible = "brcm,bcm7425-sdhci";
+		compatible = "brcm,bcm7445-sdhci";
 		reg = <0xf03e0200 0x100>;
 		interrupts = <0x0 0x27 0x0>;
 		sdhci,auto-cmd12;
-- 
2.9.3

Re: [v3 1/2] mmc: DT: sdhci-brcmstb: Bindings document for common sdhci-brcmstb

[Rob Herring]

On Tue, Aug 30, 2016 at 03:30:09PM +0900, Jaedon Shin wrote:
> - Renames the DT binding document to common for ARM and MIPS based SoCs
> - Adds a compatible string "brcm,bcm7445-sdhci" that is representation
>   for the Broadcom BCM7445 and family. It is initial and typical 28nm
>   generation ARM based SoC.
> 
> Signed-off-by: Jaedon Shin <jaedon.shin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  .../mmc/{brcm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt}        | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>  rename Documentation/devicetree/bindings/mmc/{brcm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt} (81%)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
> similarity index 81%
> rename from Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt
> rename to Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
> index 82847174c37d..555229367935 100644
> --- a/Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt
> +++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
> @@ -8,14 +8,16 @@ on Device Tree properties to enable them for SoC/Board combinations
>  that support them.
>  
>  Required properties:
> -- compatible: "brcm,bcm7425-sdhci"
> +- compatible: should be one of the following
> +  - "brcm,bcm7425-sdhci"
> +  - "brcm,bcm7445-sdhci"
>  
>  Refer to clocks/clock-bindings.txt for generic clock consumer properties.
>  
>  Example:
>  
>  	sdhci@f03e0100 {
> -		compatible = "brcm,bcm7425-sdhci";
> +		compatible = "brcm,bcm7445-sdhci";
>  		reg = <0xf03e0000 0x100>;
>  		interrupts = <0x0 0x26 0x0>;
>  		sdhci,auto-cmd12;
> @@ -27,7 +29,7 @@ Example:
>  	sdhci@f03e0300 {
>  		non-removable;
>  		bus-width = <0x8>;
> -		compatible = "brcm,bcm7425-sdhci";
> +		compatible = "brcm,bcm7445-sdhci";

These changes to the example seem pointless. Drop them.

>  		reg = <0xf03e0200 0x100>;
>  		interrupts = <0x0 0x27 0x0>;
>  		sdhci,auto-cmd12;
> -- 
> 2.9.3
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [v3 1/2] mmc: DT: sdhci-brcmstb: Bindings document for common sdhci-brcmstb

[Jaedon Shin]

Hi Rob,

On Sep 2, 2016, at 11:55 PM, Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
> 
> On Tue, Aug 30, 2016 at 03:30:09PM +0900, Jaedon Shin wrote:
>> - Renames the DT binding document to common for ARM and MIPS based SoCs
>> - Adds a compatible string "brcm,bcm7445-sdhci" that is representation
>>  for the Broadcom BCM7445 and family. It is initial and typical 28nm
>>  generation ARM based SoC.
>> 
>> Signed-off-by: Jaedon Shin <jaedon.shin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> ---
>> .../mmc/{brcm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt}        | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>> rename Documentation/devicetree/bindings/mmc/{brcm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt} (81%)
>> 
>> diff --git a/Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
>> similarity index 81%
>> rename from Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt
>> rename to Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
>> index 82847174c37d..555229367935 100644
>> --- a/Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt
>> +++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
>> @@ -8,14 +8,16 @@ on Device Tree properties to enable them for SoC/Board combinations
>> that support them.
>> 
>> Required properties:
>> -- compatible: "brcm,bcm7425-sdhci"
>> +- compatible: should be one of the following
>> +  - "brcm,bcm7425-sdhci"
>> +  - "brcm,bcm7445-sdhci"
>> 
>> Refer to clocks/clock-bindings.txt for generic clock consumer properties.
>> 
>> Example:
>> 
>> 	sdhci@f03e0100 {
>> -		compatible = "brcm,bcm7425-sdhci";
>> +		compatible = "brcm,bcm7445-sdhci";
>> 		reg = <0xf03e0000 0x100>;
>> 		interrupts = <0x0 0x26 0x0>;
>> 		sdhci,auto-cmd12;
>> @@ -27,7 +29,7 @@ Example:
>> 	sdhci@f03e0300 {
>> 		non-removable;
>> 		bus-width = <0x8>;
>> -		compatible = "brcm,bcm7425-sdhci";
>> +		compatible = "brcm,bcm7445-sdhci";
> 
> These changes to the example seem pointless. Drop them.

Previously, the compatible string "brcm,bcm7425-sdhci" is representation all
MIPS and ARM SoCs including bcm7445. If compatible string is split two strings,
the example devicetree node is wrong. It is for bcm7445.

I'll be add commit message this or
Will I need to create a new patch to change example nodes?

Thanks,
Jaedon

> 
>> 		reg = <0xf03e0200 0x100>;
>> 		interrupts = <0x0 0x27 0x0>;
>> 		sdhci,auto-cmd12;
>> -- 
>> 2.9.3

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[v3 2/2] mmc: sdhci-brcmstb: Fix incorrect capability

[Jaedon Shin]

Clear incorrect SDHCI_CAN_64BIT capatility on Broadcom MIPS based SoCs.
The MIPS based SoCs are using ADMA only, but the several SoCs have
incorrect capability bit about ADMA 64-bit. The "brcm,bcm7425-sdhci" is
compatible string for MIPS based SoC.

Signed-off-by: Jaedon Shin <jaedon.shin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/mmc/host/sdhci-brcmstb.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
index cce10fe3e19e..464d9f9a4c06 100644
--- a/drivers/mmc/host/sdhci-brcmstb.c
+++ b/drivers/mmc/host/sdhci-brcmstb.c
@@ -98,6 +98,8 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev)
 	 * properties through mmc_of_parse().
 	 */
 	host->caps = sdhci_readl(host, SDHCI_CAPABILITIES);
+	if (of_device_is_compatible(pdev->dev.of_node, "brcm,bcm7425-sdhci"))
+		host->caps &= ~SDHCI_CAN_64BIT;
 	host->caps1 = sdhci_readl(host, SDHCI_CAPABILITIES_1);
 	host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 |
 			SDHCI_SUPPORT_DDR50);
@@ -121,6 +123,7 @@ err_clk:
 
 static const struct of_device_id sdhci_brcm_of_match[] = {
 	{ .compatible = "brcm,bcm7425-sdhci" },
+	{ .compatible = "brcm,bcm7445-sdhci" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, sdhci_brcm_of_match);
-- 
2.9.3

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [v3 2/2] mmc: sdhci-brcmstb: Fix incorrect capability

[Adrian Hunter]

On 30/08/16 09:30, Jaedon Shin wrote:
> Clear incorrect SDHCI_CAN_64BIT capatility on Broadcom MIPS based SoCs.

capatility -> capability

> The MIPS based SoCs are using ADMA only, but the several SoCs have
> incorrect capability bit about ADMA 64-bit. The "brcm,bcm7425-sdhci" is
> compatible string for MIPS based SoC.
> 
> Signed-off-by: Jaedon Shin <jaedon.shin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

Acked-by: Adrian Hunter <adrian.hunter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

> ---
>  drivers/mmc/host/sdhci-brcmstb.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
> index cce10fe3e19e..464d9f9a4c06 100644
> --- a/drivers/mmc/host/sdhci-brcmstb.c
> +++ b/drivers/mmc/host/sdhci-brcmstb.c
> @@ -98,6 +98,8 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev)
>  	 * properties through mmc_of_parse().
>  	 */
>  	host->caps = sdhci_readl(host, SDHCI_CAPABILITIES);
> +	if (of_device_is_compatible(pdev->dev.of_node, "brcm,bcm7425-sdhci"))
> +		host->caps &= ~SDHCI_CAN_64BIT;
>  	host->caps1 = sdhci_readl(host, SDHCI_CAPABILITIES_1);
>  	host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 |
>  			SDHCI_SUPPORT_DDR50);
> @@ -121,6 +123,7 @@ err_clk:
>  
>  static const struct of_device_id sdhci_brcm_of_match[] = {
>  	{ .compatible = "brcm,bcm7425-sdhci" },
> +	{ .compatible = "brcm,bcm7445-sdhci" },
>  	{},
>  };
>  MODULE_DEVICE_TABLE(of, sdhci_brcm_of_match);
> 

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html