[PATCH 0/2] ARM: dts: omap2+: GPMC NAND node fixes (part 2)

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/2] ARM: dts: omap2+: GPMC NAND node fixes (part 2)
@ 2016-03-01 13:44 ` Roger Quadros
  0 siblings, 0 replies; 9+ messages in thread
From: Roger Quadros @ 2016-03-01 13:44 UTC (permalink / raw)
  To: tony; +Cc: linux-omap, fcooper, linux-kernel, Roger Quadros

Hi Tony,

These patches are a preparatory step towards the NAND DT cleanup
done in [1].

They mostly deal with adding the missing compatible property and
interrupt resources and fixing up register resources for the
NAND nodes for the boards that add NAND support in v4.6.

Patches based on tony/omap-for-v4.6/dt

cheers,
-roger

Roger Quadros (2):
  ARM: dts: dm814x: dra62x: Fix NAND device nodes
  ARM: dts: dm814x: dra62x: Disable wait pin monitoring for NAND

 arch/arm/boot/dts/dm8148-evm.dts       | 10 ++++++----
 arch/arm/boot/dts/dm814x.dtsi          |  2 ++
 arch/arm/boot/dts/dra62x-j5eco-evm.dts | 10 ++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

-- 
2.5.0

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 0/2] ARM: dts: omap2+: GPMC NAND node fixes (part 2)
@ 2016-03-01 13:44 ` Roger Quadros
  0 siblings, 0 replies; 9+ messages in thread
From: Roger Quadros @ 2016-03-01 13:44 UTC (permalink / raw)
  To: tony; +Cc: linux-omap, fcooper, linux-kernel, Roger Quadros

Hi Tony,

These patches are a preparatory step towards the NAND DT cleanup
done in [1].

They mostly deal with adding the missing compatible property and
interrupt resources and fixing up register resources for the
NAND nodes for the boards that add NAND support in v4.6.

Patches based on tony/omap-for-v4.6/dt

cheers,
-roger

Roger Quadros (2):
  ARM: dts: dm814x: dra62x: Fix NAND device nodes
  ARM: dts: dm814x: dra62x: Disable wait pin monitoring for NAND

 arch/arm/boot/dts/dm8148-evm.dts       | 10 ++++++----
 arch/arm/boot/dts/dm814x.dtsi          |  2 ++
 arch/arm/boot/dts/dra62x-j5eco-evm.dts | 10 ++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

-- 
2.5.0

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 1/2] ARM: dts: dm814x: dra62x: Fix NAND device nodes
  2016-03-01 13:44 ` Roger Quadros
@ 2016-03-01 13:44   ` Roger Quadros
  -1 siblings, 0 replies; 9+ messages in thread
From: Roger Quadros @ 2016-03-01 13:44 UTC (permalink / raw)
  To: tony; +Cc: linux-omap, fcooper, linux-kernel, Roger Quadros

Add compatible id, GPMC register resource and interrupt
resource to NAND controller nodes.

The GPMC node will provide an interrupt controller for the
NAND IRQs.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dm8148-evm.dts       | 7 ++++++-
 arch/arm/boot/dts/dm814x.dtsi          | 2 ++
 arch/arm/boot/dts/dra62x-j5eco-evm.dts | 7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/dm8148-evm.dts b/arch/arm/boot/dts/dm8148-evm.dts
index 862977f..be56c8f 100644
--- a/arch/arm/boot/dts/dm8148-evm.dts
+++ b/arch/arm/boot/dts/dm8148-evm.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "dm814x.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "DM8148 EVM";
@@ -39,8 +40,12 @@
 	ranges = <0 0 0x04000000 0x01000000>;	/* CS0: 16MB for NAND */
 
 	nand@0,0 {
-		linux,mtd-name= "micron,mt29f2g16aadwp";
+		compatible = "ti,omap2-nand";
 		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
+		interrupt-parent = <&gpmc>;
+		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+			     <1 IRQ_TYPE_NONE>; /* termcount */
+		linux,mtd-name= "micron,mt29f2g16aadwp";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ti,nand-ecc-opt = "bch8";
diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index f752ac1..4a6ce8c 100644
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -566,6 +566,8 @@
 			gpmc,num-waitpins = <2>;
 			#address-cells = <2>;
 			#size-cells = <1>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/dra62x-j5eco-evm.dts b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
index 3937a58..b0c8144 100644
--- a/arch/arm/boot/dts/dra62x-j5eco-evm.dts
+++ b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "dra62x.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "DRA62x J5 Eco EVM";
@@ -39,8 +40,12 @@
 	ranges = <0 0 0x04000000 0x01000000>;	/* CS0: 16MB for NAND */
 
 	nand@0,0 {
-		linux,mtd-name= "micron,mt29f2g16aadwp";
+		compatible = "ti,omap2-nand";
 		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
+		interrupt-parent = <&gpmc>;
+		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+			     <1 IRQ_TYPE_NONE>; /* termcount */
+		linux,mtd-name= "micron,mt29f2g16aadwp";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ti,nand-ecc-opt = "bch8";
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 1/2] ARM: dts: dm814x: dra62x: Fix NAND device nodes
@ 2016-03-01 13:44   ` Roger Quadros
  0 siblings, 0 replies; 9+ messages in thread
From: Roger Quadros @ 2016-03-01 13:44 UTC (permalink / raw)
  To: tony; +Cc: linux-omap, fcooper, linux-kernel, Roger Quadros

Add compatible id, GPMC register resource and interrupt
resource to NAND controller nodes.

The GPMC node will provide an interrupt controller for the
NAND IRQs.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dm8148-evm.dts       | 7 ++++++-
 arch/arm/boot/dts/dm814x.dtsi          | 2 ++
 arch/arm/boot/dts/dra62x-j5eco-evm.dts | 7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/dm8148-evm.dts b/arch/arm/boot/dts/dm8148-evm.dts
index 862977f..be56c8f 100644
--- a/arch/arm/boot/dts/dm8148-evm.dts
+++ b/arch/arm/boot/dts/dm8148-evm.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "dm814x.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "DM8148 EVM";
@@ -39,8 +40,12 @@
 	ranges = <0 0 0x04000000 0x01000000>;	/* CS0: 16MB for NAND */
 
 	nand@0,0 {
-		linux,mtd-name= "micron,mt29f2g16aadwp";
+		compatible = "ti,omap2-nand";
 		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
+		interrupt-parent = <&gpmc>;
+		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+			     <1 IRQ_TYPE_NONE>; /* termcount */
+		linux,mtd-name= "micron,mt29f2g16aadwp";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ti,nand-ecc-opt = "bch8";
diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index f752ac1..4a6ce8c 100644
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -566,6 +566,8 @@
 			gpmc,num-waitpins = <2>;
 			#address-cells = <2>;
 			#size-cells = <1>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/dra62x-j5eco-evm.dts b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
index 3937a58..b0c8144 100644
--- a/arch/arm/boot/dts/dra62x-j5eco-evm.dts
+++ b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "dra62x.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "DRA62x J5 Eco EVM";
@@ -39,8 +40,12 @@
 	ranges = <0 0 0x04000000 0x01000000>;	/* CS0: 16MB for NAND */
 
 	nand@0,0 {
-		linux,mtd-name= "micron,mt29f2g16aadwp";
+		compatible = "ti,omap2-nand";
 		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
+		interrupt-parent = <&gpmc>;
+		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+			     <1 IRQ_TYPE_NONE>; /* termcount */
+		linux,mtd-name= "micron,mt29f2g16aadwp";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ti,nand-ecc-opt = "bch8";
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 2/2] ARM: dts: dm814x: dra62x: Disable wait pin monitoring for NAND
  2016-03-01 13:44 ` Roger Quadros
@ 2016-03-01 13:44   ` Roger Quadros
  -1 siblings, 0 replies; 9+ messages in thread
From: Roger Quadros @ 2016-03-01 13:44 UTC (permalink / raw)
  To: tony; +Cc: linux-omap, fcooper, linux-kernel, Roger Quadros

The NAND Ready/Busy# line is connected to GPMC_WAIT0 pin and
can't be used for wait state insertion for NAND I/O read/write.
So disable read/write wait monitoring as per Reference Manual's
suggestion [1].

[1] dm814x TRM: SPRUGZ8F: 11.2.4.12.2 NAND Device-Ready Pin

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dm8148-evm.dts       | 3 ---
 arch/arm/boot/dts/dra62x-j5eco-evm.dts | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/arch/arm/boot/dts/dm8148-evm.dts b/arch/arm/boot/dts/dm8148-evm.dts
index be56c8f..cbc17b0 100644
--- a/arch/arm/boot/dts/dm8148-evm.dts
+++ b/arch/arm/boot/dts/dm8148-evm.dts
@@ -65,12 +65,9 @@
 		gpmc,access-ns = <64>;
 		gpmc,rd-cycle-ns = <82>;
 		gpmc,wr-cycle-ns = <82>;
-		gpmc,wait-on-read = "true";
-		gpmc,wait-on-write = "true";
 		gpmc,bus-turnaround-ns = <0>;
 		gpmc,cycle2cycle-delay-ns = <0>;
 		gpmc,clk-activation-ns = <0>;
-		gpmc,wait-monitoring-ns = <0>;
 		gpmc,wr-access-ns = <40>;
 		gpmc,wr-data-mux-bus-ns = <0>;
 		partition@0 {
diff --git a/arch/arm/boot/dts/dra62x-j5eco-evm.dts b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
index b0c8144..f820573 100644
--- a/arch/arm/boot/dts/dra62x-j5eco-evm.dts
+++ b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
@@ -65,12 +65,9 @@
 		gpmc,access-ns = <64>;
 		gpmc,rd-cycle-ns = <82>;
 		gpmc,wr-cycle-ns = <82>;
-		gpmc,wait-on-read = "true";
-		gpmc,wait-on-write = "true";
 		gpmc,bus-turnaround-ns = <0>;
 		gpmc,cycle2cycle-delay-ns = <0>;
 		gpmc,clk-activation-ns = <0>;
-		gpmc,wait-monitoring-ns = <0>;
 		gpmc,wr-access-ns = <40>;
 		gpmc,wr-data-mux-bus-ns = <0>;
 		partition@0 {
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 2/2] ARM: dts: dm814x: dra62x: Disable wait pin monitoring for NAND
@ 2016-03-01 13:44   ` Roger Quadros
  0 siblings, 0 replies; 9+ messages in thread
From: Roger Quadros @ 2016-03-01 13:44 UTC (permalink / raw)
  To: tony; +Cc: linux-omap, fcooper, linux-kernel, Roger Quadros

The NAND Ready/Busy# line is connected to GPMC_WAIT0 pin and
can't be used for wait state insertion for NAND I/O read/write.
So disable read/write wait monitoring as per Reference Manual's
suggestion [1].

[1] dm814x TRM: SPRUGZ8F: 11.2.4.12.2 NAND Device-Ready Pin

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dm8148-evm.dts       | 3 ---
 arch/arm/boot/dts/dra62x-j5eco-evm.dts | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/arch/arm/boot/dts/dm8148-evm.dts b/arch/arm/boot/dts/dm8148-evm.dts
index be56c8f..cbc17b0 100644
--- a/arch/arm/boot/dts/dm8148-evm.dts
+++ b/arch/arm/boot/dts/dm8148-evm.dts
@@ -65,12 +65,9 @@
 		gpmc,access-ns = <64>;
 		gpmc,rd-cycle-ns = <82>;
 		gpmc,wr-cycle-ns = <82>;
-		gpmc,wait-on-read = "true";
-		gpmc,wait-on-write = "true";
 		gpmc,bus-turnaround-ns = <0>;
 		gpmc,cycle2cycle-delay-ns = <0>;
 		gpmc,clk-activation-ns = <0>;
-		gpmc,wait-monitoring-ns = <0>;
 		gpmc,wr-access-ns = <40>;
 		gpmc,wr-data-mux-bus-ns = <0>;
 		partition@0 {
diff --git a/arch/arm/boot/dts/dra62x-j5eco-evm.dts b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
index b0c8144..f820573 100644
--- a/arch/arm/boot/dts/dra62x-j5eco-evm.dts
+++ b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
@@ -65,12 +65,9 @@
 		gpmc,access-ns = <64>;
 		gpmc,rd-cycle-ns = <82>;
 		gpmc,wr-cycle-ns = <82>;
-		gpmc,wait-on-read = "true";
-		gpmc,wait-on-write = "true";
 		gpmc,bus-turnaround-ns = <0>;
 		gpmc,cycle2cycle-delay-ns = <0>;
 		gpmc,clk-activation-ns = <0>;
-		gpmc,wait-monitoring-ns = <0>;
 		gpmc,wr-access-ns = <40>;
 		gpmc,wr-data-mux-bus-ns = <0>;
 		partition@0 {
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH 0/2] ARM: dts: omap2+: GPMC NAND node fixes (part 2)
  2016-03-01 13:44 ` Roger Quadros
@ 2016-03-01 13:50   ` Roger Quadros
  -1 siblings, 0 replies; 9+ messages in thread
From: Roger Quadros @ 2016-03-01 13:50 UTC (permalink / raw)
  To: tony; +Cc: linux-omap, fcooper, linux-kernel



On 01/03/16 15:44, Roger Quadros wrote:
> Hi Tony,
> 
> These patches are a preparatory step towards the NAND DT cleanup
> done in [1].
> 
> They mostly deal with adding the missing compatible property and
> interrupt resources and fixing up register resources for the
> NAND nodes for the boards that add NAND support in v4.6.
> 
> Patches based on tony/omap-for-v4.6/dt

[1] - http://article.gmane.org/gmane.linux.kernel/2156857

cheers,
-roger

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 0/2] ARM: dts: omap2+: GPMC NAND node fixes (part 2)
@ 2016-03-01 13:50   ` Roger Quadros
  0 siblings, 0 replies; 9+ messages in thread
From: Roger Quadros @ 2016-03-01 13:50 UTC (permalink / raw)
  To: tony; +Cc: linux-omap, fcooper, linux-kernel



On 01/03/16 15:44, Roger Quadros wrote:
> Hi Tony,
> 
> These patches are a preparatory step towards the NAND DT cleanup
> done in [1].
> 
> They mostly deal with adding the missing compatible property and
> interrupt resources and fixing up register resources for the
> NAND nodes for the boards that add NAND support in v4.6.
> 
> Patches based on tony/omap-for-v4.6/dt

[1] - http://article.gmane.org/gmane.linux.kernel/2156857

cheers,
-roger

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 0/2] ARM: dts: omap2+: GPMC NAND node fixes (part 2)
  2016-03-01 13:50   ` Roger Quadros
  (?)
@ 2016-03-01 18:01   ` Tony Lindgren
  -1 siblings, 0 replies; 9+ messages in thread
From: Tony Lindgren @ 2016-03-01 18:01 UTC (permalink / raw)
  To: Roger Quadros; +Cc: linux-omap, fcooper, linux-kernel

* Roger Quadros <rogerq@ti.com> [160301 05:50]:
> On 01/03/16 15:44, Roger Quadros wrote:
> > Hi Tony,
> > 
> > These patches are a preparatory step towards the NAND DT cleanup
> > done in [1].
> > 
> > They mostly deal with adding the missing compatible property and
> > interrupt resources and fixing up register resources for the
> > NAND nodes for the boards that add NAND support in v4.6.
> > 
> > Patches based on tony/omap-for-v4.6/dt
> 
> [1] - http://article.gmane.org/gmane.linux.kernel/2156857

Thanks applying both into omap-for-v4.6/dt.

Regards,

Tony

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2016-03-01 18:01 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-01 13:44 [PATCH 0/2] ARM: dts: omap2+: GPMC NAND node fixes (part 2) Roger Quadros
2016-03-01 13:44 ` Roger Quadros
2016-03-01 13:44 ` [PATCH 1/2] ARM: dts: dm814x: dra62x: Fix NAND device nodes Roger Quadros
2016-03-01 13:44   ` Roger Quadros
2016-03-01 13:44 ` [PATCH 2/2] ARM: dts: dm814x: dra62x: Disable wait pin monitoring for NAND Roger Quadros
2016-03-01 13:44   ` Roger Quadros
2016-03-01 13:50 ` [PATCH 0/2] ARM: dts: omap2+: GPMC NAND node fixes (part 2) Roger Quadros
2016-03-01 13:50   ` Roger Quadros
2016-03-01 18:01   ` Tony Lindgren

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.