* [PATCH 1/6] mmc: omap_hsmmc: start using generic non-removable DT binding
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 ` Balaji T K
2013-10-17 8:38 ` Mark Rutland
2013-10-16 15:18 ` [PATCH 2/6] ARM: dts: OMAP4/5: start using generic binding for non-removable mmc cards Balaji T K
` (5 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Balaji T K @ 2013-10-16 15:18 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb
Cc: linux-omap, uri.y, Sekhar Nori, Balaji T K
From: Sekhar Nori <nsekhar@ti.com>
add generic "non-removable" binding support for omap_hsmmc
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
---
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 +-
drivers/mmc/host/omap_hsmmc.c | 3 +++
2 files changed, 4 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..3b95719 100644
--- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
+++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
@@ -17,7 +17,7 @@ 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 and configurable vcc
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..5992048 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1738,6 +1738,9 @@ 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
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] mmc: omap_hsmmc: start using generic non-removable DT binding
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
0 siblings, 1 reply; 18+ messages in thread
From: Mark Rutland @ 2013-10-17 8:38 UTC (permalink / raw)
To: Balaji T K
Cc: bcousson@baylibre.com, devicetree@vger.kernel.org,
linux-mmc@vger.kernel.org, cjb@laptop.org,
linux-omap@vger.kernel.org, uri.y@variscite.com, Sekhar Nori
On Wed, Oct 16, 2013 at 04:18:22PM +0100, Balaji T K wrote:
> From: Sekhar Nori <nsekhar@ti.com>
>
> add generic "non-removable" binding support for omap_hsmmc
>
> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
> Signed-off-by: Balaji T K <balajitk@ti.com>
> ---
> .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 +-
> drivers/mmc/host/omap_hsmmc.c | 3 +++
> 2 files changed, 4 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..3b95719 100644
> --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> @@ -17,7 +17,7 @@ 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 and configurable vcc
Why this change?
What do "vccq" and "vcc" correspond to? The regulators are called "vmmc"
and "vmmc_aux"...
Why is no mention of "non-removable" added, given that it's added to the
code?
Is one preferred over the other? That should be noted.
> 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..5992048 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -1738,6 +1738,9 @@ 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;
> + }
This wasn't mentioned in the binding, and it seems to have different
semantics to "ti,non-removable". Why is it different?
> if (of_find_property(np, "ti,non-removable", NULL)) {
> pdata->slots[0].nonremovable = true;
> pdata->slots[0].no_regulator_off_init = true;
Cheers,
Mark.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] mmc: omap_hsmmc: start using generic non-removable DT binding
2013-10-17 8:38 ` Mark Rutland
@ 2013-10-17 10:53 ` Balaji T K
2013-10-17 15:25 ` Mark Rutland
0 siblings, 1 reply; 18+ messages in thread
From: Balaji T K @ 2013-10-17 10:53 UTC (permalink / raw)
To: Mark Rutland
Cc: bcousson@baylibre.com, devicetree@vger.kernel.org,
linux-mmc@vger.kernel.org, cjb@laptop.org,
linux-omap@vger.kernel.org, uri.y@variscite.com, Sekhar Nori
On Thursday 17 October 2013 02:08 PM, Mark Rutland wrote:
> On Wed, Oct 16, 2013 at 04:18:22PM +0100, Balaji T K wrote:
>> From: Sekhar Nori <nsekhar@ti.com>
>>
>> add generic "non-removable" binding support for omap_hsmmc
>>
>> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
>> Signed-off-by: Balaji T K <balajitk@ti.com>
>> ---
>> .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 +-
>> drivers/mmc/host/omap_hsmmc.c | 3 +++
>> 2 files changed, 4 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..3b95719 100644
>> --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
>> +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
>> @@ -17,7 +17,7 @@ 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 and configurable vcc
>
> Why this change?
>
Hi,
earlier ti,non-removable was used for all eMMC and SDIO card, now it will
be used only for eMMC with always on vccq and configurable vcc.
> What do "vccq" and "vcc" correspond to? The regulators are called "vmmc"
> and "vmmc_aux"...
>
vccq and vcc are supply names of eMMC part
> Why is no mention of "non-removable" added, given that it's added to the
> code?
Because this file makes a reference to mmc.txt and the core properties described
by mmc.txt are not added in ti-omap-hsmmc.txt
>
> Is one preferred over the other? That should be noted.
>
>> 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..5992048 100644
>> --- a/drivers/mmc/host/omap_hsmmc.c
>> +++ b/drivers/mmc/host/omap_hsmmc.c
>> @@ -1738,6 +1738,9 @@ 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;
>> + }
>
> This wasn't mentioned in the binding, and it seems to have different
> semantics to "ti,non-removable". Why is it different?
>
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.
Now start using generic non-removable for all removable cards which do not
have such limitation.
>> if (of_find_property(np, "ti,non-removable", NULL)) {
>> pdata->slots[0].nonremovable = true;
>> pdata->slots[0].no_regulator_off_init = true;
>
> Cheers,
> Mark.
>
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] mmc: omap_hsmmc: start using generic non-removable DT binding
2013-10-17 10:53 ` Balaji T K
@ 2013-10-17 15:25 ` Mark Rutland
2013-10-18 11:33 ` Balaji T K
0 siblings, 1 reply; 18+ messages in thread
From: Mark Rutland @ 2013-10-17 15:25 UTC (permalink / raw)
To: Balaji T K
Cc: bcousson@baylibre.com, devicetree@vger.kernel.org,
linux-mmc@vger.kernel.org, cjb@laptop.org,
linux-omap@vger.kernel.org, uri.y@variscite.com, Sekhar Nori
On Thu, Oct 17, 2013 at 11:53:48AM +0100, Balaji T K wrote:
> On Thursday 17 October 2013 02:08 PM, Mark Rutland wrote:
> > On Wed, Oct 16, 2013 at 04:18:22PM +0100, Balaji T K wrote:
> >> From: Sekhar Nori <nsekhar@ti.com>
> >>
> >> add generic "non-removable" binding support for omap_hsmmc
> >>
> >> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
> >> Signed-off-by: Balaji T K <balajitk@ti.com>
> >> ---
> >> .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 +-
> >> drivers/mmc/host/omap_hsmmc.c | 3 +++
> >> 2 files changed, 4 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..3b95719 100644
> >> --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> >> +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> >> @@ -17,7 +17,7 @@ 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 and configurable vcc
> >
> > Why this change?
> >
> Hi,
>
> earlier ti,non-removable was used for all eMMC and SDIO card, now it will
> be used only for eMMC with always on vccq and configurable vcc.
Please expand the commit message to mention this. It wasn't clear why
adding support for a property meant modifying the description of
another.
>
> > What do "vccq" and "vcc" correspond to? The regulators are called "vmmc"
> > and "vmmc_aux"...
> >
>
> vccq and vcc are supply names of eMMC part
The binding has vmmc-supply and vmmc_aux-supply. How do {vmmc,vmmc_aux}
and {vcc,vccq} relate? That should be clarified in the binding document,
something like:
- vmmc-supply: phandle of the regulator for the VCC input
- vmmc_aux-supply: phandle of the regulator for the VCCQ input
>
> > Why is no mention of "non-removable" added, given that it's added to the
> > code?
>
> Because this file makes a reference to mmc.txt and the core properties described
> by mmc.txt are not added in ti-omap-hsmmc.txt
There is room for confusion here. While "non-removable" is a generic
property, it would be good to contrast "non-removable" and
"ti,non-removable" in the binding as they imply different things.
>
> >
> > Is one preferred over the other? That should be noted.
> >
> >> 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..5992048 100644
> >> --- a/drivers/mmc/host/omap_hsmmc.c
> >> +++ b/drivers/mmc/host/omap_hsmmc.c
> >> @@ -1738,6 +1738,9 @@ 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;
> >> + }
> >
> > This wasn't mentioned in the binding, and it seems to have different
> > semantics to "ti,non-removable". Why is it different?
> >
>
> 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.
>
> Now start using generic non-removable for all removable cards which do not
> have such limitation.
OK. I think this would be much clearer with something in the binding
contrasting the two properties.
Thanks,
Mark.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] mmc: omap_hsmmc: start using generic non-removable DT binding
2013-10-17 15:25 ` Mark Rutland
@ 2013-10-18 11:33 ` Balaji T K
0 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-18 11:33 UTC (permalink / raw)
To: Mark Rutland
Cc: bcousson@baylibre.com, devicetree@vger.kernel.org,
linux-mmc@vger.kernel.org, cjb@laptop.org,
linux-omap@vger.kernel.org, uri.y@variscite.com, Sekhar Nori
On Thursday 17 October 2013 08:55 PM, Mark Rutland wrote:
> On Thu, Oct 17, 2013 at 11:53:48AM +0100, Balaji T K wrote:
>> On Thursday 17 October 2013 02:08 PM, Mark Rutland wrote:
>>> On Wed, Oct 16, 2013 at 04:18:22PM +0100, Balaji T K wrote:
>>>> From: Sekhar Nori <nsekhar@ti.com>
>>>>
>>>> add generic "non-removable" binding support for omap_hsmmc
>>>>
>>>> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
>>>> Signed-off-by: Balaji T K <balajitk@ti.com>
>>>> ---
>>>> .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 +-
>>>> drivers/mmc/host/omap_hsmmc.c | 3 +++
>>>> 2 files changed, 4 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..3b95719 100644
>>>> --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
>>>> +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
>>>> @@ -17,7 +17,7 @@ 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 and configurable vcc
>>>
>>> Why this change?
>>>
>> Hi,
>>
>> earlier ti,non-removable was used for all eMMC and SDIO card, now it will
>> be used only for eMMC with always on vccq and configurable vcc.
>
> Please expand the commit message to mention this. It wasn't clear why
> adding support for a property meant modifying the description of
> another.
>
Hi,
Ok
>>
>>> What do "vccq" and "vcc" correspond to? The regulators are called "vmmc"
>>> and "vmmc_aux"...
>>>
>>
>> vccq and vcc are supply names of eMMC part
>
> The binding has vmmc-supply and vmmc_aux-supply. How do {vmmc,vmmc_aux}
> and {vcc,vccq} relate? That should be clarified in the binding document,
> something like:
>
> - vmmc-supply: phandle of the regulator for the VCC input
> - vmmc_aux-supply: phandle of the regulator for the VCCQ input
>
It can be different for SD card, so will add vcc to vmmc mapping to ti,non-removable
description.
>>
>>> Why is no mention of "non-removable" added, given that it's added to the
>>> code?
>>
>> Because this file makes a reference to mmc.txt and the core properties described
>> by mmc.txt are not added in ti-omap-hsmmc.txt
>
> There is room for confusion here. While "non-removable" is a generic
> property, it would be good to contrast "non-removable" and
> "ti,non-removable" in the binding as they imply different things.
>
>>
>>>
>>> Is one preferred over the other? That should be noted.
>>>
>>>> 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..5992048 100644
>>>> --- a/drivers/mmc/host/omap_hsmmc.c
>>>> +++ b/drivers/mmc/host/omap_hsmmc.c
>>>> @@ -1738,6 +1738,9 @@ 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;
>>>> + }
>>>
>>> This wasn't mentioned in the binding, and it seems to have different
>>> semantics to "ti,non-removable". Why is it different?
>>>
>>
>> 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.
>>
>> Now start using generic non-removable for all removable cards which do not
>> have such limitation.
>
> OK. I think this would be much clearer with something in the binding
> contrasting the two properties.
Thanks for comments, will add those info.
>
> Thanks,
> Mark.
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/6] ARM: dts: OMAP4/5: start using generic binding for non-removable mmc cards
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-16 15:18 ` Balaji T K
2013-10-16 15:18 ` [PATCH 3/6] ARM: dts: am335x-boneblack: mark eMMC as non removable Balaji T K
` (4 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-16 15:18 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb
Cc: linux-omap, uri.y, Sekhar Nori, Balaji T K
From: Sekhar Nori <nsekhar@ti.com>
start using generic non-removable dt binding
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/omap4-var-som.dts | 2 +-
arch/arm/boot/dts/omap5-uevm.dts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/omap4-var-som.dts b/arch/arm/boot/dts/omap4-var-som.dts
index b41269e..b25b9ad 100644
--- a/arch/arm/boot/dts/omap4-var-som.dts
+++ b/arch/arm/boot/dts/omap4-var-som.dts
@@ -76,7 +76,7 @@
&mmc1 {
vmmc-supply = <&vmmc>;
ti,bus-width = <8>;
- ti,non-removable;
+ non-removable;
};
&mmc2 {
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index d784b3a..55aecf5 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -220,12 +220,12 @@
&mmc2 {
vmmc-supply = <&vmmcsd_fixed>;
bus-width = <8>;
- ti,non-removable;
+ non-removable;
};
&mmc3 {
bus-width = <4>;
- ti,non-removable;
+ non-removable;
};
&mmc4 {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 3/6] ARM: dts: am335x-boneblack: mark eMMC as non removable
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-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 ` Balaji T K
2013-10-16 15:18 ` [PATCH 4/6] ARM: dts: dra7-evm: " Balaji T K
` (3 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-16 15:18 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb
Cc: linux-omap, uri.y, Sekhar Nori, Balaji T K
From: Sekhar Nori <nsekhar@ti.com>
Mark the eMMC module on BeagleBone black as non removable.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/am335x-boneblack.dts | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index 6b71ad9..2e189cd 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -25,6 +25,7 @@
pinctrl-names = "default";
pinctrl-0 = <&emmc_pins>;
bus-width = <8>;
+ non-removable;
status = "okay";
ti,vcc-aux-disable-is-sleep;
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 4/6] ARM: dts: dra7-evm: mark eMMC as non removable
2013-10-16 15:18 [PATCH 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding Balaji T K
` (2 preceding siblings ...)
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 ` 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
` (2 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-16 15:18 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb; +Cc: linux-omap, uri.y, Balaji T K
Mark the eMMC on dra7-evm as non removable.
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/dra7-evm.dts | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 3abf5f4..799890f 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -268,4 +268,5 @@
status = "okay";
vmmc-supply = <&mmc2_3v3>;
bus-width = <8>;
+ non-removable;
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 5/6] ARM: dts: am335x-boneblack: remove unused ti,vcc-aux-disable-is-sleep
2013-10-16 15:18 [PATCH 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding Balaji T K
` (3 preceding siblings ...)
2013-10-16 15:18 ` [PATCH 4/6] ARM: dts: dra7-evm: " Balaji T K
@ 2013-10-16 15:18 ` 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
6 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-16 15:18 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb; +Cc: linux-omap, uri.y, Balaji T K
ti,vcc-aux-disable-is-sleep property does not exist, so remove it.
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/am335x-boneblack.dts | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index 2e189cd..7c14801 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -27,7 +27,6 @@
bus-width = <8>;
non-removable;
status = "okay";
- ti,vcc-aux-disable-is-sleep;
};
&am33xx_pinmux {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 6/6] ARM: dts: omap4-var-some: fix bus-width
2013-10-16 15:18 [PATCH 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding Balaji T K
` (4 preceding siblings ...)
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 ` 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
6 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-16 15:18 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb; +Cc: linux-omap, uri.y, Balaji T K
ti,bus-width does not exist, use generic bus-width binding
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/omap4-var-som.dts | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/boot/dts/omap4-var-som.dts b/arch/arm/boot/dts/omap4-var-som.dts
index b25b9ad..2ae8608 100644
--- a/arch/arm/boot/dts/omap4-var-som.dts
+++ b/arch/arm/boot/dts/omap4-var-som.dts
@@ -75,7 +75,7 @@
&mmc1 {
vmmc-supply = <&vmmc>;
- ti,bus-width = <8>;
+ bus-width = <8>;
non-removable;
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding
2013-10-16 15:18 [PATCH 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding Balaji T K
` (5 preceding siblings ...)
2013-10-16 15:18 ` [PATCH 6/6] ARM: dts: omap4-var-some: fix bus-width Balaji T K
@ 2013-10-20 18:49 ` Balaji T K
2013-10-20 18:49 ` [PATCH v2 1/6] " Balaji T K
` (5 more replies)
6 siblings, 6 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-20 18:49 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb, uri.y, mark.rutland
Cc: linux-omap, Balaji T K
start using generic non-removable DT binding and few cleanups for
am335x-boneblack.dts and omap4-var-som.dts. Dropped changes for omap4-sdp and
omap4-panda-common.dtsi from Sekhar Nori's series [1] as non-removable already
exist for mmc5 on omap4-sdp and omap4-panda-common.dtsi
and ti,non-removable is needed for eMMC detection during boot on omap4-sdp.
[1]
http://comments.gmane.org/gmane.linux.kernel.mmc/22424
Balaji T K (3):
ARM: dts: dra7-evm: mark eMMC as non removable
ARM: dts: am335x-boneblack: remove unused ti,vcc-aux-disable-is-sleep
ARM: dts: omap4-var-som: fix bus-width
Sekhar Nori (3):
mmc: omap_hsmmc: start using generic non-removable DT binding
ARM: dts: OMAP4/5: start using generic binding for non-removable mmc
cards
ARM: dts: am335x-boneblack: mark eMMC as non removable
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 4 +++-
arch/arm/boot/dts/am335x-boneblack.dts | 2 +-
arch/arm/boot/dts/dra7-evm.dts | 1 +
arch/arm/boot/dts/omap4-var-som.dts | 4 ++--
arch/arm/boot/dts/omap5-uevm.dts | 4 ++--
drivers/mmc/host/omap_hsmmc.c | 2 ++
6 files changed, 11 insertions(+), 6 deletions(-)
--
1.7.5.4
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 1/6] mmc: omap_hsmmc: start using generic non-removable DT binding
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
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
` (4 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-20 18:49 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb, uri.y, mark.rutland
Cc: linux-omap, Sekhar Nori, Balaji T K
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
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 2/6] ARM: dts: OMAP4/5: start using generic binding for non-removable mmc cards
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 ` [PATCH v2 1/6] " Balaji T K
@ 2013-10-20 18:49 ` Balaji T K
2013-10-20 18:49 ` [PATCH v2 3/6] ARM: dts: am335x-boneblack: mark eMMC as non removable Balaji T K
` (3 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-20 18:49 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb, uri.y, mark.rutland
Cc: linux-omap, Sekhar Nori, Balaji T K
From: Sekhar Nori <nsekhar@ti.com>
start using generic non-removable dt binding
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/omap4-var-som.dts | 2 +-
arch/arm/boot/dts/omap5-uevm.dts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/omap4-var-som.dts b/arch/arm/boot/dts/omap4-var-som.dts
index b41269e..b25b9ad 100644
--- a/arch/arm/boot/dts/omap4-var-som.dts
+++ b/arch/arm/boot/dts/omap4-var-som.dts
@@ -76,7 +76,7 @@
&mmc1 {
vmmc-supply = <&vmmc>;
ti,bus-width = <8>;
- ti,non-removable;
+ non-removable;
};
&mmc2 {
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index e06a04a..eb9d913 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -220,12 +220,12 @@
&mmc2 {
vmmc-supply = <&vmmcsd_fixed>;
bus-width = <8>;
- ti,non-removable;
+ non-removable;
};
&mmc3 {
bus-width = <4>;
- ti,non-removable;
+ non-removable;
};
&mmc4 {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 3/6] ARM: dts: am335x-boneblack: mark eMMC as non removable
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 ` [PATCH v2 1/6] " Balaji T K
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 ` Balaji T K
2013-10-20 18:49 ` [PATCH v2 4/6] ARM: dts: dra7-evm: " Balaji T K
` (2 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-20 18:49 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb, uri.y, mark.rutland
Cc: linux-omap, Sekhar Nori, Balaji T K
From: Sekhar Nori <nsekhar@ti.com>
Mark the eMMC module on BeagleBone black as non removable.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/am335x-boneblack.dts | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index 6b71ad9..2e189cd 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -25,6 +25,7 @@
pinctrl-names = "default";
pinctrl-0 = <&emmc_pins>;
bus-width = <8>;
+ non-removable;
status = "okay";
ti,vcc-aux-disable-is-sleep;
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 4/6] ARM: dts: dra7-evm: mark eMMC as non removable
2013-10-20 18:49 ` [PATCH v2 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding Balaji T K
` (2 preceding siblings ...)
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 ` 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
5 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-20 18:49 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb, uri.y, mark.rutland
Cc: linux-omap, Balaji T K
Mark the eMMC on dra7-evm as non removable.
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/dra7-evm.dts | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 3abf5f4..799890f 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -268,4 +268,5 @@
status = "okay";
vmmc-supply = <&mmc2_3v3>;
bus-width = <8>;
+ non-removable;
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 5/6] ARM: dts: am335x-boneblack: remove unused ti,vcc-aux-disable-is-sleep
2013-10-20 18:49 ` [PATCH v2 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding Balaji T K
` (3 preceding siblings ...)
2013-10-20 18:49 ` [PATCH v2 4/6] ARM: dts: dra7-evm: " Balaji T K
@ 2013-10-20 18:49 ` Balaji T K
2013-10-20 18:49 ` [PATCH v2 6/6] ARM: dts: omap4-var-som: fix bus-width Balaji T K
5 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-20 18:49 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb, uri.y, mark.rutland
Cc: linux-omap, Balaji T K
ti,vcc-aux-disable-is-sleep property does not exist, so remove it.
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/am335x-boneblack.dts | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index 2e189cd..7c14801 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -27,7 +27,6 @@
bus-width = <8>;
non-removable;
status = "okay";
- ti,vcc-aux-disable-is-sleep;
};
&am33xx_pinmux {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 6/6] ARM: dts: omap4-var-som: fix bus-width
2013-10-20 18:49 ` [PATCH v2 0/6] mmc: omap_hsmmc: start using generic non-removable DT binding Balaji T K
` (4 preceding siblings ...)
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 ` Balaji T K
5 siblings, 0 replies; 18+ messages in thread
From: Balaji T K @ 2013-10-20 18:49 UTC (permalink / raw)
To: bcousson, devicetree, linux-mmc, cjb, uri.y, mark.rutland
Cc: linux-omap, Balaji T K
ti,bus-width does not exist, use generic bus-width binding
Signed-off-by: Balaji T K <balajitk@ti.com>
---
arch/arm/boot/dts/omap4-var-som.dts | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/boot/dts/omap4-var-som.dts b/arch/arm/boot/dts/omap4-var-som.dts
index b25b9ad..2ae8608 100644
--- a/arch/arm/boot/dts/omap4-var-som.dts
+++ b/arch/arm/boot/dts/omap4-var-som.dts
@@ -75,7 +75,7 @@
&mmc1 {
vmmc-supply = <&vmmc>;
- ti,bus-width = <8>;
+ bus-width = <8>;
non-removable;
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 18+ messages in thread