devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Balaji T K <balajitk@ti.com>
To: bcousson@baylibre.com, devicetree@vger.kernel.org,
	linux-mmc@vger.kernel.org, cjb@laptop.org, uri.y@variscite.com,
	mark.rutland@arm.com
Cc: linux-omap@vger.kernel.org, Sekhar Nori <nsekhar@ti.com>,
	Balaji T K <balajitk@ti.com>
Subject: [PATCH v2 1/6] mmc: omap_hsmmc: start using generic non-removable DT binding
Date: Mon, 21 Oct 2013 00:19:54 +0530	[thread overview]
Message-ID: <1382294999-18790-2-git-send-email-balajitk@ti.com> (raw)
In-Reply-To: <1382294999-18790-1-git-send-email-balajitk@ti.com>

From: Sekhar Nori <nsekhar@ti.com>

add generic "non-removable" binding support for omap_hsmmc.
When ti,non-removable was added, Only OMAP platform that had eMMC was that on
OMAP4 where power to eMMC cannot be switched off without sending CMD5 sleep
command, so no_regulator_off_init was needed to get it detected during boot.
Start using generic non-removable for all removable cards which do not
have such limitation.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
---
 .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |    4 +++-
 drivers/mmc/host/omap_hsmmc.c                      |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
index 8c8908a..d15f5b2 100644
--- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
+++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
@@ -17,7 +17,9 @@ Optional properties:
 ti,dual-volt: boolean, supports dual voltage cards
 <supply-name>-supply: phandle to the regulator device tree node
 "supply-name" examples are "vmmc", "vmmc_aux" etc
-ti,non-removable: non-removable slot (like eMMC)
+ti,non-removable: non-removable eMMC with always on vccq(vmmc_aux)
+ and configurable vcc(vmmc)
+non-removable: non-removable slot (like eMMC, SDIO)
 ti,needs-special-reset: Requires a special softreset sequence
 ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
 dmas: List of DMA specifiers with the controller specific format
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 6ac63df..7d2d929 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1738,6 +1738,8 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
 	pdata->slots[0].switch_pin = cd_gpio;
 	pdata->slots[0].gpio_wp = wp_gpio;
 
+	if (of_find_property(np, "non-removable", NULL))
+		pdata->slots[0].nonremovable = true;
 	if (of_find_property(np, "ti,non-removable", NULL)) {
 		pdata->slots[0].nonremovable = true;
 		pdata->slots[0].no_regulator_off_init = true;
-- 
1.7.5.4


  reply	other threads:[~2013-10-20 18:49 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-16 15:18 [PATCH 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding Balaji T K
2013-10-16 15:18 ` [PATCH 1/6] " Balaji T K
2013-10-17  8:38   ` Mark Rutland
2013-10-17 10:53     ` Balaji T K
2013-10-17 15:25       ` Mark Rutland
2013-10-18 11:33         ` Balaji T K
2013-10-16 15:18 ` [PATCH 2/6] ARM: dts: OMAP4/5: start using generic binding for non-removable mmc cards Balaji T K
2013-10-16 15:18 ` [PATCH 3/6] ARM: dts: am335x-boneblack: mark eMMC as non removable Balaji T K
2013-10-16 15:18 ` [PATCH 4/6] ARM: dts: dra7-evm: " Balaji T K
2013-10-16 15:18 ` [PATCH 5/6] ARM: dts: am335x-boneblack: remove unused ti,vcc-aux-disable-is-sleep Balaji T K
2013-10-16 15:18 ` [PATCH 6/6] ARM: dts: omap4-var-some: fix bus-width Balaji T K
2013-10-20 18:49 ` [PATCH v2 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding Balaji T K
2013-10-20 18:49   ` Balaji T K [this message]
2013-10-20 18:49   ` [PATCH v2 2/6] ARM: dts: OMAP4/5: start using generic binding for non-removable mmc cards Balaji T K
2013-10-20 18:49   ` [PATCH v2 3/6] ARM: dts: am335x-boneblack: mark eMMC as non removable Balaji T K
2013-10-20 18:49   ` [PATCH v2 4/6] ARM: dts: dra7-evm: " Balaji T K
2013-10-20 18:49   ` [PATCH v2 5/6] ARM: dts: am335x-boneblack: remove unused ti,vcc-aux-disable-is-sleep Balaji T K
2013-10-20 18:49   ` [PATCH v2 6/6] ARM: dts: omap4-var-som: fix bus-width Balaji T K

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1382294999-18790-2-git-send-email-balajitk@ti.com \
    --to=balajitk@ti.com \
    --cc=bcousson@baylibre.com \
    --cc=cjb@laptop.org \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=nsekhar@ti.com \
    --cc=uri.y@variscite.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).