ARM: dts: am335x: Update elm phandle binding
Subsystems (3)
PATCH 1/2 ARM: dts: am335x: Update elm phandle binding
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.
--- 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(-)
arch/arm/boot/dts/am335x-baltos.dtsi +1 -1
@@ -226,7 +226,7 @@ #address-cells = <1>; #size-cells = <1>; - elm_id = <&elm>; + ti,elm-id = <&elm>; }; };
arch/arm/boot/dts/am335x-igep0033.dtsi +1 -1
@@ -161,7 +161,7 @@ #address-cells = <1>; #size-cells = <1>; - elm_id = <&elm>; + ti,elm-id = <&elm>; /* MTD partition table */ partition at 0 {
arch/arm/boot/dts/am335x-phycore-som.dtsi +1 -1
@@ -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>;
Signature · 1 line
1.9.1
PATCH 2/2 mtd: nand: omap2: Add check for old elm binding
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.
--- drivers/mtd/nand/omap2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/nand/omap2.c +3 -1
@@ -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)) {
Signature · 1 line
1.9.1
PATCH 2/2 mtd: nand: omap2: Add check for old elm binding
Quoted 2 lines · Teresa Remmet
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.
Quoted 3 lines
Add it again to keep backward compatibility.
Signed-off-by Teresa Remmet <[email protected]>
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
Quoted 22 lines
--- drivers/mtd/nand/omap2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/mtd/nand/omap2.c +3
-1@@ -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)) {Signature · 1 line
1.9.1
Brian Norris
AppliedPATCH 2/2 mtd: nand: omap2: Add check for old elm binding
Quoted 7 lines · Brian Norris
Quoted 2 lines · Teresa Remmet
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.
Quoted 6 lines
Quoted 3 lines
Add it again to keep backward compatibility.
Signed-off-by Teresa Remmet <[email protected]>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 2/2 mtd: nand: omap2: Add check for old elm binding
Quoted 10 lines · Brian Norris
Quoted 9 lines · Brian Norris
Quoted 2 lines · Teresa Remmet
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.
Quoted 2 lines
Add it again to keep backward compatibility.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Teresa Remmet <[email protected]>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
In reply to Teresa RemmetQuoted 3 lines · 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.
We're fixing the backward compatibility issue anyway, but might as well "upgrade" the device tree.
Quoted 49 lines
Signed-off-by Teresa Remmet <[email protected]>--- 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(-)arch/arm/boot/dts/am335x-baltos.dtsi +1
-1@@ -226,7 +226,7 @@ #address-cells = <1>; #size-cells = <1>; - elm_id = <&elm>; + ti,elm-id = <&elm>; }; };arch/arm/boot/dts/am335x-igep0033.dtsi +1
-1@@ -161,7 +161,7 @@ #address-cells = <1>; #size-cells = <1>; - elm_id = <&elm>; + ti,elm-id = <&elm>; /* MTD partition table */ partition at 0 {arch/arm/boot/dts/am335x-phycore-som.dtsi +1
-1@@ -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>;Signature · 1 line
1.9.1
PATCH 1/2 ARM: dts: am335x: Update elm phandle binding
Quoted 11 lines · Brian Norris
Quoted 3 lines · 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.Acked-by Brian Norris <[email protected]>We're fixing the backward compatibility issue anyway, but might as well "upgrade" the device tree.
Quoted 1 line
Signed-off-by Teresa Remmet <[email protected]>
Tony,
Please take this one via your OMAP DT tree. Thanks.
cheers,
-roger
Quoted 48 lines
Quoted 48 lines
--- 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(-)arch/arm/boot/dts/am335x-baltos.dtsi +1
-1@@ -226,7 +226,7 @@ #address-cells = <1>; #size-cells = <1>; - elm_id = <&elm>; + ti,elm-id = <&elm>; }; };arch/arm/boot/dts/am335x-igep0033.dtsi +1
-1@@ -161,7 +161,7 @@ #address-cells = <1>; #size-cells = <1>; - elm_id = <&elm>; + ti,elm-id = <&elm>; /* MTD partition table */ partition at 0 {arch/arm/boot/dts/am335x-phycore-som.dtsi +1
-1@@ -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>;Signature · 1 line
1.9.1
PATCH 1/2 ARM: dts: am335x: Update elm phandle binding
Quoted 11 lines · Roger Quadros
Quoted 10 lines · Brian Norris
Quoted 3 lines · 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.Acked-by Brian Norris <[email protected]>We're fixing the backward compatibility issue anyway, but might as well "upgrade" the device tree.
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Signed-off-by Teresa Remmet <[email protected]>Acked-by Roger Quadros <[email protected]>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