[PATCH 0/6] arm64: dts: meson-sm1-odroid: various fixes for C4/HC4

[PATCH 0/6] arm64: dts: meson-sm1-odroid: various fixes for C4/HC4

[Neil Armstrong]

Here is a collection of fixes/small additions to Odroid-C4 & Odroid-HC4 concerning
regulators handling, USB and SPI NOR Flash of HC4.

Christian Hewitt (1):
  arm64: dts: meson-sm1-odroid-hc4: add spifc node to ODROID-HC4

Neil Armstrong (5):
  arm64: dts: meson-sm1-odroid: add missing enable gpio and supply for
    tf_io regulator
  arm64: dts: meson-sm1-odroid: set tf_io regulator gpio as open source
  arm64: dts: meson-sm1-odroid-c4: fix hub_5v regulator gpio
  arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0
  arm64: dts: meson-sm1-odroid-hc4: add regulators controlled by GPIOH_8

 .../boot/dts/amlogic/meson-sm1-odroid-c4.dts  |  2 +-
 .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 53 ++++++++++++++++++-
 .../boot/dts/amlogic/meson-sm1-odroid.dtsi    |  7 ++-
 3 files changed, 58 insertions(+), 4 deletions(-)

-- 
2.25.1

[PATCH 1/6] arm64: dts: meson-sm1-odroid: add missing enable gpio and supply for tf_io regulator

[Neil Armstrong]

As described in the schematics of Odroid-C4 and Odroid-HC4, the TF_IO regulator
is enabled by the GPIOE_2 GPIO and gets it's supply from VCC_5V.

Fixes: 88d537bc92ca ("arm64: dts: meson: convert meson-sm1-odroid-c4 to dtsi")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
index d14716b3d0f1..af40ba461074 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -46,6 +46,11 @@ tf_io: gpio-regulator-tf_io {
 		regulator-name = "TF_IO";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_5v>;
+
+		enable-gpio = <&gpio GPIOE_2 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		regulator-always-on;
 
 		gpios = <&gpio_ao GPIOAO_6 GPIO_ACTIVE_HIGH>;
 		gpios-states = <0>;
-- 
2.25.1

Re: [PATCH 1/6] arm64: dts: meson-sm1-odroid: add missing enable gpio and supply for tf_io regulator

[Martin Blumenstingl]

On Tue, Jun 1, 2021 at 11:01 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> As described in the schematics of Odroid-C4 and Odroid-HC4, the TF_IO regulator
> is enabled by the GPIOE_2 GPIO and gets it's supply from VCC_5V.
>
> Fixes: 88d537bc92ca ("arm64: dts: meson: convert meson-sm1-odroid-c4 to dtsi")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

[PATCH 2/6] arm64: dts: meson-sm1-odroid: set tf_io regulator gpio as open source

[Neil Armstrong]

According to Odroid-C4 & HC4 Schematics, the TF_3V3N_1V8_EN can be in Hi-Z for 3v3,
and since it's the default GPIOAO_6 mode at reset, let switch this GPIO as Open-Source
to drive for 1, and input for 0.

Fixes: 88d537bc92ca ("arm64: dts: meson: convert meson-sm1-odroid-c4 to dtsi")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
index af40ba461074..e64359163331 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -52,7 +52,7 @@ tf_io: gpio-regulator-tf_io {
 		enable-active-high;
 		regulator-always-on;
 
-		gpios = <&gpio_ao GPIOAO_6 GPIO_ACTIVE_HIGH>;
+		gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_SOURCE>;
 		gpios-states = <0>;
 
 		states = <3300000 0>,
-- 
2.25.1

Re: [PATCH 2/6] arm64: dts: meson-sm1-odroid: set tf_io regulator gpio as open source

[Martin Blumenstingl]

On Tue, Jun 1, 2021 at 11:01 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> According to Odroid-C4 & HC4 Schematics, the TF_3V3N_1V8_EN can be in Hi-Z for 3v3,
> and since it's the default GPIOAO_6 mode at reset, let switch this GPIO as Open-Source
> to drive for 1, and input for 0.
>
> Fixes: 88d537bc92ca ("arm64: dts: meson: convert meson-sm1-odroid-c4 to dtsi")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

[PATCH 3/6] arm64: dts: meson-sm1-odroid-c4: fix hub_5v regulator gpio

[Neil Armstrong]

As described in the Odroid-C4 schematics, the HUB_5V regulator is controlled
by GPIOH_8 and in Open Drain since this GPIO doesn't support Push-Pull.

Fixes: 326e57518b0d ("arm64: dts: meson-sm1: add support for Hardkernel ODROID-C4")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
index 8c327c03d845..63695ea21b1c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
@@ -31,7 +31,7 @@ hub_5v: regulator-hub_5v {
 		vin-supply = <&vcc_5v>;
 
 		/* Connected to the Hub CHIPENABLE, LOW sets low power state */
-		gpio = <&gpio GPIOH_4 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
 		enable-active-high;
 	};
 
-- 
2.25.1

Re: [PATCH 3/6] arm64: dts: meson-sm1-odroid-c4: fix hub_5v regulator gpio

[Martin Blumenstingl]

Hi Neil,

On Tue, Jun 1, 2021 at 11:01 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> As described in the Odroid-C4 schematics, the HUB_5V regulator is controlled
> by GPIOH_8 and in Open Drain since this GPIO doesn't support Push-Pull.
>
> Fixes: 326e57518b0d ("arm64: dts: meson-sm1: add support for Hardkernel ODROID-C4")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
my interpretation of page 32 of the schematics [0] is that GPIOH_8 manages VCC5V
GPIOH_4 is connected as RST_N to the RESET# pad of the USB hub -> this
seems to match the original regulator definition


[0] https://wiki.odroid.com/_media/odroid-c4/odroid-c4_rev1.0.pdf

Re: [PATCH 3/6] arm64: dts: meson-sm1-odroid-c4: fix hub_5v regulator gpio

[Neil Armstrong]

Hi,

On 03/06/2021 20:07, Martin Blumenstingl wrote:
> Hi Neil,
> 
> On Tue, Jun 1, 2021 at 11:01 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>>
>> As described in the Odroid-C4 schematics, the HUB_5V regulator is controlled
>> by GPIOH_8 and in Open Drain since this GPIO doesn't support Push-Pull.
>>
>> Fixes: 326e57518b0d ("arm64: dts: meson-sm1: add support for Hardkernel ODROID-C4")
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> my interpretation of page 32 of the schematics [0] is that GPIOH_8 manages VCC5V
> GPIOH_4 is connected as RST_N to the RESET# pad of the USB hub -> this
> seems to match the original regulator definition

You're right, but GPIOH_4 is already a GPIO HOG, so this regulator doesn't make any sense then,
and the GPIO for the VCC_5V regulator is missing, like in patch 5.

So I'll add:
+&vcc_5v {
+	gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
+	enable-active-high;
+};

in odroid.dtsi instead in this patch.

Not sure what to do about the regulator-hub_5v.

Neil

> 
> 
> [0] https://wiki.odroid.com/_media/odroid-c4/odroid-c4_rev1.0.pdf
> 

Re: [PATCH 3/6] arm64: dts: meson-sm1-odroid-c4: fix hub_5v regulator gpio

[Martin Blumenstingl]

Hi Neil,

On Fri, Jun 4, 2021 at 11:43 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
[...]
> So I'll add:
> +&vcc_5v {
> +       gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
> +       enable-active-high;
> +};
>
> in odroid.dtsi instead in this patch.
that sounds good to me

> Not sure what to do about the regulator-hub_5v.
maybe dropping this regulator overall? we're using gpio-hogs elsewhere
for the USB hub's reset line
or dropping the gpio-hog and keeping this regulator to manage GPIOH_4


Best regards,
Martin

Re: [PATCH 3/6] arm64: dts: meson-sm1-odroid-c4: fix hub_5v regulator gpio

[Neil Armstrong]

On 04/06/2021 12:13, Martin Blumenstingl wrote:
> Hi Neil,
> 
> On Fri, Jun 4, 2021 at 11:43 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
> [...]
>> So I'll add:
>> +&vcc_5v {
>> +       gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
>> +       enable-active-high;
>> +};
>>
>> in odroid.dtsi instead in this patch.
> that sounds good to me
> 
>> Not sure what to do about the regulator-hub_5v.
> maybe dropping this regulator overall? we're using gpio-hogs elsewhere
> for the USB hub's reset line
> or dropping the gpio-hog and keeping this regulator to manage GPIOH_4

I'll drop it completely, it makes no sense to have a regulator for a HUB reset anyway.

Neil

> 
> 
> Best regards,
> Martin
> 

[PATCH 4/6] arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0

[Neil Armstrong]

As described in the HC4 schematics, only the USB port B is used,
port A is left unconnected. Thus disable PHY0 and remove it from PHYs list.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
index bf15700c4b15..0a34b658f994 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
@@ -91,6 +91,10 @@ &sd_emmc_c {
 };
 
 &usb {
-	phys = <&usb2_phy0>, <&usb2_phy1>;
-	phy-names = "usb2-phy0", "usb2-phy1";
+	phys = <&usb2_phy1>;
+	phy-names = "usb2-phy1";
+};
+
+&usb2_phy0 {
+	status = "disabled";
 };
-- 
2.25.1

Re: [PATCH 4/6] arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0

[Martin Blumenstingl]

On Tue, Jun 1, 2021 at 11:01 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> As described in the HC4 schematics, only the USB port B is used,
> port A is left unconnected. Thus disable PHY0 and remove it from PHYs list.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

[PATCH 5/6] arm64: dts: meson-sm1-odroid-hc4: add regulators controlled by GPIOH_8

[Neil Armstrong]

As described in the HC4 schematics, GPIOH_8 controls the USB 5V and 12V
regulators used to power the SATA drives.

And is set as Open Drain since this GPIO doesn't support Push-Pull.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
index 0a34b658f994..d36c25b5b690 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
@@ -44,6 +44,32 @@ led-red {
 		};
 	};
 
+	/* Powers the SATA Disk 0 regulator, which is enabled when a disk load is detected */
+	p12v_0: regulator-p12v_0 {
+		compatible = "regulator-fixed";
+		regulator-name = "P12V_0";
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+		vin-supply = <&main_12v>;
+
+		gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
+		enable-active-high;
+		regulator-always-on;
+	};
+
+	/* Powers the SATA Disk 1 regulator, which is enabled when a disk load is detected */
+	p12v_1: regulator-p12v_1 {
+		compatible = "regulator-fixed";
+		regulator-name = "P12V_1";
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+		vin-supply = <&main_12v>;
+
+		gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
+		enable-active-high;
+		regulator-always-on;
+	};
+
 	sound {
 		model = "ODROID-HC4";
 	};
@@ -98,3 +124,8 @@ &usb {
 &usb2_phy0 {
 	status = "disabled";
 };
+
+&vcc_5v {
+	gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
+	enable-active-high;
+};
-- 
2.25.1

Re: [PATCH 5/6] arm64: dts: meson-sm1-odroid-hc4: add regulators controlled by GPIOH_8

[Martin Blumenstingl]

On Tue, Jun 1, 2021 at 11:01 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> As described in the HC4 schematics, GPIOH_8 controls the USB 5V and 12V
> regulators used to power the SATA drives.
>
> And is set as Open Drain since this GPIO doesn't support Push-Pull.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

[PATCH 6/6] arm64: dts: meson-sm1-odroid-hc4: add spifc node to ODROID-HC4

[Neil Armstrong]

From: Christian Hewitt <christianshewitt@gmail.com>

Add a node for the XT25F128B SPI-NOR flash to make it accessible
from Linux.

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
index d36c25b5b690..3c2ebc7333a1 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
@@ -116,6 +116,20 @@ &sd_emmc_c {
 	status = "disabled";
 };
 
+&spifc {
+	status = "okay";
+	pinctrl-0 = <&nor_pins>;
+	pinctrl-names = "default";
+
+	spi-flash@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <104000000>;
+	};
+};
+
 &usb {
 	phys = <&usb2_phy1>;
 	phy-names = "usb2-phy1";
-- 
2.25.1

Re: [PATCH 6/6] arm64: dts: meson-sm1-odroid-hc4: add spifc node to ODROID-HC4

[Martin Blumenstingl]

On Tue, Jun 1, 2021 at 11:01 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> From: Christian Hewitt <christianshewitt@gmail.com>
>
> Add a node for the XT25F128B SPI-NOR flash to make it accessible
> from Linux.
>
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>