[PATCH 0/7] Add support for SD card in AM654x-evm

[PATCH 0/7] Add support for SD card in AM654x-evm

[Faiz Abbas]

The following patches add driver support for SD card on the
am654x-evm. It only enables high speed mode with UHS mode
support coming in a future series.

DTS support will be added in another series as well.

Faiz Abbas (7):
  dt-bindings: mmc: sdhci-am654: Add ti,clkbuf-sel binding
  mmc: sdhci_am654: Add flag for PHY calibration
  mmc: sdhci_am654: Add Support for SR2.0
  mmc: sdhci_am654: Fix conditions for enabling dll
  mmc: sdhci_am654: Update delay chain configuration
  mmc: sdhci_am654: Add support for clkbuf_sel property
  arm64: defconfig: Enable AM654x SDHCI controller

 .../devicetree/bindings/mmc/sdhci-am654.txt   |  1 +
 arch/arm64/configs/defconfig                  |  1 +
 drivers/mmc/host/sdhci_am654.c                | 86 ++++++++++++++-----
 3 files changed, 65 insertions(+), 23 deletions(-)

-- 
2.17.1

[PATCH 1/7] dt-bindings: mmc: sdhci-am654: Add ti,clkbuf-sel binding

[Faiz Abbas]

Add documentation for the clock buffer select phy property in the
am654x and j721e 4 bit IP

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
 Documentation/devicetree/bindings/mmc/sdhci-am654.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/mmc/sdhci-am654.txt b/Documentation/devicetree/bindings/mmc/sdhci-am654.txt
index c6ccecb9ae5a..6d202f4d9249 100644
--- a/Documentation/devicetree/bindings/mmc/sdhci-am654.txt
+++ b/Documentation/devicetree/bindings/mmc/sdhci-am654.txt
@@ -39,6 +39,7 @@ Optional Properties (Required for ti,am654-sdhci-5.1 and ti,j721e-sdhci-8bit):
 				  Valid values are 33, 40, 50, 66 and 100 ohms.
 Optional Properties:
 	- ti,strobe-sel: strobe select delay for HS400 speed mode. Default value: 0x0.
+	- ti,clkbuf-sel: Clock Delay Buffer Select
 
 Example:
 
-- 
2.17.1

[PATCH 2/7] mmc: sdhci_am654: Add flag for PHY calibration

[Faiz Abbas]

Not all controllers need calibration for the PHY DLL. Add a DLL_CALIB flag
to indicate the same.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
 drivers/mmc/host/sdhci_am654.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 061b4398a4f1..85a05344f825 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -97,6 +97,7 @@ struct sdhci_am654_driver_data {
 #define FREQSEL_2_BIT	(1 << 1)
 #define STRBSEL_4_BIT	(1 << 2)
 #define DLL_PRESENT	(1 << 3)
+#define DLL_CALIB	(1 << 4)
 };
 
 struct timing_data {
@@ -325,7 +326,8 @@ static const struct sdhci_pltfm_data sdhci_am654_pdata = {
 
 static const struct sdhci_am654_driver_data sdhci_am654_drvdata = {
 	.pdata = &sdhci_am654_pdata,
-	.flags = IOMUX_PRESENT | FREQSEL_2_BIT | STRBSEL_4_BIT | DLL_PRESENT,
+	.flags = IOMUX_PRESENT | FREQSEL_2_BIT | STRBSEL_4_BIT | DLL_PRESENT |
+		 DLL_CALIB,
 };
 
 static struct sdhci_ops sdhci_j721e_8bit_ops = {
@@ -348,7 +350,7 @@ static const struct sdhci_pltfm_data sdhci_j721e_8bit_pdata = {
 
 static const struct sdhci_am654_driver_data sdhci_j721e_8bit_drvdata = {
 	.pdata = &sdhci_j721e_8bit_pdata,
-	.flags = DLL_PRESENT,
+	.flags = DLL_PRESENT | DLL_CALIB,
 };
 
 static struct sdhci_ops sdhci_j721e_4bit_ops = {
@@ -469,7 +471,7 @@ static int sdhci_am654_init(struct sdhci_host *host)
 	mask = OTAPDLYENA_MASK | OTAPDLYSEL_MASK;
 	regmap_update_bits(sdhci_am654->base, PHY_CTRL4, mask, 0x0);
 
-	if (sdhci_am654->flags & DLL_PRESENT) {
+	if (sdhci_am654->flags & DLL_CALIB) {
 		regmap_read(sdhci_am654->base, PHY_STAT1, &val);
 		if (~val & CALDONE_MASK) {
 			/* Calibrate IO lines */
-- 
2.17.1

[PATCH 3/7] mmc: sdhci_am654: Add Support for SR2.0

[Faiz Abbas]

Add Support for AM65x PG2.0. Use the SoC bus framework to fixup
the driver data and skip do DLL calibration if the revision is 1.0

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
 drivers/mmc/host/sdhci_am654.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 85a05344f825..365eb2819dd9 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -11,6 +11,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
+#include <linux/sys_soc.h>
 
 #include "cqhci.h"
 #include "sdhci-pltfm.h"
@@ -324,12 +325,17 @@ static const struct sdhci_pltfm_data sdhci_am654_pdata = {
 	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
 };
 
-static const struct sdhci_am654_driver_data sdhci_am654_drvdata = {
+static const struct sdhci_am654_driver_data sdhci_am654_sr1_drvdata = {
 	.pdata = &sdhci_am654_pdata,
 	.flags = IOMUX_PRESENT | FREQSEL_2_BIT | STRBSEL_4_BIT | DLL_PRESENT |
 		 DLL_CALIB,
 };
 
+static const struct sdhci_am654_driver_data sdhci_am654_drvdata = {
+	.pdata = &sdhci_am654_pdata,
+	.flags = IOMUX_PRESENT | FREQSEL_2_BIT | STRBSEL_4_BIT | DLL_PRESENT,
+};
+
 static struct sdhci_ops sdhci_j721e_8bit_ops = {
 	.get_max_clock = sdhci_pltfm_clk_get_max_clock,
 	.get_timeout_clock = sdhci_pltfm_clk_get_max_clock,
@@ -376,6 +382,14 @@ static const struct sdhci_am654_driver_data sdhci_j721e_4bit_drvdata = {
 	.flags = IOMUX_PRESENT,
 };
 
+static const struct soc_device_attribute sdhci_am654_devices[] = {
+	{ .family = "AM65X",
+	  .revision = "SR1.0",
+	  .data = &sdhci_am654_sr1_drvdata
+	},
+	{/* sentinel */}
+};
+
 static void sdhci_am654_dumpregs(struct mmc_host *mmc)
 {
 	sdhci_dumpregs(mmc_priv(mmc));
@@ -587,6 +601,7 @@ static const struct of_device_id sdhci_am654_of_match[] = {
 static int sdhci_am654_probe(struct platform_device *pdev)
 {
 	const struct sdhci_am654_driver_data *drvdata;
+	const struct soc_device_attribute *soc;
 	struct sdhci_pltfm_host *pltfm_host;
 	struct sdhci_am654_data *sdhci_am654;
 	const struct of_device_id *match;
@@ -598,6 +613,12 @@ static int sdhci_am654_probe(struct platform_device *pdev)
 
 	match = of_match_node(sdhci_am654_of_match, pdev->dev.of_node);
 	drvdata = match->data;
+
+	/* Update drvdata based on SoC revision */
+	soc = soc_device_match(sdhci_am654_devices);
+	if (soc && soc->data)
+		drvdata = soc->data;
+
 	host = sdhci_pltfm_init(pdev, drvdata->pdata, sizeof(*sdhci_am654));
 	if (IS_ERR(host))
 		return PTR_ERR(host);
-- 
2.17.1

[PATCH 4/7] mmc: sdhci_am654: Fix conditions for enabling dll

[Faiz Abbas]

The clock > CLOCK_TOO_SLOW_HZ condition gating phy configuration
is only required because dll should not be enabled at too low a
clock frequency or too low timing. Make sure that this condition
only gates dll enablement.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
 drivers/mmc/host/sdhci_am654.c | 42 ++++++++++++++++------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 365eb2819dd9..8b0f69012d09 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -204,34 +204,32 @@ static void sdhci_am654_set_clock(struct sdhci_host *host, unsigned int clock)
 
 	sdhci_set_clock(host, clock);
 
-	if (clock > CLOCK_TOO_SLOW_HZ) {
-		/* Setup DLL Output TAP delay */
-		if (sdhci_am654->legacy_otapdly)
-			otap_del_sel = sdhci_am654->otap_del_sel[0];
-		else
-			otap_del_sel = sdhci_am654->otap_del_sel[timing];
+	/* Setup DLL Output TAP delay */
+	if (sdhci_am654->legacy_otapdly)
+		otap_del_sel = sdhci_am654->otap_del_sel[0];
+	else
+		otap_del_sel = sdhci_am654->otap_del_sel[timing];
 
-		otap_del_ena = (timing > MMC_TIMING_UHS_SDR25) ? 1 : 0;
+	otap_del_ena = (timing > MMC_TIMING_UHS_SDR25) ? 1 : 0;
 
-		mask = OTAPDLYENA_MASK | OTAPDLYSEL_MASK;
-		val = (otap_del_ena << OTAPDLYENA_SHIFT) |
-		      (otap_del_sel << OTAPDLYSEL_SHIFT);
+	mask = OTAPDLYENA_MASK | OTAPDLYSEL_MASK;
+	val = (otap_del_ena << OTAPDLYENA_SHIFT) |
+	      (otap_del_sel << OTAPDLYSEL_SHIFT);
 
-		/* Write to STRBSEL for HS400 speed mode */
-		if (timing == MMC_TIMING_MMC_HS400) {
-			if (sdhci_am654->flags & STRBSEL_4_BIT)
-				mask |= STRBSEL_4BIT_MASK;
-			else
-				mask |= STRBSEL_8BIT_MASK;
+	/* Write to STRBSEL for HS400 speed mode */
+	if (timing == MMC_TIMING_MMC_HS400) {
+		if (sdhci_am654->flags & STRBSEL_4_BIT)
+			mask |= STRBSEL_4BIT_MASK;
+		else
+			mask |= STRBSEL_8BIT_MASK;
 
-			val |= sdhci_am654->strb_sel << STRBSEL_SHIFT;
-		}
+		val |= sdhci_am654->strb_sel << STRBSEL_SHIFT;
+	}
 
-		regmap_update_bits(sdhci_am654->base, PHY_CTRL4, mask, val);
+	regmap_update_bits(sdhci_am654->base, PHY_CTRL4, mask, val);
 
-		if (timing > MMC_TIMING_UHS_SDR25)
-			sdhci_am654_setup_dll(host, clock);
-	}
+	if (timing > MMC_TIMING_UHS_SDR25 && clock > CLOCK_TOO_SLOW_HZ)
+		sdhci_am654_setup_dll(host, clock);
 }
 
 static void sdhci_j721e_4bit_set_clock(struct sdhci_host *host,
-- 
2.17.1

[PATCH 5/7] mmc: sdhci_am654: Update delay chain configuration

[Faiz Abbas]

For speed modes where DLL is not enabled write to TXDLYCLK to enable
transmitter delay chain mode.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
 drivers/mmc/host/sdhci_am654.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 8b0f69012d09..f7535ee3a232 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -61,6 +61,8 @@
 #define CALDONE_MASK		BIT(CALDONE_SHIFT)
 #define RETRIM_SHIFT		17
 #define RETRIM_MASK		BIT(RETRIM_SHIFT)
+#define SELDLYTXCLK_SHIFT	17
+#define SELDLYTXCLK_MASK	BIT(SELDLYTXCLK_SHIFT)
 
 #define DRIVER_STRENGTH_50_OHM	0x0
 #define DRIVER_STRENGTH_33_OHM	0x1
@@ -228,8 +230,14 @@ static void sdhci_am654_set_clock(struct sdhci_host *host, unsigned int clock)
 
 	regmap_update_bits(sdhci_am654->base, PHY_CTRL4, mask, val);
 
-	if (timing > MMC_TIMING_UHS_SDR25 && clock > CLOCK_TOO_SLOW_HZ)
+	if (timing > MMC_TIMING_UHS_SDR25 && clock > CLOCK_TOO_SLOW_HZ) {
+		regmap_update_bits(sdhci_am654->base, PHY_CTRL5,
+				   SELDLYTXCLK_MASK, 0);
 		sdhci_am654_setup_dll(host, clock);
+	} else {
+		regmap_update_bits(sdhci_am654->base, PHY_CTRL5,
+				   SELDLYTXCLK_MASK, 1 << SELDLYTXCLK_SHIFT);
+	}
 }
 
 static void sdhci_j721e_4bit_set_clock(struct sdhci_host *host,
-- 
2.17.1

[PATCH 6/7] mmc: sdhci_am654: Add support for clkbuf_sel property

[Faiz Abbas]

Add support for writing new clkbuf_sel property for the J721e 4 bit IP.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
---
 drivers/mmc/host/sdhci_am654.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index f7535ee3a232..f9d24af12396 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -47,6 +47,8 @@
 #define SEL100_MASK		BIT(SEL100_SHIFT)
 #define FREQSEL_SHIFT		8
 #define FREQSEL_MASK		GENMASK(10, 8)
+#define CLKBUFSEL_SHIFT		0
+#define CLKBUFSEL_MASK		GENMASK(2, 0)
 #define DLL_TRIM_ICP_SHIFT	4
 #define DLL_TRIM_ICP_MASK	GENMASK(7, 4)
 #define DR_TY_SHIFT		20
@@ -86,6 +88,7 @@ struct sdhci_am654_data {
 	struct regmap *base;
 	bool legacy_otapdly;
 	int otap_del_sel[11];
+	int clkbuf_sel;
 	int trm_icp;
 	int drv_strength;
 	bool dll_on;
@@ -238,6 +241,9 @@ static void sdhci_am654_set_clock(struct sdhci_host *host, unsigned int clock)
 		regmap_update_bits(sdhci_am654->base, PHY_CTRL5,
 				   SELDLYTXCLK_MASK, 1 << SELDLYTXCLK_SHIFT);
 	}
+
+	regmap_update_bits(sdhci_am654->base, PHY_CTRL5, CLKBUFSEL_MASK,
+			   sdhci_am654->clkbuf_sel);
 }
 
 static void sdhci_j721e_4bit_set_clock(struct sdhci_host *host,
@@ -260,6 +266,9 @@ static void sdhci_j721e_4bit_set_clock(struct sdhci_host *host,
 	      (otap_del_sel << OTAPDLYSEL_SHIFT);
 	regmap_update_bits(sdhci_am654->base, PHY_CTRL4, mask, val);
 
+	regmap_update_bits(sdhci_am654->base, PHY_CTRL5, CLKBUFSEL_MASK,
+			   sdhci_am654->clkbuf_sel);
+
 	sdhci_set_clock(host, clock);
 }
 
@@ -582,6 +591,8 @@ static int sdhci_am654_get_of_property(struct platform_device *pdev,
 	}
 
 	device_property_read_u32(dev, "ti,strobe-sel", &sdhci_am654->strb_sel);
+	device_property_read_u32(dev, "ti,clkbuf-sel",
+				 &sdhci_am654->clkbuf_sel);
 
 	sdhci_get_of_property(pdev);
 
-- 
2.17.1

[PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller

[Faiz Abbas]

Enable CONFIG_SDHCI_AM654 to Support AM65x sdhci controller.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 883e8bace3ed..40dd13e0adc5 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -731,6 +731,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SUNXI=y
 CONFIG_MMC_BCM2835=y
 CONFIG_MMC_SDHCI_XENON=y
+CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MMC_OWL=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-- 
2.17.1

Re: [PATCH 0/7] Add support for SD card in AM654x-evm

[Faiz Abbas]

Hi,

On 19/06/20 6:27 pm, Faiz Abbas wrote:
> The following patches add driver support for SD card on the
> am654x-evm. It only enables high speed mode with UHS mode
> support coming in a future series.
> 
> DTS support will be added in another series as well.
> 
> Faiz Abbas (7):
>   dt-bindings: mmc: sdhci-am654: Add ti,clkbuf-sel binding
>   mmc: sdhci_am654: Add flag for PHY calibration
>   mmc: sdhci_am654: Add Support for SR2.0
>   mmc: sdhci_am654: Fix conditions for enabling dll
>   mmc: sdhci_am654: Update delay chain configuration
>   mmc: sdhci_am654: Add support for clkbuf_sel property
>   arm64: defconfig: Enable AM654x SDHCI controller
> 
>  .../devicetree/bindings/mmc/sdhci-am654.txt   |  1 +
>  arch/arm64/configs/defconfig                  |  1 +
>  drivers/mmc/host/sdhci_am654.c                | 86 ++++++++++++++-----
>  3 files changed, 65 insertions(+), 23 deletions(-)
> 

Gentle ping.

Thanks,
Faiz

Re: [PATCH 0/7] Add support for SD card in AM654x-evm

[Ulf Hansson]

On Fri, 19 Jun 2020 at 14:58, Faiz Abbas <faiz_abbas@ti.com> wrote:
>
> The following patches add driver support for SD card on the
> am654x-evm. It only enables high speed mode with UHS mode
> support coming in a future series.
>
> DTS support will be added in another series as well.
>
> Faiz Abbas (7):
>   dt-bindings: mmc: sdhci-am654: Add ti,clkbuf-sel binding
>   mmc: sdhci_am654: Add flag for PHY calibration
>   mmc: sdhci_am654: Add Support for SR2.0
>   mmc: sdhci_am654: Fix conditions for enabling dll
>   mmc: sdhci_am654: Update delay chain configuration
>   mmc: sdhci_am654: Add support for clkbuf_sel property
>   arm64: defconfig: Enable AM654x SDHCI controller
>
>  .../devicetree/bindings/mmc/sdhci-am654.txt   |  1 +
>  arch/arm64/configs/defconfig                  |  1 +
>  drivers/mmc/host/sdhci_am654.c                | 86 ++++++++++++++-----
>  3 files changed, 65 insertions(+), 23 deletions(-)
>
> --
> 2.17.1
>

Patch 1 to 6, applied for next, thanks!

Kind regards
Uffe

Re: [PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller

[Faiz Abbas]

Hi,

On 19/06/20 6:28 pm, Faiz Abbas wrote:
> Enable CONFIG_SDHCI_AM654 to Support AM65x sdhci controller.
> 
> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
> ---
>  arch/arm64/configs/defconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index 883e8bace3ed..40dd13e0adc5 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -731,6 +731,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
>  CONFIG_MMC_SUNXI=y
>  CONFIG_MMC_BCM2835=y
>  CONFIG_MMC_SDHCI_XENON=y
> +CONFIG_MMC_SDHCI_AM654=y
>  CONFIG_MMC_OWL=y
>  CONFIG_NEW_LEDS=y
>  CONFIG_LEDS_CLASS=y
> 

Gentle ping. Will, Catalin, can this patch be picked up?

Thanks,
Faiz

Re: [PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller

[Sekhar Nori]

On 7/16/20 5:49 PM, Faiz Abbas wrote:
> Hi,
> 
> On 19/06/20 6:28 pm, Faiz Abbas wrote:
>> Enable CONFIG_SDHCI_AM654 to Support AM65x sdhci controller.
>>
>> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
>> ---
>>  arch/arm64/configs/defconfig | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
>> index 883e8bace3ed..40dd13e0adc5 100644
>> --- a/arch/arm64/configs/defconfig
>> +++ b/arch/arm64/configs/defconfig
>> @@ -731,6 +731,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
>>  CONFIG_MMC_SUNXI=y
>>  CONFIG_MMC_BCM2835=y
>>  CONFIG_MMC_SDHCI_XENON=y
>> +CONFIG_MMC_SDHCI_AM654=y
>>  CONFIG_MMC_OWL=y
>>  CONFIG_NEW_LEDS=y
>>  CONFIG_LEDS_CLASS=y
>>
> 
> Gentle ping. Will, Catalin, can this patch be picked up?

From logs, Arnd has been picking up patches for this file. Looping in
Arnd and ARM-SoC team.

Thanks,
Sekhar

Re: [PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller

[Arnd Bergmann]

On Thu, Jul 16, 2020 at 3:25 PM Sekhar Nori <nsekhar@ti.com> wrote:
>
> On 7/16/20 5:49 PM, Faiz Abbas wrote:
> > Hi,
> >
> > On 19/06/20 6:28 pm, Faiz Abbas wrote:
> >> Enable CONFIG_SDHCI_AM654 to Support AM65x sdhci controller.
> >>
> >> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
> >> ---
> >>  arch/arm64/configs/defconfig | 1 +
> >>  1 file changed, 1 insertion(+)
> >>
> >> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> >> index 883e8bace3ed..40dd13e0adc5 100644
> >> --- a/arch/arm64/configs/defconfig
> >> +++ b/arch/arm64/configs/defconfig
> >> @@ -731,6 +731,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
> >>  CONFIG_MMC_SUNXI=y
> >>  CONFIG_MMC_BCM2835=y
> >>  CONFIG_MMC_SDHCI_XENON=y
> >> +CONFIG_MMC_SDHCI_AM654=y
> >>  CONFIG_MMC_OWL=y
> >>  CONFIG_NEW_LEDS=y
> >>  CONFIG_LEDS_CLASS=y
> >>
> >
> > Gentle ping. Will, Catalin, can this patch be picked up?
>
> From logs, Arnd has been picking up patches for this file. Looping in
> Arnd and ARM-SoC team.

I tend to ignore individual patches to the defconfig file unless
they are sent to:soc@kernel.org. The best way to get them
included is to have the platform maintainers pick up the
changes and send them that way as a separate pull request
at the same time as sending any DT updates.

The MAINTAINERS file lists Tero and Nishanth as maintainers
for the platform. If they want, I can apply this one directly, but in
the future, send it to them.

        Arnd

Re: [PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller

[Faiz Abbas]

Hi,

On 16/07/20 11:58 pm, Arnd Bergmann wrote:
> On Thu, Jul 16, 2020 at 3:25 PM Sekhar Nori <nsekhar@ti.com> wrote:
>>
>> On 7/16/20 5:49 PM, Faiz Abbas wrote:
>>> Hi,
>>>
>>> On 19/06/20 6:28 pm, Faiz Abbas wrote:
>>>> Enable CONFIG_SDHCI_AM654 to Support AM65x sdhci controller.
>>>>
>>>> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
>>>> ---
>>>>  arch/arm64/configs/defconfig | 1 +
>>>>  1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
>>>> index 883e8bace3ed..40dd13e0adc5 100644
>>>> --- a/arch/arm64/configs/defconfig
>>>> +++ b/arch/arm64/configs/defconfig
>>>> @@ -731,6 +731,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
>>>>  CONFIG_MMC_SUNXI=y
>>>>  CONFIG_MMC_BCM2835=y
>>>>  CONFIG_MMC_SDHCI_XENON=y
>>>> +CONFIG_MMC_SDHCI_AM654=y
>>>>  CONFIG_MMC_OWL=y
>>>>  CONFIG_NEW_LEDS=y
>>>>  CONFIG_LEDS_CLASS=y
>>>>
>>>
>>> Gentle ping. Will, Catalin, can this patch be picked up?
>>
>> From logs, Arnd has been picking up patches for this file. Looping in
>> Arnd and ARM-SoC team.
> 
> I tend to ignore individual patches to the defconfig file unless
> they are sent to:soc@kernel.org. The best way to get them
> included is to have the platform maintainers pick up the
> changes and send them that way as a separate pull request
> at the same time as sending any DT updates.
> 
> The MAINTAINERS file lists Tero and Nishanth as maintainers
> for the platform. If they want, I can apply this one directly, but in
> the future, send it to them.
> 

Thanks for clarifying Arnd. Tero, can you pick this up?

Thanks,
Faiz

Re: [PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller

[Tero Kristo]

On 17/07/2020 11:38, Faiz Abbas wrote:
> Hi,
> 
> On 16/07/20 11:58 pm, Arnd Bergmann wrote:
>> On Thu, Jul 16, 2020 at 3:25 PM Sekhar Nori <nsekhar@ti.com> wrote:
>>>
>>> On 7/16/20 5:49 PM, Faiz Abbas wrote:
>>>> Hi,
>>>>
>>>> On 19/06/20 6:28 pm, Faiz Abbas wrote:
>>>>> Enable CONFIG_SDHCI_AM654 to Support AM65x sdhci controller.
>>>>>
>>>>> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
>>>>> ---
>>>>>   arch/arm64/configs/defconfig | 1 +
>>>>>   1 file changed, 1 insertion(+)
>>>>>
>>>>> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
>>>>> index 883e8bace3ed..40dd13e0adc5 100644
>>>>> --- a/arch/arm64/configs/defconfig
>>>>> +++ b/arch/arm64/configs/defconfig
>>>>> @@ -731,6 +731,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
>>>>>   CONFIG_MMC_SUNXI=y
>>>>>   CONFIG_MMC_BCM2835=y
>>>>>   CONFIG_MMC_SDHCI_XENON=y
>>>>> +CONFIG_MMC_SDHCI_AM654=y
>>>>>   CONFIG_MMC_OWL=y
>>>>>   CONFIG_NEW_LEDS=y
>>>>>   CONFIG_LEDS_CLASS=y
>>>>>
>>>>
>>>> Gentle ping. Will, Catalin, can this patch be picked up?
>>>
>>>  From logs, Arnd has been picking up patches for this file. Looping in
>>> Arnd and ARM-SoC team.
>>
>> I tend to ignore individual patches to the defconfig file unless
>> they are sent to:soc@kernel.org. The best way to get them
>> included is to have the platform maintainers pick up the
>> changes and send them that way as a separate pull request
>> at the same time as sending any DT updates.
>>
>> The MAINTAINERS file lists Tero and Nishanth as maintainers
>> for the platform. If they want, I can apply this one directly, but in
>> the future, send it to them.
>>
> 
> Thanks for clarifying Arnd. Tero, can you pick this up?

Ok, this topic has been bit unclear for me also, but if you say I can 
pick the patches myself and send a pull request out, I can do that.

-Tero
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Re: [PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller

[Arnd Bergmann]

On Fri, Jul 17, 2020 at 1:20 PM Tero Kristo <t-kristo@ti.com> wrote:
> On 17/07/2020 11:38, Faiz Abbas wrote:
> > On 16/07/20 11:58 pm, Arnd Bergmann wrote:
> >> On Thu, Jul 16, 2020 at 3:25 PM Sekhar Nori <nsekhar@ti.com> wrote:
> >> I tend to ignore individual patches to the defconfig file unless
> >> they are sent to:soc@kernel.org. The best way to get them
> >> included is to have the platform maintainers pick up the
> >> changes and send them that way as a separate pull request
> >> at the same time as sending any DT updates.
> >>
> >> The MAINTAINERS file lists Tero and Nishanth as maintainers
> >> for the platform. If they want, I can apply this one directly, but in
> >> the future, send it to them.
> >>
> >
> > Thanks for clarifying Arnd. Tero, can you pick this up?
>
> Ok, this topic has been bit unclear for me also, but if you say I can
> pick the patches myself and send a pull request out, I can do that.

Right. To clarify, the soc tree usually has separate branches for dts
files, soc specific drivers, defconfig files and 32-bit platform code.

When you pick up patches into your tree, please put them into
branches that fit into those categories. You can group the patches
into branches with more fine-grained categories if it makes sense
(e.g. adding a particularly large driver, adding a new dts files for a
new soc, or cosmetic cleanups across dts files).

If any of the categories only have a couple of patches in them, you
can decide to forward those as patches to soc@kernel.org, but a
pull request is always ok as well, even for a one-line patch.

        Arnd

       Arnd

Re: [PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller

[Faiz Abbas]

Tero,

On 17/07/20 6:39 pm, Arnd Bergmann wrote:
> On Fri, Jul 17, 2020 at 1:20 PM Tero Kristo <t-kristo@ti.com> wrote:
>> On 17/07/2020 11:38, Faiz Abbas wrote:
>>> On 16/07/20 11:58 pm, Arnd Bergmann wrote:
>>>> On Thu, Jul 16, 2020 at 3:25 PM Sekhar Nori <nsekhar@ti.com> wrote:
>>>> I tend to ignore individual patches to the defconfig file unless
>>>> they are sent to:soc@kernel.org. The best way to get them
>>>> included is to have the platform maintainers pick up the
>>>> changes and send them that way as a separate pull request
>>>> at the same time as sending any DT updates.
>>>>
>>>> The MAINTAINERS file lists Tero and Nishanth as maintainers
>>>> for the platform. If they want, I can apply this one directly, but in
>>>> the future, send it to them.
>>>>
>>>
>>> Thanks for clarifying Arnd. Tero, can you pick this up?
>>
>> Ok, this topic has been bit unclear for me also, but if you say I can
>> pick the patches myself and send a pull request out, I can do that.
> 

Patches 1-6 are being merged from mmc tree. You only need to pick up this patch.

Thanks,
Faiz

Re: [PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller

[Tero Kristo]

On 17/07/2020 16:09, Arnd Bergmann wrote:
> On Fri, Jul 17, 2020 at 1:20 PM Tero Kristo <t-kristo@ti.com> wrote:
>> On 17/07/2020 11:38, Faiz Abbas wrote:
>>> On 16/07/20 11:58 pm, Arnd Bergmann wrote:
>>>> On Thu, Jul 16, 2020 at 3:25 PM Sekhar Nori <nsekhar@ti.com> wrote:
>>>> I tend to ignore individual patches to the defconfig file unless
>>>> they are sent to:soc@kernel.org. The best way to get them
>>>> included is to have the platform maintainers pick up the
>>>> changes and send them that way as a separate pull request
>>>> at the same time as sending any DT updates.
>>>>
>>>> The MAINTAINERS file lists Tero and Nishanth as maintainers
>>>> for the platform. If they want, I can apply this one directly, but in
>>>> the future, send it to them.
>>>>
>>>
>>> Thanks for clarifying Arnd. Tero, can you pick this up?
>>
>> Ok, this topic has been bit unclear for me also, but if you say I can
>> pick the patches myself and send a pull request out, I can do that.
> 
> Right. To clarify, the soc tree usually has separate branches for dts
> files, soc specific drivers, defconfig files and 32-bit platform code.
> 
> When you pick up patches into your tree, please put them into
> branches that fit into those categories. You can group the patches
> into branches with more fine-grained categories if it makes sense
> (e.g. adding a particularly large driver, adding a new dts files for a
> new soc, or cosmetic cleanups across dts files).
> 
> If any of the categories only have a couple of patches in them, you
> can decide to forward those as patches to soc@kernel.org, but a
> pull request is always ok as well, even for a one-line patch.

Ok thanks for clarification, Arnd.

Based on that, queuing this up for 5.9 myself, thanks.

Will post pull-request next week for it, there appears to be another K3 
SoC related config change pending which I'll pick up also. Just want to 
capture -next results for these to see how well they integrate.

-Tero
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki