[PATCH v2 RESEND 0/5] ARM: dts: nanobone: Fix missing/incorrect features

[PATCH v2 RESEND 0/5] ARM: dts: nanobone: Fix missing/incorrect features

[Mark Jackson]

This patch series updates the NanoBone DTS file to address various missing or
incorrect features.

v1 -> v2:
  - Move temperature sensor definition under I2C heirarchy

Mark Jackson (5):
  ARM: dts: am335x-nano: Fix GPIO settings for RTS/CTS pins on UART3 & 4
  ARM: dts: am335x-nano: Enable RS485 mode for UART3 & 4
  ARM: dts: am335x-nano: Enable I2C temperature sensor
  ARM: dts: am335x-nano: Fix GPIO settings for MMC pins
  ARM: dts: am335x-nano: Enable USB host

 arch/arm/boot/dts/am335x-nano.dts | 32 +++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

-- 
2.34.1

[PATCH v2 RESEND 1/5] ARM: dts: am335x-nano: Fix GPIO settings for RTS/CTS pins on UART3 & 4

[Mark Jackson]

The NanoBone platform uses GPIO pins for RTS/CTS control.
The DTS still uses the hardware RTS/CTS pins so this needs fixing.

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
---
 arch/arm/boot/dts/am335x-nano.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index b6f2567bd65a..05cbfe24f778 100644
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -120,8 +120,8 @@ AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE1)		/* spi0_d0.uart2_txd
 
 	uart3_pins: uart3_pins {
 		pinctrl-single,pins = <
-			AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_INPUT_PULLUP, MUX_MODE6)	/* lcd_data10.uart3_ctsn */
-			AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE6)		/* lcd_data11.uart3_rtsn */
+			AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_INPUT_PULLUP, MUX_MODE7)	/* lcd_data10.gpio2[16] */
+			AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE7)		/* lcd_data11.gpio2[17] */
 			AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE1)		/* spi0_cs1.uart3_rxd */
 			AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, PIN_OUTPUT, MUX_MODE1)		/* ecap0_in_pwm0_out.uart3_txd */
 		>;
@@ -129,8 +129,8 @@ AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, PIN_OUTPUT, MUX_MODE1)		/* ecap0_in
 
 	uart4_pins: uart4_pins {
 		pinctrl-single,pins = <
-			AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT_PULLUP, MUX_MODE6)	/* lcd_data12.uart4_ctsn */
-			AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE6)		/* lcd_data13.uart4_rtsn */
+			AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT_PULLUP, MUX_MODE7)	/* lcd_data12.gpio0[8] */
+			AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE7)		/* lcd_data13.gpio0[9] */
 			AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT, MUX_MODE1)		/* uart0_ctsn.uart4_rxd */
 			AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_OUTPUT, MUX_MODE1)		/* uart0_rtsn.uart4_txd */
 		>;
-- 
2.34.1

[PATCH v2 RESEND 2/5] ARM: dts: am335x-nano: Enable RS485 mode for UART3 & 4

[Mark Jackson]

UART3 & 4 are both RS485 ports.
So we need to configure and enable this by default.

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
---
 arch/arm/boot/dts/am335x-nano.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index 05cbfe24f778..cecc2afaeff4 100644
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -187,12 +187,22 @@ &uart2 {
 &uart3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart3_pins>;
+	rts-gpio = <&gpio2 17 GPIO_ACTIVE_HIGH>;
+	rs485-rts-active-high;
+	rs485-rx-during-tx;
+	rs485-rts-delay = <1 1>;
+	linux,rs485-enabled-at-boot-time;
 	status = "okay";
 };
 
 &uart4 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart4_pins>;
+	rts-gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+	rs485-rts-active-high;
+	rs485-rx-during-tx;
+	rs485-rts-delay = <1 1>;
+	linux,rs485-enabled-at-boot-time;
 	status = "okay";
 };
 
-- 
2.34.1

[PATCH v2 RESEND 3/5] ARM: dts: am335x-nano: Enable I2C temperature sensor

[Mark Jackson]

The NanoBone platform supports a temperature sensor on the I2C bus.

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
---
 arch/arm/boot/dts/am335x-nano.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index cecc2afaeff4..960ef1384bbe 100644
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -230,6 +230,11 @@ tps: tps@24 {
 		reg = <0x24>;
 	};
 
+	temperature-sensor@48 {
+		compatible = "lm75";
+		reg = <0x48>;
+	};
+
 	eeprom@53 {
 		compatible = "microchip,24c02", "atmel,24c02";
 		reg = <0x53>;
-- 
2.34.1

[PATCH v2 RESEND 4/5] ARM: dts: am335x-nano: Fix GPIO settings for MMC pins

[Mark Jackson]

The MMC slot uses GPIO pins for Write Protext and Card Detect.
Define these so everything works correctly.

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
---
 arch/arm/boot/dts/am335x-nano.dts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index 960ef1384bbe..58062cec39c0 100644
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -418,8 +418,9 @@ &mmc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc1_pins>;
 	bus-width = <4>;
-	cd-gpios = <&gpio3 8 0>;
-	wp-gpios = <&gpio3 18 0>;
+	cd-debounce-delay-ms = <5>;
+	cd-gpios = <&gpio3 8 GPIO_ACTIVE_LOW>;
+	wp-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
 };
 
 #include "tps65217.dtsi"
-- 
2.34.1

[PATCH v2 RESEND 5/5] ARM: dts: am335x-nano: Enable USB host

[Mark Jackson]

Add missing entry to enable the USB host.

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
---
 arch/arm/boot/dts/am335x-nano.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index 58062cec39c0..c447aebd8d86 100644
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -423,6 +423,10 @@ &mmc1 {
 	wp-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
 };
 
+&usb0 {
+	dr_mode = "host";
+};
+
 #include "tps65217.dtsi"
 
 &tps {
-- 
2.34.1

Re: [PATCH v2 RESEND 0/5] ARM: dts: nanobone: Fix missing/incorrect features

[Mark Jackson]

On Wed, 30 Nov 2022 at 14:06, Mark Jackson <mpfj@newflow.co.uk> wrote:
>
> This patch series updates the NanoBone DTS file to address various missing or
> incorrect features.
>
> v1 -> v2:
>   - Move temperature sensor definition under I2C heirarchy
>
> Mark Jackson (5):
>   ARM: dts: am335x-nano: Fix GPIO settings for RTS/CTS pins on UART3 & 4
>   ARM: dts: am335x-nano: Enable RS485 mode for UART3 & 4
>   ARM: dts: am335x-nano: Enable I2C temperature sensor
>   ARM: dts: am335x-nano: Fix GPIO settings for MMC pins
>   ARM: dts: am335x-nano: Enable USB host
>
>  arch/arm/boot/dts/am335x-nano.dts | 32 +++++++++++++++++++++++++------
>  1 file changed, 26 insertions(+), 6 deletions(-)
>
> --
> 2.34.1
>

Any update on this patch ?
Did it ever get through ?
Do I need to re-submit for some reason ?

Regards
Mark J.

Re: [PATCH v2 RESEND 0/5] ARM: dts: nanobone: Fix missing/incorrect features

[Krzysztof Kozlowski]

On 14/12/2022 14:35, Mark Jackson wrote:
> On Wed, 30 Nov 2022 at 14:06, Mark Jackson <mpfj@newflow.co.uk> wrote:
>>
>> This patch series updates the NanoBone DTS file to address various missing or
>> incorrect features.
>>
>> v1 -> v2:
>>   - Move temperature sensor definition under I2C heirarchy
>>
>> Mark Jackson (5):
>>   ARM: dts: am335x-nano: Fix GPIO settings for RTS/CTS pins on UART3 & 4
>>   ARM: dts: am335x-nano: Enable RS485 mode for UART3 & 4
>>   ARM: dts: am335x-nano: Enable I2C temperature sensor
>>   ARM: dts: am335x-nano: Fix GPIO settings for MMC pins
>>   ARM: dts: am335x-nano: Enable USB host
>>
>>  arch/arm/boot/dts/am335x-nano.dts | 32 +++++++++++++++++++++++++------
>>  1 file changed, 26 insertions(+), 6 deletions(-)
>>
>> --
>> 2.34.1
>>
> 
> Any update on this patch ?
> Did it ever get through ?
> Do I need to re-submit for some reason ?

It's a merge window and you sent it just before it started.

Best regards,
Krzysztof

Re: [PATCH v2 RESEND 0/5] ARM: dts: nanobone: Fix missing/incorrect features

[Mark Jackson]

On Wed, 14 Dec 2022 at 16:54, Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 14/12/2022 14:35, Mark Jackson wrote:
> > On Wed, 30 Nov 2022 at 14:06, Mark Jackson <mpfj@newflow.co.uk> wrote:
> >>
> >> This patch series updates the NanoBone DTS file to address various missing or
> >> incorrect features.
> >>

<snip>

> >
> > Any update on this patch ?
> > Did it ever get through ?
> > Do I need to re-submit for some reason ?
>
> It's a merge window and you sent it just before it started.

Ah, okay.
So will it be picked up automatically next time round or do I need to
re-submit ?

Cheers
Mark J.

Re: [PATCH v2 RESEND 0/5] ARM: dts: nanobone: Fix missing/incorrect features

[Tony Lindgren]

Hi,

* Mark Jackson <mpfj@newflow.co.uk> [221215 15:44]:
> On Wed, 14 Dec 2022 at 16:54, Krzysztof Kozlowski
> <krzysztof.kozlowski@linaro.org> wrote:
> >
> > On 14/12/2022 14:35, Mark Jackson wrote:
> > > On Wed, 30 Nov 2022 at 14:06, Mark Jackson <mpfj@newflow.co.uk> wrote:
> > >>
> > >> This patch series updates the NanoBone DTS file to address various missing or
> > >> incorrect features.
> > >>
> 
> <snip>
> 
> > >
> > > Any update on this patch ?
> > > Did it ever get through ?
> > > Do I need to re-submit for some reason ?
> >
> > It's a merge window and you sent it just before it started.
> 
> Ah, okay.
> So will it be picked up automatically next time round or do I need to
> re-submit ?

No need to resubmit if no more comments and the patches still apply
fine.

Did the issues pointed out by Krzysztof get fixed up? If so, I'll apply
these for v6.3 merge window.

Regards,

Tony

Re: [PATCH v2 RESEND 0/5] ARM: dts: nanobone: Fix missing/incorrect features

[Tony Lindgren]

* Mark Jackson <mpfj@newflow.co.uk> [221215 15:44]:
> On Wed, 14 Dec 2022 at 16:54, Krzysztof Kozlowski
> <krzysztof.kozlowski@linaro.org> wrote:
> >
> > On 14/12/2022 14:35, Mark Jackson wrote:
> > > On Wed, 30 Nov 2022 at 14:06, Mark Jackson <mpfj@newflow.co.uk> wrote:
> > >>
> > >> This patch series updates the NanoBone DTS file to address various missing or
> > >> incorrect features.
> > >>
> 
> <snip>
> 
> > >
> > > Any update on this patch ?
> > > Did it ever get through ?
> > > Do I need to re-submit for some reason ?
> >
> > It's a merge window and you sent it just before it started.
> 
> Ah, okay.
> So will it be picked up automatically next time round or do I need to
> re-submit ?

Applying these into omap-for-v6.3/dt thanks.

Tony