[PATCH 0/2] ARM: dts: am57xx-beagle-x15: Updates for production X15

[PATCH 0/2] ARM: dts: am57xx-beagle-x15: Updates for production X15

[Nishanth Menon]

Hi,

BeagleBoard-X15 has had a few critical changes that impact
functionality. All previous BeagleBoard-X15s should now have been
updated or replaced with changes. If there are any further untracked
boards in the wild, TI will replace those platforms with updated ones
all-cost inclusive.

Obviously, we also need to add vbus-detect-gpio to enable complete
client functionality.

Further, these are not exactly 4.0-rc material anyways, but would be
nice to get into 4.1-rcs if possible - all our boards'd be broken in
upstream now till we merge these.

Bootlog after these fixes:
http://pastebin.ubuntu.com/10786281/

These patches are based off next-20150409

Nishanth Menon (2):
  ARM: dts: am57xx-beagle-x15: Switch UART mux pins
  ARM: dts: am57xx-beagle-x15: Switch GPIO fan number

 arch/arm/boot/dts/am57xx-beagle-x15.dts |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Regards,
Nishanth Menon
-- 
1.7.9.5

[PATCH 1/2] ARM: dts: am57xx-beagle-x15: Switch UART mux pins

[Nishanth Menon]

BeagleBoard-X15 pre-production change includes switching over to UART
pins that now allow for UART download capability. All original boards
should either have been returned for modifications or already modified
for the required change and maintaining compatibility for older boards
are no longer needed.

Signed-off-by: Nishanth Menon <nm-l0cyMroinI0@public.gmane.org>
---
 arch/arm/boot/dts/am57xx-beagle-x15.dts |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 15f198e4864d..cea3be3a051c 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -130,8 +130,8 @@
 
 	uart3_pins_default: uart3_pins_default {
 		pinctrl-single,pins = <
-			0x248 (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_rxd.rxd */
-			0x24c (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_txd.txd */
+			0x3f8 (PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */
+			0x3fc (PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */
 		>;
 	};
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] ARM: dts: am57xx-beagle-x15: Switch UART mux pins

[Nishanth Menon]

On 17:33-20150409, Nishanth Menon wrote:
> BeagleBoard-X15 pre-production change includes switching over to UART
> pins that now allow for UART download capability. All original boards
> should either have been returned for modifications or already modified
> for the required change and maintaining compatibility for older boards
> are no longer needed.
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
>  arch/arm/boot/dts/am57xx-beagle-x15.dts |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
> index 15f198e4864d..cea3be3a051c 100644
> --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
> +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
> @@ -130,8 +130,8 @@
>  
>  	uart3_pins_default: uart3_pins_default {
>  		pinctrl-single,pins = <
> -			0x248 (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_rxd.rxd */
> -			0x24c (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_txd.txd */
> +			0x3f8 (PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */
> +			0x3fc (PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */
>  		>;
>  	};
>  
> -- 
> 1.7.9.5
> 

Drat!.. I missed the daisychain merge that took place :( updated V2 patch
below. Do let me know if you'd like me to repost this.

---8<---
>From 055f2837f8eebd680e954088908c43dbe16b15d7 Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Wed, 8 Apr 2015 17:40:59 -0500
Subject: [PATCH V2 1/2] ARM: dts: am57xx-beagle-x15: Switch UART mux pins

BeagleBoard-X15 pre-production change includes switching over to UART
pins that now allow for UART download capability. All original boards
should either have been returned for modifications or already modified
for the required change and maintaining compatibility for older boards
are no longer needed.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 arch/arm/boot/dts/am57xx-beagle-x15.dts |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 15f198e4864d..01661e9013fe 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -130,8 +130,8 @@
 
 	uart3_pins_default: uart3_pins_default {
 		pinctrl-single,pins = <
-			0x248 (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_rxd.rxd */
-			0x24c (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_txd.txd */
+			0x3f8 (PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */
+			0x3fc (PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */
 		>;
 	};
 
@@ -478,7 +478,7 @@
 &uart3 {
 	status = "okay";
 	interrupts-extended = <&crossbar_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
-			      <&dra7_pmx_core 0x248>;
+			      <&dra7_pmx_core 0x3f8>;
 
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart3_pins_default>;
-- 
1.7.9.5


-- 
Regards,
Nishanth Menon

Re: [PATCH 1/2] ARM: dts: am57xx-beagle-x15: Switch UART mux pins

[Tony Lindgren]

* Nishanth Menon <nm@ti.com> [150409 15:57]:
> On 17:33-20150409, Nishanth Menon wrote:
> > BeagleBoard-X15 pre-production change includes switching over to UART
> > pins that now allow for UART download capability. All original boards
> > should either have been returned for modifications or already modified
> > for the required change and maintaining compatibility for older boards
> > are no longer needed.
> > 
> > Signed-off-by: Nishanth Menon <nm@ti.com>
> > ---
> >  arch/arm/boot/dts/am57xx-beagle-x15.dts |    4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
> > index 15f198e4864d..cea3be3a051c 100644
> > --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
> > +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
> > @@ -130,8 +130,8 @@
> >  
> >  	uart3_pins_default: uart3_pins_default {
> >  		pinctrl-single,pins = <
> > -			0x248 (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_rxd.rxd */
> > -			0x24c (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_txd.txd */
> > +			0x3f8 (PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */
> > +			0x3fc (PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */
> >  		>;
> >  	};
> >  
> > -- 
> > 1.7.9.5
> > 
> 
> Drat!.. I missed the daisychain merge that took place :( updated V2 patch
> below. Do let me know if you'd like me to repost this.

No need to repost, applying both into omap-for-v4.1/fixes thanks.

Regards,

Tony

[PATCH 2/2] ARM: dts: am57xx-beagle-x15: Switch GPIO fan number

[Nishanth Menon]

BeagleBoard-X15 pre-production change includes switching the GPIO fan
gpio over from 1 to 2 to allow for a potential fix at a later point in
time for USB client VBUS detection using PMIC VBUS detect capability.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 arch/arm/boot/dts/am57xx-beagle-x15.dts |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index cea3be3a051c..fe141c47d647 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -83,7 +83,7 @@
 	gpio_fan: gpio_fan {
 		/* Based on 5v 500mA AFB02505HHB */
 		compatible = "gpio-fan";
-		gpios =  <&tps659038_gpio 1 GPIO_ACTIVE_HIGH>;
+		gpios =  <&tps659038_gpio 2 GPIO_ACTIVE_HIGH>;
 		gpio-fan,speed-map = <0     0>,
 				     <13000 1>;
 		#cooling-cells = <2>;
-- 
1.7.9.5