Skip to contentSkip to conversation

mmc: tegra: use mmc_of_parse to get support of standard MMC DT binding

PATCH Applied Joseph Lo 3 participants 9 messages Feb 22, 2013 – Mar 6, 2013 6 messages not in the archive

Subsystems (4)
lore
Share & tools
lore

Joseph Lo

author
#0 lore raw

v2 cover mmc: tegra: use mmc_of_parse to get support of standard MMC DT binding

The 2nd patch of this series depends on two patches below.

"mmc: provide a standard MMC device-tree binding parser centrally" (available on next-20130219)
mmc: tegra: assume CONFIG_OF, remove platform data (available on next-20130220)

V2:
* add cd-gpio fix for Tamonten-based board
* add cd-gpio fix for Toradex-based board (assume it also need this fix)
* some modifications for sdhci_tegra_parse_dt()

Verified on Seaboard ,Cardhu and Tamonten-based board.

Joseph Lo (2):
ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host
mmc: tegra: use mmc_of_parse to get the support of standard MMC DT
bindings

 arch/arm/boot/dts/tegra20-colibri-512.dtsi |  2 +-
 arch/arm/boot/dts/tegra20-harmony.dts      |  4 +-
 arch/arm/boot/dts/tegra20-paz00.dts        |  2 +-
 arch/arm/boot/dts/tegra20-seaboard.dts     |  2 +-
 arch/arm/boot/dts/tegra20-tamonten.dtsi    |  2 +-
 arch/arm/boot/dts/tegra20-trimslice.dts    |  2 +-
 arch/arm/boot/dts/tegra20-ventana.dts      |  2 +-
 arch/arm/boot/dts/tegra20-whistler.dts     |  1 +
 arch/arm/boot/dts/tegra30-beaver.dts       |  2 +-
 arch/arm/boot/dts/tegra30-cardhu.dtsi      |  2 +-
 drivers/mmc/host/sdhci-tegra.c             | 92 ++++--------------------------
 11 files changed, 21 insertions(+), 92 deletions(-)
Signature · 1 line
1.8.1.1
author
#1 lore raw

PATCH v2 1/2 ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host

The GPIO pin of SD slot card detection should active low.

---
V2:
* add Tamonten-based board
* add Toradex-based board (assume it also need this fix)

---
 arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +-
 arch/arm/boot/dts/tegra20-harmony.dts      | 4 ++--
 arch/arm/boot/dts/tegra20-paz00.dts        | 2 +-
 arch/arm/boot/dts/tegra20-seaboard.dts     | 2 +-
 arch/arm/boot/dts/tegra20-tamonten.dtsi    | 2 +-
 arch/arm/boot/dts/tegra20-trimslice.dts    | 2 +-
 arch/arm/boot/dts/tegra20-ventana.dts      | 2 +-
 arch/arm/boot/dts/tegra20-whistler.dts     | 1 +
 arch/arm/boot/dts/tegra30-beaver.dts       | 2 +-
 arch/arm/boot/dts/tegra30-cardhu.dtsi      | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)
arch/arm/boot/dts/tegra20-colibri-512.dtsi +1 -1
index 4441620..cb73e62 100644
@@ -444,7 +444,7 @@
 	};
 
 	sdhci@c8000600 {
-		cd-gpios = <&gpio 23 0>; /* gpio PC7 */
+		cd-gpios = <&gpio 23 1>; /* gpio PC7 */
 	};
 
 	sound {
arch/arm/boot/dts/tegra20-harmony.dts +2 -2
index 61d027f..1f79c0d 100644
@@ -437,7 +437,7 @@
 
 	sdhci@c8000200 {
 		status = "okay";
-		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+		cd-gpios = <&gpio 69 1>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 		power-gpios = <&gpio 155 0>; /* gpio PT3 */
 		bus-width = <4>;
@@ -445,7 +445,7 @@
 
 	sdhci@c8000600 {
 		status = "okay";
-		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
+		cd-gpios = <&gpio 58 1>; /* gpio PH2 */
 		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
 		power-gpios = <&gpio 70 0>; /* gpio PI6 */
 		bus-width = <8>;
arch/arm/boot/dts/tegra20-paz00.dts +1 -1
index 54d6fce..9db36da 100644
@@ -436,7 +436,7 @@
 
 	sdhci@c8000000 {
 		status = "okay";
-		cd-gpios = <&gpio 173 0>; /* gpio PV5 */
+		cd-gpios = <&gpio 173 1>; /* gpio PV5 */
 		wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
 		power-gpios = <&gpio 169 0>; /* gpio PV1 */
 		bus-width = <4>;
arch/arm/boot/dts/tegra20-seaboard.dts +1 -1
index 37b3a57..715a8b8 100644
@@ -584,7 +584,7 @@
 
 	sdhci@c8000400 {
 		status = "okay";
-		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+		cd-gpios = <&gpio 69 1>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 		power-gpios = <&gpio 70 0>; /* gpio PI6 */
 		bus-width = <4>;
arch/arm/boot/dts/tegra20-tamonten.dtsi +1 -1
index 4766aba..6e9d91f 100644
@@ -465,7 +465,7 @@
 	};
 
 	sdhci@c8000600 {
-		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
+		cd-gpios = <&gpio 58 1>; /* gpio PH2 */
 		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
 		bus-width = <4>;
 		status = "okay";
arch/arm/boot/dts/tegra20-trimslice.dts +1 -1
index 5d79e4f..98f3e44 100644
@@ -325,7 +325,7 @@
 
 	sdhci@c8000600 {
 		status = "okay";
-		cd-gpios = <&gpio 121 0>; /* gpio PP1 */
+		cd-gpios = <&gpio 121 1>; /* gpio PP1 */
 		wp-gpios = <&gpio 122 0>; /* gpio PP2 */
 		bus-width = <4>;
 	};
arch/arm/boot/dts/tegra20-ventana.dts +1 -1
index 425c890..4aef56f 100644
@@ -520,7 +520,7 @@
 
 	sdhci@c8000400 {
 		status = "okay";
-		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+		cd-gpios = <&gpio 69 1>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 		power-gpios = <&gpio 70 0>; /* gpio PI6 */
 		bus-width = <4>;
arch/arm/boot/dts/tegra20-whistler.dts +1 -0
index ea57c0f..5762188 100644
@@ -510,6 +510,7 @@
 
 	sdhci@c8000400 {
 		status = "okay";
+		cd-gpios = <&gpio 69 1>; /* gpio PI5 */
 		wp-gpios = <&gpio 173 0>; /* gpio PV5 */
 		bus-width = <8>;
 	};
arch/arm/boot/dts/tegra30-beaver.dts +1 -1
index 8ff2ff2..0a2cd24 100644
@@ -257,7 +257,7 @@
 
 	sdhci@78000000 {
 		status = "okay";
-		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+		cd-gpios = <&gpio 69 1>; /* gpio PI5 */
 		wp-gpios = <&gpio 155 0>; /* gpio PT3 */
 		power-gpios = <&gpio 31 0>; /* gpio PD7 */
 		bus-width = <4>;
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -1
index 1749927..3e2d210 100644
@@ -311,7 +311,7 @@
 
 	sdhci@78000000 {
 		status = "okay";
-		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+		cd-gpios = <&gpio 69 1>; /* gpio PI5 */
 		wp-gpios = <&gpio 155 0>; /* gpio PT3 */
 		power-gpios = <&gpio 31 0>; /* gpio PD7 */
 		bus-width = <4>;
Signature · 1 line
1.8.1.1

A message that is not in the archive (sent off-list or not yet received): 1361503420-16473-2-git-send-email-josephl-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org

#3 lore raw

Re: [PATCH V2 1/2] ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host

Quoted 1 line · Joseph Lo

The GPIO pin of SD slot card detection should active low.

I have applied patch 1/2 to Tegra's for-3.10/fixes branch.

author
#4 lore raw

PATCH v2 2/2 mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings

In reply to Joseph Lo

Updating the sdhci-tegra driver to use mmc_of_parse to support standard MMC DT bindings. Then we can remove the redundant code that already support in generic MMC core.

---
V2:
* some modifications for sdhci_tegra_parse_dt()

---
 drivers/mmc/host/sdhci-tegra.c | 92 +++++-------------------------------------
 1 file changed, 10 insertions(+), 82 deletions(-)
drivers/mmc/host/sdhci-tegra.c +10 -82
index 08b06e9..f2ede63 100644
@@ -24,6 +24,7 @@
 #include <linux/gpio.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
+#include <linux/mmc/slot-gpio.h>
 
 #include <asm/gpio.h>
 
@@ -44,10 +45,7 @@ struct sdhci_tegra_soc_data {
 
 struct sdhci_tegra {
 	const struct sdhci_tegra_soc_data *soc_data;
-	int cd_gpio;
-	int wp_gpio;
 	int power_gpio;
-	int is_8bit;
 };
 
 static u32 tegra_sdhci_readl(struct sdhci_host *host, int reg)
@@ -107,23 +105,9 @@ static void tegra_sdhci_writel(struct sdhci_host *host, u32 val, int reg)
 
 static unsigned int tegra_sdhci_get_ro(struct sdhci_host *host)
 {
-	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct sdhci_tegra *tegra_host = pltfm_host->priv;
-
-	if (!gpio_is_valid(tegra_host->wp_gpio))
-		return -1;
-
-	return gpio_get_value(tegra_host->wp_gpio);
+	return mmc_gpio_get_ro(host->mmc);
 }
 
-static irqreturn_t carddetect_irq(int irq, void *data)
-{
-	struct sdhci_host *sdhost = (struct sdhci_host *)data;
-
-	tasklet_schedule(&sdhost->card_tasklet);
-	return IRQ_HANDLED;
-};
-
 static void tegra_sdhci_reset_exit(struct sdhci_host *host, u8 mask)
 {
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -145,12 +129,11 @@ static void tegra_sdhci_reset_exit(struct sdhci_host *host, u8 mask)
 
 static int tegra_sdhci_buswidth(struct sdhci_host *host, int bus_width)
 {
-	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct sdhci_tegra *tegra_host = pltfm_host->priv;
 	u32 ctrl;
 
 	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
-	if (tegra_host->is_8bit && bus_width == MMC_BUS_WIDTH_8) {
+	if ((host->mmc->caps & MMC_CAP_8_BIT_DATA) &&
+	    (bus_width == MMC_BUS_WIDTH_8)) {
 		ctrl &= ~SDHCI_CTRL_4BITBUS;
 		ctrl |= SDHCI_CTRL_8BITBUS;
 	} else {
@@ -216,19 +199,15 @@ static const struct of_device_id sdhci_tegra_dt_match[] = {
 };
 MODULE_DEVICE_TABLE(of, sdhci_dt_ids);
 
-static void sdhci_tegra_parse_dt(struct device *dev,
-					struct sdhci_tegra *tegra_host)
+static void sdhci_tegra_parse_dt(struct device *dev)
 {
 	struct device_node *np = dev->of_node;
-	u32 bus_width;
+	struct sdhci_host *host = dev_get_drvdata(dev);
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_tegra *tegra_host = pltfm_host->priv;
 
-	tegra_host->cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
-	tegra_host->wp_gpio = of_get_named_gpio(np, "wp-gpios", 0);
 	tegra_host->power_gpio = of_get_named_gpio(np, "power-gpios", 0);
-
-	if (of_property_read_u32(np, "bus-width", &bus_width) == 0 &&
-	    bus_width == 8)
-		tegra_host->is_8bit = 1;
+	mmc_of_parse(host->mmc);
 }
 
 static int sdhci_tegra_probe(struct platform_device *pdev)
@@ -260,7 +239,7 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	tegra_host->soc_data = soc_data;
 	pltfm_host->priv = tegra_host;
 
-	sdhci_tegra_parse_dt(&pdev->dev, tegra_host);
+	sdhci_tegra_parse_dt(&pdev->dev);
 
 	if (gpio_is_valid(tegra_host->power_gpio)) {
 		rc = gpio_request(tegra_host->power_gpio, "sdhci_power");
@@ -272,37 +251,6 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 		gpio_direction_output(tegra_host->power_gpio, 1);
 	}
 
-	if (gpio_is_valid(tegra_host->cd_gpio)) {
-		rc = gpio_request(tegra_host->cd_gpio, "sdhci_cd");
-		if (rc) {
-			dev_err(mmc_dev(host->mmc),
-				"failed to allocate cd gpio\n");
-			goto err_cd_req;
-		}
-		gpio_direction_input(tegra_host->cd_gpio);
-
-		rc = request_irq(gpio_to_irq(tegra_host->cd_gpio),
-				 carddetect_irq,
-				 IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-				 mmc_hostname(host->mmc), host);
-
-		if (rc)	{
-			dev_err(mmc_dev(host->mmc), "request irq error\n");
-			goto err_cd_irq_req;
-		}
-
-	}
-
-	if (gpio_is_valid(tegra_host->wp_gpio)) {
-		rc = gpio_request(tegra_host->wp_gpio, "sdhci_wp");
-		if (rc) {
-			dev_err(mmc_dev(host->mmc),
-				"failed to allocate wp gpio\n");
-			goto err_wp_req;
-		}
-		gpio_direction_input(tegra_host->wp_gpio);
-	}
-
 	clk = clk_get(mmc_dev(host->mmc), NULL);
 	if (IS_ERR(clk)) {
 		dev_err(mmc_dev(host->mmc), "clk err\n");
@@ -312,9 +260,6 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	clk_prepare_enable(clk);
 	pltfm_host->clk = clk;
 
-	if (tegra_host->is_8bit)
-		host->mmc->caps |= MMC_CAP_8_BIT_DATA;
-
 	rc = sdhci_add_host(host);
 	if (rc)
 		goto err_add_host;
@@ -325,15 +270,6 @@ err_add_host:
 	clk_disable_unprepare(pltfm_host->clk);
 	clk_put(pltfm_host->clk);
 err_clk_get:
-	if (gpio_is_valid(tegra_host->wp_gpio))
-		gpio_free(tegra_host->wp_gpio);
-err_wp_req:
-	if (gpio_is_valid(tegra_host->cd_gpio))
-		free_irq(gpio_to_irq(tegra_host->cd_gpio), host);
-err_cd_irq_req:
-	if (gpio_is_valid(tegra_host->cd_gpio))
-		gpio_free(tegra_host->cd_gpio);
-err_cd_req:
 	if (gpio_is_valid(tegra_host->power_gpio))
 		gpio_free(tegra_host->power_gpio);
 err_power_req:
@@ -351,14 +287,6 @@ static int sdhci_tegra_remove(struct platform_device *pdev)
 
 	sdhci_remove_host(host, dead);
 
-	if (gpio_is_valid(tegra_host->wp_gpio))
-		gpio_free(tegra_host->wp_gpio);
-
-	if (gpio_is_valid(tegra_host->cd_gpio)) {
-		free_irq(gpio_to_irq(tegra_host->cd_gpio), host);
-		gpio_free(tegra_host->cd_gpio);
-	}
-
 	if (gpio_is_valid(tegra_host->power_gpio))
 		gpio_free(tegra_host->power_gpio);
 
Signature · 1 line
1.8.1.1

A message that is not in the archive (sent off-list or not yet received): 1361503420-16473-3-git-send-email-josephl-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org

#6 lore raw

Re: [PATCH V2 2/2] mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings

Quoted 3 lines · Joseph Lo

Updating the sdhci-tegra driver to use mmc_of_parse to support standard MMC DT bindings. Then we can remove the redundant code that already support in generic MMC core.

Chris,

Are you OK with this patch? Let me know if you need a resend if you don't have the email any more.

(it's at http://patchwork.ozlabs.org/patch/222451/ too)

This patch needs to go through the Tegra tree due to dependencies on patch 1/2, which has to go through the Tegra tree to avoid significant merge conflicts with other *.dts changes.

Thanks.

A message that is not in the archive (sent off-list or not yet received): [email protected]

Acked-by
#8 lore raw

Re: [PATCH V2 2/2] mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings

Hi,

Quoted 5 lines · Stephen Warren
Quoted 4 lines · Joseph Lo

Updating the sdhci-tegra driver to use mmc_of_parse to support standard MMC DT bindings. Then we can remove the redundant code that already support in generic MMC core.

Quoted 7 lines
Quoted 2 lines

drivers/mmc/host/sdhci-tegra.c | 92 +++++---------------------------------

 1 file changed, 10 insertions(+), 82 deletions(-)

Chris,

Are you OK with this patch? Let me know if you need a resend if you don't have the email any more.

With the diffstat above, how could I object. :-)

Thanks,

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child

A message that is not in the archive (sent off-list or not yet received): [email protected]

#10 lore raw

Re: [PATCH V2 2/2] mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings

Quoted 11 lines · Chris Ball

Hi,

Quoted 8 lines · Stephen Warren
Quoted 6 lines · Joseph Lo

Updating the sdhci-tegra driver to use mmc_of_parse to support standard MMC DT bindings. Then we can remove the redundant code that already support in generic MMC core.

drivers/mmc/host/sdhci-tegra.c | 92 +++++---------------------------------

 1 file changed, 10 insertions(+), 82 deletions(-)
Quoted 8 lines
Quoted 4 lines

Chris,

Are you OK with this patch? Let me know if you need a resend if you don't have the email any more.

With the diffstat above, how could I object. :-)

Thanks. I've applied the patch in question to Tegra's for-3.10/drivers-mmc branch.

A message that is not in the archive (sent off-list or not yet received): 1361503420-16473-1-git-send-email-josephl-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org

#12 lore raw
Quoted 6 lines · Joseph Lo

The 2nd patch of this series depends on two patches below.

"mmc: provide a standard MMC device-tree binding parser centrally" (available on next-20130219)
mmc: tegra: assume CONFIG_OF, remove platform data (available on next-20130220)

I think this version looks good. I'll apply it for 3.10 when I can.

Chris, once you can merge patches for 3.10, can you create a topic branch that contains "mmc: provide a standard MMC device-tree binding parser centrally" so I can merge it into the Tegra tree? Thanks.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#14 lore raw

Hi Stephen,

Quoted 8 lines · Stephen Warren
Quoted 6 lines · Joseph Lo

The 2nd patch of this series depends on two patches below.

"mmc: provide a standard MMC device-tree binding parser centrally" (available on next-20130219)
mmc: tegra: assume CONFIG_OF, remove platform data (available on next-20130220)

Quoted 5 lines

I think this version looks good. I'll apply it for 3.10 when I can.

Chris, once you can merge patches for 3.10, can you create a topic branch that contains "mmc: provide a standard MMC device-tree binding parser centrally" so I can merge it into the Tegra tree? Thanks.

I just sent "mmc: provide a standard MMC device-tree binding parser centrally" for 3.9, so you're all set.

Thanks,

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child