[PATCH 1/2] ARM: dts: am335x: Update elm phandle binding

[PATCH 1/2] ARM: dts: am335x: Update elm phandle binding

[Teresa Remmet]

The check for the "elm_id" binding had been removed.
This causes nand boot to fail on boards still using
the old binding. Update the bindings on those boards.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/boot/dts/am335x-baltos.dtsi      | 2 +-
 arch/arm/boot/dts/am335x-igep0033.dtsi    | 2 +-
 arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi
index c8609d8..b689172 100644
--- a/arch/arm/boot/dts/am335x-baltos.dtsi
+++ b/arch/arm/boot/dts/am335x-baltos.dtsi
@@ -226,7 +226,7 @@
 
 		#address-cells = <1>;
 		#size-cells = <1>;
-		elm_id = <&elm>;
+		ti,elm-id = <&elm>;
 	};
 };
 
diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
index df63484..e7d9ca1 100644
--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
@@ -161,7 +161,7 @@
 
 		#address-cells = <1>;
 		#size-cells = <1>;
-		elm_id = <&elm>;
+		ti,elm-id = <&elm>;
 
 		/* MTD partition table */
 		partition at 0 {
diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 86f7731..1263c9d 100644
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -197,7 +197,7 @@
 		gpmc,wr-access-ns = <30>;
 		gpmc,wr-data-mux-bus-ns = <0>;
 
-		elm_id = <&elm>;
+		ti,elm-id = <&elm>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;
-- 
1.9.1

[PATCH 2/2] mtd: nand: omap2: Add check for old elm binding

[Teresa Remmet]

commit c9711ec5250b ("mtd: nand: omap: Clean up device tree support")
removes the check for the old elm phandle binding.
Add it again to keep backward compatibility.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 drivers/mtd/nand/omap2.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 08e1588..d788663 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1658,7 +1658,9 @@ static int omap_get_dt_info(struct device *dev, struct omap_nand_info *info)
 	/* detect availability of ELM module. Won't be present pre-OMAP4 */
 	info->elm_of_node = of_parse_phandle(child, "ti,elm-id", 0);
 	if (!info->elm_of_node)
-		dev_dbg(dev, "ti,elm-id not in DT\n");
+		info->elm_of_node = of_parse_phandle(child, "elm_id", 0);
+		if (!info->elm_of_node)
+			dev_dbg(dev, "ti,elm-id not in DT\n");
 
 	/* select ecc-scheme for NAND */
 	if (of_property_read_string(child, "ti,nand-ecc-opt", &s)) {
-- 
1.9.1

[PATCH 2/2] mtd: nand: omap2: Add check for old elm binding

[Brian Norris]

On Tue, Jul 05, 2016 at 11:32:30AM +0200, Teresa Remmet wrote:
> commit c9711ec5250b ("mtd: nand: omap: Clean up device tree support")
> removes the check for the old elm phandle binding.

That seems like a silly breakage of backwards compatibility. Must have
overlooked that one, sorry.

> Add it again to keep backward compatibility.
> 
> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>

I think we should probably take this for v4.7, since the breaking commit
was only merged in v4.7-rc1. OMAP folks, any comment?

Brian

> ---
>  drivers/mtd/nand/omap2.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
> index 08e1588..d788663 100644
> --- a/drivers/mtd/nand/omap2.c
> +++ b/drivers/mtd/nand/omap2.c
> @@ -1658,7 +1658,9 @@ static int omap_get_dt_info(struct device *dev, struct omap_nand_info *info)
>  	/* detect availability of ELM module. Won't be present pre-OMAP4 */
>  	info->elm_of_node = of_parse_phandle(child, "ti,elm-id", 0);
>  	if (!info->elm_of_node)
> -		dev_dbg(dev, "ti,elm-id not in DT\n");
> +		info->elm_of_node = of_parse_phandle(child, "elm_id", 0);
> +		if (!info->elm_of_node)
> +			dev_dbg(dev, "ti,elm-id not in DT\n");
>  
>  	/* select ecc-scheme for NAND */
>  	if (of_property_read_string(child, "ti,nand-ecc-opt", &s)) {
> -- 
> 1.9.1
> 

[PATCH 2/2] mtd: nand: omap2: Add check for old elm binding

[Brian Norris]

On Sat, Jul 09, 2016 at 05:56:14PM -0700, Brian Norris wrote:
> On Tue, Jul 05, 2016 at 11:32:30AM +0200, Teresa Remmet wrote:
> > commit c9711ec5250b ("mtd: nand: omap: Clean up device tree support")
> > removes the check for the old elm phandle binding.
> 
> That seems like a silly breakage of backwards compatibility. Must have
> overlooked that one, sorry.
> 
> > Add it again to keep backward compatibility.
> > 
> > Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> 
> I think we should probably take this for v4.7, since the breaking commit
> was only merged in v4.7-rc1. OMAP folks, any comment?

Applied to linux-mtd.git. I plan to send this to Linus for v4.7, since
it's a DT regression, unless someone has a good reason not to.

Brian

[PATCH 1/2] ARM: dts: am335x: Update elm phandle binding

[Brian Norris]

On Tue, Jul 05, 2016 at 11:32:29AM +0200, Teresa Remmet wrote:
> The check for the "elm_id" binding had been removed.
> This causes nand boot to fail on boards still using
> the old binding. Update the bindings on those boards.

Acked-by: Brian Norris <computersforpeace@gmail.com>

We're fixing the backward compatibility issue anyway, but might as well
"upgrade" the device tree.

> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> ---
>  arch/arm/boot/dts/am335x-baltos.dtsi      | 2 +-
>  arch/arm/boot/dts/am335x-igep0033.dtsi    | 2 +-
>  arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi
> index c8609d8..b689172 100644
> --- a/arch/arm/boot/dts/am335x-baltos.dtsi
> +++ b/arch/arm/boot/dts/am335x-baltos.dtsi
> @@ -226,7 +226,7 @@
>  
>  		#address-cells = <1>;
>  		#size-cells = <1>;
> -		elm_id = <&elm>;
> +		ti,elm-id = <&elm>;
>  	};
>  };
>  
> diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
> index df63484..e7d9ca1 100644
> --- a/arch/arm/boot/dts/am335x-igep0033.dtsi
> +++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
> @@ -161,7 +161,7 @@
>  
>  		#address-cells = <1>;
>  		#size-cells = <1>;
> -		elm_id = <&elm>;
> +		ti,elm-id = <&elm>;
>  
>  		/* MTD partition table */
>  		partition at 0 {
> diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
> index 86f7731..1263c9d 100644
> --- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
> +++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
> @@ -197,7 +197,7 @@
>  		gpmc,wr-access-ns = <30>;
>  		gpmc,wr-data-mux-bus-ns = <0>;
>  
> -		elm_id = <&elm>;
> +		ti,elm-id = <&elm>;
>  
>  		#address-cells = <1>;
>  		#size-cells = <1>;
> -- 
> 1.9.1
> 

[PATCH 2/2] mtd: nand: omap2: Add check for old elm binding

[Roger Quadros]

On 13/07/16 20:13, Brian Norris wrote:
> On Sat, Jul 09, 2016 at 05:56:14PM -0700, Brian Norris wrote:
>> On Tue, Jul 05, 2016 at 11:32:30AM +0200, Teresa Remmet wrote:
>>> commit c9711ec5250b ("mtd: nand: omap: Clean up device tree support")
>>> removes the check for the old elm phandle binding.
>>
>> That seems like a silly breakage of backwards compatibility. Must have
>> overlooked that one, sorry.
>>
>>> Add it again to keep backward compatibility.
>>>
>>> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
>>
>> I think we should probably take this for v4.7, since the breaking commit
>> was only merged in v4.7-rc1. OMAP folks, any comment?
> 
> Applied to linux-mtd.git. I plan to send this to Linus for v4.7, since
> it's a DT regression, unless someone has a good reason not to.
> 

Sorry for the late reply as I was on vacation.
Thanks for the patch Teresa and thank you Brian for taking it into v4.7 :).

cheers,
-roger

[PATCH 1/2] ARM: dts: am335x: Update elm phandle binding

[Roger Quadros]

On 13/07/16 20:14, Brian Norris wrote:
> On Tue, Jul 05, 2016 at 11:32:29AM +0200, Teresa Remmet wrote:
>> The check for the "elm_id" binding had been removed.
>> This causes nand boot to fail on boards still using
>> the old binding. Update the bindings on those boards.
> 
> Acked-by: Brian Norris <computersforpeace@gmail.com>
> 
> We're fixing the backward compatibility issue anyway, but might as well
> "upgrade" the device tree.
> 
>> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>

Acked-by: Roger Quadros <rogerq@ti.com>

Tony,

Please take this one via your OMAP DT tree. Thanks.

cheers,
-roger

>> ---
>>  arch/arm/boot/dts/am335x-baltos.dtsi      | 2 +-
>>  arch/arm/boot/dts/am335x-igep0033.dtsi    | 2 +-
>>  arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi
>> index c8609d8..b689172 100644
>> --- a/arch/arm/boot/dts/am335x-baltos.dtsi
>> +++ b/arch/arm/boot/dts/am335x-baltos.dtsi
>> @@ -226,7 +226,7 @@
>>  
>>  		#address-cells = <1>;
>>  		#size-cells = <1>;
>> -		elm_id = <&elm>;
>> +		ti,elm-id = <&elm>;
>>  	};
>>  };
>>  
>> diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
>> index df63484..e7d9ca1 100644
>> --- a/arch/arm/boot/dts/am335x-igep0033.dtsi
>> +++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
>> @@ -161,7 +161,7 @@
>>  
>>  		#address-cells = <1>;
>>  		#size-cells = <1>;
>> -		elm_id = <&elm>;
>> +		ti,elm-id = <&elm>;
>>  
>>  		/* MTD partition table */
>>  		partition at 0 {
>> diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
>> index 86f7731..1263c9d 100644
>> --- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
>> +++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
>> @@ -197,7 +197,7 @@
>>  		gpmc,wr-access-ns = <30>;
>>  		gpmc,wr-data-mux-bus-ns = <0>;
>>  
>> -		elm_id = <&elm>;
>> +		ti,elm-id = <&elm>;
>>  
>>  		#address-cells = <1>;
>>  		#size-cells = <1>;
>> -- 
>> 1.9.1
>>

[PATCH 1/2] ARM: dts: am335x: Update elm phandle binding

[Tony Lindgren]

* Roger Quadros <rogerq@ti.com> [160801 02:25]:
> On 13/07/16 20:14, Brian Norris wrote:
> > On Tue, Jul 05, 2016 at 11:32:29AM +0200, Teresa Remmet wrote:
> >> The check for the "elm_id" binding had been removed.
> >> This causes nand boot to fail on boards still using
> >> the old binding. Update the bindings on those boards.
> > 
> > Acked-by: Brian Norris <computersforpeace@gmail.com>
> > 
> > We're fixing the backward compatibility issue anyway, but might as well
> > "upgrade" the device tree.
> > 
> >> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> 
> Acked-by: Roger Quadros <rogerq@ti.com>
> 
> Tony,
> 
> Please take this one via your OMAP DT tree. Thanks.

Applying to omap-for-v4.8/fixes finally thanks. Sorry for
the delay.

Regards,

Tony