[v4 0/2] Fix incorrect capability

[v4 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.

Changes in v4:
- Added commit message to change example nodes.
- Fixed spelling mistake.

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.10.0

--
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

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

[Jaedon Shin]

Changes to the DT binding document to separate the BCM7425 and the
BCM7445.

A compatible string "brcm,bcm7425-sdhci" was representing the BCM7425
SDHCI host controller with all BRCMSTB SoCs including the BCM7445. Now
it should be separated because vary a bit in initialize each host
controller.

- Renames the DT binding document to common name.
- Adds a compatible string "brcm,bcm7445-sdhci" that is representing the
  BCM7445 with thereafter 28nm generation ARM based SoCs.
- Updates example nodes to represent the BCM7445.

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.10.0

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

[Jaedon Shin]

Clear incorrect SDHCI_CAN_64BIT capability on Broadcom MIPS based SoCs.
The MIPS based SoCs are using ADMA only, but the several SoCs have the
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);
-- 
2.10.0

--
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: [v4 0/2] Fix incorrect capability

[Ulf Hansson]

On 9 September 2016 at 04:08, Jaedon Shin <jaedon.shin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> 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.
>
> Changes in v4:
> - Added commit message to change example nodes.
> - Fixed spelling mistake.
>
> 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.10.0
>

Thanks, applied for next!

I reverted the change from the DT example code, as Rob pointed out
it's an unnecessary change.

Kind regards
Uffe
--
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: [v4 1/2] mmc: DT: sdhci-brcmstb: Bindings document for common sdhci-brcmstb

[Rob Herring]

On Fri, Sep 09, 2016 at 11:08:39AM +0900, Jaedon Shin wrote:
> Changes to the DT binding document to separate the BCM7425 and the
> BCM7445.
> 
> A compatible string "brcm,bcm7425-sdhci" was representing the BCM7425
> SDHCI host controller with all BRCMSTB SoCs including the BCM7445. Now
> it should be separated because vary a bit in initialize each host
> controller.
> 
> - Renames the DT binding document to common name.
> - Adds a compatible string "brcm,bcm7445-sdhci" that is representing the
>   BCM7445 with thereafter 28nm generation ARM based SoCs.
> - Updates example nodes to represent the BCM7445.
> 
> 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%)

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
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