diff mbox

ARM: kirkwood: add "jedec,spi-nor" flash compatible binding

Message ID 1432035616-14783-1-git-send-email-zajec5@gmail.com
State Not Applicable
Headers show

Commit Message

Rafał Miłecki May 19, 2015, 11:40 a.m. UTC
Starting with commit 8947e396a829 ("Documentation: dt: mtd: replace
"nor-jedec" binding with "jedec, spi-nor"") we have "jedec,spi-nor"
binding indicating support for JEDEC identification.

Use it for all flashes that are supposed to support READ ID op according
to the datasheets.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 arch/arm/boot/dts/kirkwood-b3.dts              | 2 +-
 arch/arm/boot/dts/kirkwood-cloudbox.dts        | 2 +-
 arch/arm/boot/dts/kirkwood-dir665.dts          | 2 +-
 arch/arm/boot/dts/kirkwood-dreamplug.dts       | 2 +-
 arch/arm/boot/dts/kirkwood-lsxl.dtsi           | 2 +-
 arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 +-
 arch/arm/boot/dts/kirkwood-netxbig.dtsi        | 2 +-
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi     | 2 +-
 arch/arm/boot/dts/kirkwood-rd88f6192.dts       | 2 +-
 arch/arm/boot/dts/kirkwood-synology.dtsi       | 2 +-
 arch/arm/boot/dts/kirkwood-t5325.dts           | 2 +-
 arch/arm/boot/dts/kirkwood-ts219.dtsi          | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

Comments

Gregory CLEMENT May 25, 2015, 2:51 p.m. UTC | #1
Hi Rafał,

On 19/05/2015 13:40, Rafał Miłecki wrote:
> Starting with commit 8947e396a829 ("Documentation: dt: mtd: replace
> "nor-jedec" binding with "jedec, spi-nor"") we have "jedec,spi-nor"
> binding indicating support for JEDEC identification.
> 
> Use it for all flashes that are supposed to support READ ID op according
> to the datasheets.
> 
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
As now thre was a agreement about the binding,
applied on mvebu/dt

Thanks,

Gregory

> ---
>  arch/arm/boot/dts/kirkwood-b3.dts              | 2 +-
>  arch/arm/boot/dts/kirkwood-cloudbox.dts        | 2 +-
>  arch/arm/boot/dts/kirkwood-dir665.dts          | 2 +-
>  arch/arm/boot/dts/kirkwood-dreamplug.dts       | 2 +-
>  arch/arm/boot/dts/kirkwood-lsxl.dtsi           | 2 +-
>  arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 +-
>  arch/arm/boot/dts/kirkwood-netxbig.dtsi        | 2 +-
>  arch/arm/boot/dts/kirkwood-ns2-common.dtsi     | 2 +-
>  arch/arm/boot/dts/kirkwood-rd88f6192.dts       | 2 +-
>  arch/arm/boot/dts/kirkwood-synology.dtsi       | 2 +-
>  arch/arm/boot/dts/kirkwood-t5325.dts           | 2 +-
>  arch/arm/boot/dts/kirkwood-ts219.dtsi          | 2 +-
>  12 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
> index c9247f8..d2936ad 100644
> --- a/arch/arm/boot/dts/kirkwood-b3.dts
> +++ b/arch/arm/boot/dts/kirkwood-b3.dts
> @@ -74,7 +74,7 @@
>  			m25p16@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "st,m25p16";
> +				compatible = "st,m25p16", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <40000000>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
> index ab6ab49..7ec7656 100644
> --- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
> +++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
> @@ -42,7 +42,7 @@
>  			flash@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "mxicy,mx25l4005a";
> +				compatible = "mxicy,mx25l4005a", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <20000000>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-dir665.dts b/arch/arm/boot/dts/kirkwood-dir665.dts
> index 786959e..0473fcc 100644
> --- a/arch/arm/boot/dts/kirkwood-dir665.dts
> +++ b/arch/arm/boot/dts/kirkwood-dir665.dts
> @@ -93,7 +93,7 @@
>  			m25p80@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "mxicy,mx25l12805d";
> +				compatible = "mxicy,mx25l12805d", "jedec,spi-nor";
>  				spi-max-frequency = <50000000>;
>  				reg = <0>;
>  
> diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
> index 6467c79..e2abc82 100644
> --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
> +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
> @@ -42,7 +42,7 @@
>  			m25p40@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "mxicy,mx25l1606e";
> +				compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <50000000>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> index 5348447..1d6528d 100644
> --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> @@ -74,7 +74,7 @@
>  			m25p40@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "m25p40";
> +				compatible = "m25p40", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <25000000>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> index f82827d..b7e7d78 100644
> --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> @@ -65,7 +65,7 @@
>  			flash@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "mxicy,mx25l12805d";
> +				compatible = "mxicy,mx25l12805d", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <50000000>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
> index b0cfb7c..1508b121 100644
> --- a/arch/arm/boot/dts/kirkwood-netxbig.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
> @@ -33,7 +33,7 @@
>  			flash@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "mxicy,mx25l4005a";
> +				compatible = "mxicy,mx25l4005a", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <20000000>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
> index fe6c024..e832b63 100644
> --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
> @@ -29,7 +29,7 @@
>  			flash@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "mxicy,mx25l4005a";
> +				compatible = "mxicy,mx25l4005a", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <20000000>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
> index 35a29de..e0b9593 100644
> --- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
> +++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
> @@ -61,7 +61,7 @@
>  			m25p128@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "st,m25p128";
> +				compatible = "st,m25p128", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <20000000>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
> index 8be5b2e..04015c17 100644
> --- a/arch/arm/boot/dts/kirkwood-synology.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
> @@ -217,7 +217,7 @@
>  			m25p80@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "st,m25p80";
> +				compatible = "st,m25p80", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <20000000>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
> index 610ec0f..ed956b8 100644
> --- a/arch/arm/boot/dts/kirkwood-t5325.dts
> +++ b/arch/arm/boot/dts/kirkwood-t5325.dts
> @@ -88,7 +88,7 @@
>  			flash@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "st,m25p80";
> +				compatible = "st,m25p80", "jedec,spi-nor";
>  				spi-max-frequency = <86000000>;
>  				reg = <0>;
>  				mode = <0>;
> diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
> index df7f152..c56ab6b 100644
> --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
> @@ -49,7 +49,7 @@
>  			m25p128@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "m25p128";
> +				compatible = "m25p128", "jedec,spi-nor";
>  				reg = <0>;
>  				spi-max-frequency = <20000000>;
>  				mode = <0>;
>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index c9247f8..d2936ad 100644
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -74,7 +74,7 @@ 
 			m25p16@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "st,m25p16";
+				compatible = "st,m25p16", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <40000000>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index ab6ab49..7ec7656 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -42,7 +42,7 @@ 
 			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mxicy,mx25l4005a";
+				compatible = "mxicy,mx25l4005a", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <20000000>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-dir665.dts b/arch/arm/boot/dts/kirkwood-dir665.dts
index 786959e..0473fcc 100644
--- a/arch/arm/boot/dts/kirkwood-dir665.dts
+++ b/arch/arm/boot/dts/kirkwood-dir665.dts
@@ -93,7 +93,7 @@ 
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mxicy,mx25l12805d";
+				compatible = "mxicy,mx25l12805d", "jedec,spi-nor";
 				spi-max-frequency = <50000000>;
 				reg = <0>;
 
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 6467c79..e2abc82 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -42,7 +42,7 @@ 
 			m25p40@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mxicy,mx25l1606e";
+				compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <50000000>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 5348447..1d6528d 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -74,7 +74,7 @@ 
 			m25p40@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "m25p40";
+				compatible = "m25p40", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <25000000>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index f82827d..b7e7d78 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -65,7 +65,7 @@ 
 			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mxicy,mx25l12805d";
+				compatible = "mxicy,mx25l12805d", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <50000000>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
index b0cfb7c..1508b121 100644
--- a/arch/arm/boot/dts/kirkwood-netxbig.dtsi
+++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
@@ -33,7 +33,7 @@ 
 			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mxicy,mx25l4005a";
+				compatible = "mxicy,mx25l4005a", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <20000000>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index fe6c024..e832b63 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -29,7 +29,7 @@ 
 			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mxicy,mx25l4005a";
+				compatible = "mxicy,mx25l4005a", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <20000000>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
index 35a29de..e0b9593 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
@@ -61,7 +61,7 @@ 
 			m25p128@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "st,m25p128";
+				compatible = "st,m25p128", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <20000000>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index 8be5b2e..04015c17 100644
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -217,7 +217,7 @@ 
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "st,m25p80";
+				compatible = "st,m25p80", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <20000000>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index 610ec0f..ed956b8 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -88,7 +88,7 @@ 
 			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "st,m25p80";
+				compatible = "st,m25p80", "jedec,spi-nor";
 				spi-max-frequency = <86000000>;
 				reg = <0>;
 				mode = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index df7f152..c56ab6b 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -49,7 +49,7 @@ 
 			m25p128@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "m25p128";
+				compatible = "m25p128", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <20000000>;
 				mode = <0>;