diff mbox

ARM: dts: Fix GPMC device width property

Message ID 20171103095604.xzri77aljgwsimsz@lenoch (mailing list archive)
State New, archived
Headers show

Commit Message

Ladislav Michl Nov. 3, 2017, 9:56 a.m. UTC 
Currently undocumented bank-width property is used to configure
device width per GPMC chip select instead of documented
'gpmc,device-width'. Add (or correct) documented property
where it is missing.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 arch/arm/boot/dts/am335x-nano.dts                 | 2 ++
 arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi         | 2 +-
 arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi         | 1 +
 arch/arm/boot/dts/omap-zoom-common.dtsi           | 2 +-
 arch/arm/boot/dts/omap2420-h4.dts                 | 1 +
 arch/arm/boot/dts/omap2430-sdp.dts                | 1 +
 arch/arm/boot/dts/omap3-devkit8000-common.dtsi    | 2 +-
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi           | 1 +
 arch/arm/boot/dts/omap3-lilly-dbb056.dts          | 1 +
 arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 1 +
 arch/arm/boot/dts/omap3-sb-t35.dtsi               | 2 +-
 arch/arm/boot/dts/omap3430-sdp.dts                | 1 +
 12 files changed, 13 insertions(+), 4 deletions(-)

Comments

Roger Quadros Nov. 3, 2017, 12:06 p.m. UTC | #1 
Ladislav,

On 03/11/17 11:56, Ladislav Michl wrote:
> Currently undocumented bank-width property is used to configure
> device width per GPMC chip select instead of documented
> 'gpmc,device-width'. Add (or correct) documented property
> where it is missing.
> 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
>  arch/arm/boot/dts/am335x-nano.dts                 | 2 ++
>  arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi         | 2 +-
>  arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi         | 1 +
>  arch/arm/boot/dts/omap-zoom-common.dtsi           | 2 +-
>  arch/arm/boot/dts/omap2420-h4.dts                 | 1 +
>  arch/arm/boot/dts/omap2430-sdp.dts                | 1 +
>  arch/arm/boot/dts/omap3-devkit8000-common.dtsi    | 2 +-
>  arch/arm/boot/dts/omap3-lilly-a83x.dtsi           | 1 +
>  arch/arm/boot/dts/omap3-lilly-dbb056.dts          | 1 +
>  arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 1 +
>  arch/arm/boot/dts/omap3-sb-t35.dtsi               | 2 +-
>  arch/arm/boot/dts/omap3430-sdp.dts                | 1 +
>  12 files changed, 13 insertions(+), 4 deletions(-)

Aren't all the changes to NOR devices?
bank-width is mandatory for NOR devices [1] so gpmc,device-width is redundant for them.

[1] Documentation/devicetree/bindings/mtd/gpmc-nor.txt
Ladislav Michl Nov. 3, 2017, 12:40 p.m. UTC | #2 
On Fri, Nov 03, 2017 at 02:06:34PM +0200, Roger Quadros wrote:
> Ladislav,
> 
> On 03/11/17 11:56, Ladislav Michl wrote:
> > Currently undocumented bank-width property is used to configure
> > device width per GPMC chip select instead of documented
> > 'gpmc,device-width'. Add (or correct) documented property
> > where it is missing.
> > 
> > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > ---
> >  arch/arm/boot/dts/am335x-nano.dts                 | 2 ++
> >  arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi         | 2 +-
> >  arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi         | 1 +
> >  arch/arm/boot/dts/omap-zoom-common.dtsi           | 2 +-
> >  arch/arm/boot/dts/omap2420-h4.dts                 | 1 +
> >  arch/arm/boot/dts/omap2430-sdp.dts                | 1 +
> >  arch/arm/boot/dts/omap3-devkit8000-common.dtsi    | 2 +-
> >  arch/arm/boot/dts/omap3-lilly-a83x.dtsi           | 1 +
> >  arch/arm/boot/dts/omap3-lilly-dbb056.dts          | 1 +
> >  arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 1 +
> >  arch/arm/boot/dts/omap3-sb-t35.dtsi               | 2 +-
> >  arch/arm/boot/dts/omap3430-sdp.dts                | 1 +
> >  12 files changed, 13 insertions(+), 4 deletions(-)
> 
> Aren't all the changes to NOR devices?
> bank-width is mandatory for NOR devices [1] so gpmc,device-width is redundant for them.

No, these are also ethernets and uarts.

> [1] Documentation/devicetree/bindings/mtd/gpmc-nor.txt

Given your previous comment I'll drop changes for all NOR device nodes in v2.

	ladis
> -- 
> cheers,
> -roger
> 
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index 946d7069f417..cc441af9e2d3 100644
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -258,6 +258,7 @@ 
 		linux,mtd-name = "spansion,s29gl010p11t";
 		bank-width = <2>;
 
+		gpmc,device-width = <2>;
 		gpmc,mux-add-data = <2>;
 
 		gpmc,sync-clk-ps = <0>;
@@ -348,6 +349,7 @@ 
 		reg = <1 0x00000000 0x01000000>;
 		bank-width = <2>;
 
+		gpmc,device-width = <2>;
 		gpmc,mux-add-data = <2>;
 
 		gpmc,sync-clk-ps = <0>;
diff --git a/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi b/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi
index 445fafc73254..f17aa9127122 100644
--- a/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi
+++ b/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi
@@ -23,7 +23,7 @@ 
 	ethernet@gpmc {
 		compatible = "smsc,lan9221", "smsc,lan9115";
 		bank-width = <2>;
-		gpmc,device-width = <1>;
+		gpmc,device-width = <2>;
 		gpmc,cycle2cycle-samecsen = <1>;
 		gpmc,cycle2cycle-diffcsen = <1>;
 		gpmc,cs-on-ns = <5>;
diff --git a/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi b/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi
index 73e272fadc20..cd119c3ffb6c 100644
--- a/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi
+++ b/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi
@@ -28,6 +28,7 @@ 
 		compatible = "smsc,lan9221","smsc,lan9115";
 		bank-width = <2>;
 
+		gpmc,device-width = <2>;
 		gpmc,mux-add-data;
 		gpmc,cs-on-ns = <0>;
 		gpmc,cs-rd-off-ns = <42>;
diff --git a/arch/arm/boot/dts/omap-zoom-common.dtsi b/arch/arm/boot/dts/omap-zoom-common.dtsi
index 46ef3e443861..451c9fb57697 100644
--- a/arch/arm/boot/dts/omap-zoom-common.dtsi
+++ b/arch/arm/boot/dts/omap-zoom-common.dtsi
@@ -24,7 +24,7 @@ 
 		clock-frequency = <1843200>;
 		current-speed = <115200>;
 		gpmc,mux-add-data = <0>;
-		gpmc,device-width = <1>;
+		gpmc,device-width = <2>;
 		gpmc,wait-pin = <1>;
 		gpmc,cycle2cycle-samecsen = <1>;
 		gpmc,cycle2cycle-diffcsen = <1>;
diff --git a/arch/arm/boot/dts/omap2420-h4.dts b/arch/arm/boot/dts/omap2420-h4.dts
index 9265c0b9c3f3..a004f15ab925 100644
--- a/arch/arm/boot/dts/omap2420-h4.dts
+++ b/arch/arm/boot/dts/omap2420-h4.dts
@@ -30,6 +30,7 @@ 
 		reg = <0 0 0x04000000>;
 		bank-width = <2>;
 
+		gpmc,device-width = <2>;
 		gpmc,mux-add-data = <2>;
 		gpmc,cs-on-ns = <10>;
 		gpmc,cs-rd-off-ns = <160>;
diff --git a/arch/arm/boot/dts/omap2430-sdp.dts b/arch/arm/boot/dts/omap2430-sdp.dts
index 4f7d9d7c00c7..4314b79c26a6 100644
--- a/arch/arm/boot/dts/omap2430-sdp.dts
+++ b/arch/arm/boot/dts/omap2430-sdp.dts
@@ -43,6 +43,7 @@ 
 		interrupts = <21 IRQ_TYPE_LEVEL_LOW>;	/* gpio149 */
 		reg = <5 0x300 0xf>;
 		bank-width = <2>;
+		gpmc,device-width = <2>;
 		gpmc,sync-clk-ps = <0>;
 		gpmc,mux-add-data = <2>;
 		gpmc,device-width = <1>;
diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index 0c0bb1b01b0b..72bb7c665472 100644
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -268,7 +268,7 @@ 
 		davicom,no-eeprom;
 
 		gpmc,mux-add-data = <0>;
-		gpmc,device-width = <1>;
+		gpmc,device-width = <2>;
 		gpmc,wait-pin = <0>;
 		gpmc,cycle2cycle-samecsen = <1>;
 		gpmc,cycle2cycle-diffcsen = <1>;
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index fa611a5e4850..befd159d837e 100644
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -428,6 +428,7 @@ 
 	ethernet@7,0 {
 		compatible = "smsc,lan9221", "smsc,lan9115";
 		bank-width = <2>;
+		gpmc,device-width = <2>;
 		gpmc,mux-add-data = <2>;
 		gpmc,cs-on-ns = <10>;
 		gpmc,cs-rd-off-ns = <60>;
diff --git a/arch/arm/boot/dts/omap3-lilly-dbb056.dts b/arch/arm/boot/dts/omap3-lilly-dbb056.dts
index 0e3c9812f4e3..11c278aae2f0 100644
--- a/arch/arm/boot/dts/omap3-lilly-dbb056.dts
+++ b/arch/arm/boot/dts/omap3-lilly-dbb056.dts
@@ -135,6 +135,7 @@ 
 	ethernet@4,0 {
 		compatible = "smsc,lan9117", "smsc,lan9115";
 		bank-width = <2>;
+		gpmc,device-width = <2>;
 		gpmc,mux-add-data = <2>;
 		gpmc,cs-on-ns = <10>;
 		gpmc,cs-rd-off-ns = <65>;
diff --git a/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi b/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
index 82e98ee3023a..20371b145a6e 100644
--- a/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
@@ -25,6 +25,7 @@ 
 		compatible = "smsc,lan9221","smsc,lan9115";
 		bank-width = <2>;
 
+		gpmc,device-width = <2>;
 		gpmc,mux-add-data;
 		gpmc,cs-on-ns = <0>;
 		gpmc,cs-rd-off-ns = <42>;
diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi
index 4476fb685a1b..631d24fcbd72 100644
--- a/arch/arm/boot/dts/omap3-sb-t35.dtsi
+++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi
@@ -106,7 +106,7 @@ 
 		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
 		reg = <4 0 0xff>;
 		bank-width = <2>;
-		gpmc,device-width = <1>;
+		gpmc,device-width = <2>;
 		gpmc,cycle2cycle-samecsen = <1>;
 		gpmc,cycle2cycle-diffcsen = <1>;
 		gpmc,cs-on-ns = <5>;
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index 908951eb5943..d50a105c9dc6 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -62,6 +62,7 @@ 
 		reg = <0 0 0x08000000>;
 		bank-width = <2>;
 
+		gpmc,device-width = <2>;
 		gpmc,mux-add-data = <2>;
 		gpmc,cs-on-ns = <0>;
 		gpmc,cs-rd-off-ns = <186>;