diff mbox

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

Message ID 1467711150-23356-1-git-send-email-t.remmet@phytec.de (mailing list archive)
State New, archived
Headers show

Commit Message

Teresa Remmet July 5, 2016, 9:32 a.m. UTC
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(-)

Comments

Brian Norris July 13, 2016, 5:14 p.m. UTC | #1
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@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
>
Roger Quadros Aug. 1, 2016, 9:25 a.m. UTC | #2
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@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
>>
Tony Lindgren Aug. 15, 2016, 4:02 p.m. UTC | #3
* 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
diff mbox

Patch

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@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>;