[PATCH 1/2] arm: boot: dts: am437x-sk: fix for new newhaven display module revision

[PATCH 1/2] arm: boot: dts: am437x-sk: fix for new newhaven display module revision

[Felipe Balbi]

AM437x Starter Kit uses a NewHaven Display module with
a 4.3" display and EDT FT5306 touchscreen

On that module's new revision, NewHave decided to change
the pinout on the 6 pin flat-pcb touchscreen connector so
that instead of having WAKE pin, we now have RESETn.

The new display module is available on AM437x SK Beta and
all new revisions while the older revision is only available
on AM437x SK Alpha which, unfortunately, can't be supported
anymore in mainline without a revert of this patch.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/boot/dts/am437x-sk-evm.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 832d24318f62..58dc1cd58bdd 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -474,7 +474,7 @@
 		interrupt-parent = <&gpio0>;
 		interrupts = <31 0>;
 
-		wake-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
 
 		touchscreen-size-x = <480>;
 		touchscreen-size-y = <272>;
-- 
2.3.0

[PATCH 2/2] arm: boot: dts: am437x-sk: reduce col-scan-delay-us

[Felipe Balbi]

The new AM437x SK Beta boards have removed the
large capacitors on the gpio-matrix column lines
which means we can reduce col-scan-delay-us to 5us
without loosing functionality.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/boot/dts/am437x-sk-evm.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 58dc1cd58bdd..37ce7b1bf07f 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -49,7 +49,7 @@
 		pinctrl-0 = <&matrix_keypad_pins>;
 
 		debounce-delay-ms = <5>;
-		col-scan-delay-us = <1500>;
+		col-scan-delay-us = <5>;
 
 		row-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH		/* Bank5, pin5 */
 				&gpio5 6 GPIO_ACTIVE_HIGH>;	/* Bank5, pin6 */
-- 
2.3.0

[PATCH 1/2] arm: boot: dts: am437x-sk: fix for new newhaven display module revision

[Tony Lindgren]

* Felipe Balbi <balbi@ti.com> [150409 09:03]:
> AM437x Starter Kit uses a NewHaven Display module with
> a 4.3" display and EDT FT5306 touchscreen
> 
> On that module's new revision, NewHave decided to change
> the pinout on the 6 pin flat-pcb touchscreen connector so
> that instead of having WAKE pin, we now have RESETn.
> 
> The new display module is available on AM437x SK Beta and
> all new revisions while the older revision is only available
> on AM437x SK Alpha which, unfortunately, can't be supported
> anymore in mainline without a revert of this patch.

Applying both into omap-for-v4.1/fixes thanks.

Tony