[PATCH 0/3] Add Additional Functionality to Indiedroid Nova

[PATCH 0/3] Add Additional Functionality to Indiedroid Nova

[Chris Morgan]

From: Chris Morgan <macromorgan@hotmail.com>

Update the Indiedroid Nova device tree to benefit from hardware that
has recently been enabled in the mainline kernel. This includes
enabling the PCI Express bus to activate the RTL8111 ethernet
controller, the USB-A 2.0 ports (USB 3.0 still pending), and the ADC
controller with the boot and recovery buttons.

Chris Morgan (3):
  arm64: dts: rockchip: add PCIe to rk3588s-indiedroid-nova
  arm64: dts: rockchip: add USB2 to rk3588s-indiedroid
  arm64: dts: rockchip: Add saradc node to rk3588s-indiedroid-nova

 .../dts/rockchip/rk3588s-indiedroid-nova.dts  | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)

-- 
2.34.1

[PATCH 1/3] arm64: dts: rockchip: add PCIe to rk3588s-indiedroid-nova

[Chris Morgan]

From: Chris Morgan <macromorgan@hotmail.com>

Add the necessary nodes to the Indiedroid Nova to activate the PCI
express port that is used by the RTL8111 ethernet controller.

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
 .../dts/rockchip/rk3588s-indiedroid-nova.dts     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index d1503a4b233a..646f49cc9e53 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -109,6 +109,10 @@ vcc5v0_usbdcin: vcc5v0-usbdcin-regulator {
 	};
 };
 
+&combphy0_ps {
+	status = "okay";
+};
+
 &cpu_l0 {
 	cpu-supply = <&vdd_cpu_lit_s0>;
 };
@@ -348,6 +352,12 @@ i2s0_8ch_p0_0: endpoint {
 	};
 };
 
+&pcie2x1l2 {
+	pinctrl-0 = <&rtl8111_perstb>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
 &pinctrl {
 	bluetooth-pins {
 		bt_reset: bt-reset {
@@ -366,6 +376,12 @@ bt_wake_host: bt-wake-host {
 		};
 	};
 
+	ethernet-pins {
+		rtl8111_perstb: rtl8111-perstb {
+			rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
 	hym8563 {
 
 		hym8563_int: hym8563-int {
-- 
2.34.1

[PATCH 2/3] arm64: dts: rockchip: add USB2 to rk3588s-indiedroid

[Chris Morgan]

From: Chris Morgan <macromorgan@hotmail.com>

Enable USB2 (EHCI and OCHI mode) support for the Indiedroid Nova. This
adds support for USB for the 4 full size USB-A ports. Note that USB 3
(the two blue full-size USB-A ports) is still outstanding, as is
support for USB on the USB-C ports. The controller is not yet supported
for these ports.

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
 .../dts/rockchip/rk3588s-indiedroid-nova.dts  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index 646f49cc9e53..1e2336d3065b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -751,6 +751,24 @@ &tsadc {
 	status = "okay";
 };
 
+&u2phy2 {
+	status = "okay";
+};
+
+&u2phy2_host {
+	phy-supply = <&vcc5v0_usb>;
+	status = "okay";
+};
+
+&u2phy3 {
+	status = "okay";
+};
+
+&u2phy3_host {
+	phy-supply = <&vcc5v0_usb>;
+	status = "okay";
+};
+
 &uart2 {
 	pinctrl-0 = <&uart2m0_xfer>;
 	status = "okay";
@@ -775,3 +793,19 @@ bluetooth {
 		pinctrl-names = "default";
 	};
 };
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+&usb_host1_ehci {
+	status = "okay";
+};
+
+&usb_host1_ohci {
+	status = "okay";
+};
-- 
2.34.1

[PATCH 3/3] arm64: dts: rockchip: Add saradc node to rk3588s-indiedroid-nova

[Chris Morgan]

From: Chris Morgan <macromorgan@hotmail.com>

Add ADC support for the Indiedroid Nova, as well as the two ADC buttons
found on the device. The buttons are documented as "boot" and
"recovery". The boot button is used by the bootloader to boot into USB
recovery mode. The recovery button use is currently unknown.

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
 .../dts/rockchip/rk3588s-indiedroid-nova.dts  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index 1e2336d3065b..4c2d662d9c97 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -3,6 +3,7 @@
 /dts-v1/;
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/linux-event-codes.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/usb/pd.h>
 #include "rk3588s.dtsi"
@@ -11,6 +12,34 @@ / {
 	model = "Indiedroid Nova";
 	compatible = "indiedroid,nova", "rockchip,rk3588s";
 
+	adc_keys0 {
+		compatible = "adc-keys";
+		io-channel-names = "buttons";
+		io-channels = <&saradc 0>;
+		keyup-threshold-microvolt = <1800000>;
+		poll-interval = <100>;
+
+		button-boot {
+			label = "boot";
+			linux,code = <KEY_PROG1>;
+			press-threshold-microvolt = <18000>;
+		};
+	};
+
+	adc_keys1 {
+		compatible = "adc-keys";
+		io-channel-names = "buttons";
+		io-channels = <&saradc 1>;
+		keyup-threshold-microvolt = <1800000>;
+		poll-interval = <100>;
+
+		button-recovery {
+			label = "recovery";
+			linux,code = <KEY_PROG2>;
+			press-threshold-microvolt = <18000>;
+		};
+	};
+
 	aliases {
 		mmc0 = &sdhci;
 		mmc1 = &sdmmc;
@@ -410,6 +439,11 @@ typec5v_pwren: typec5v-pwren {
 	};
 };
 
+&saradc {
+	vref-supply = <&vcca_1v8_s0>;
+	status = "okay";
+};
+
 /* HS400 modes seemed to cause io errors. */
 &sdhci {
 	bus-width = <8>;
-- 
2.34.1

Re: [PATCH 3/3] arm64: dts: rockchip: Add saradc node to rk3588s-indiedroid-nova

[Krzysztof Kozlowski]

On 08/09/2023 18:41, Chris Morgan wrote:
> From: Chris Morgan <macromorgan@hotmail.com>
> 
> Add ADC support for the Indiedroid Nova, as well as the two ADC buttons
> found on the device. The buttons are documented as "boot" and
> "recovery". The boot button is used by the bootloader to boot into USB
> recovery mode. The recovery button use is currently unknown.
> 
> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> ---
>  .../dts/rockchip/rk3588s-indiedroid-nova.dts  | 34 +++++++++++++++++++
>  1 file changed, 34 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
> index 1e2336d3065b..4c2d662d9c97 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
> @@ -3,6 +3,7 @@
>  /dts-v1/;
>  
>  #include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/linux-event-codes.h>
>  #include <dt-bindings/pinctrl/rockchip.h>
>  #include <dt-bindings/usb/pd.h>
>  #include "rk3588s.dtsi"
> @@ -11,6 +12,34 @@ / {
>  	model = "Indiedroid Nova";
>  	compatible = "indiedroid,nova", "rockchip,rk3588s";
>  
> +	adc_keys0 {

No underscores in node names.

Suffixes usually are after -

Best regards,
Krzysztof

Re: [PATCH 3/3] arm64: dts: rockchip: Add saradc node to rk3588s-indiedroid-nova

[Chris Morgan]

On Tue, Sep 12, 2023 at 10:31:19AM +0200, Krzysztof Kozlowski wrote:
> On 08/09/2023 18:41, Chris Morgan wrote:
> > From: Chris Morgan <macromorgan@hotmail.com>
> > 
> > Add ADC support for the Indiedroid Nova, as well as the two ADC buttons
> > found on the device. The buttons are documented as "boot" and
> > "recovery". The boot button is used by the bootloader to boot into USB
> > recovery mode. The recovery button use is currently unknown.
> > 
> > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > ---
> >  .../dts/rockchip/rk3588s-indiedroid-nova.dts  | 34 +++++++++++++++++++
> >  1 file changed, 34 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
> > index 1e2336d3065b..4c2d662d9c97 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
> > +++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
> > @@ -3,6 +3,7 @@
> >  /dts-v1/;
> >  
> >  #include <dt-bindings/gpio/gpio.h>
> > +#include <dt-bindings/input/linux-event-codes.h>
> >  #include <dt-bindings/pinctrl/rockchip.h>
> >  #include <dt-bindings/usb/pd.h>
> >  #include "rk3588s.dtsi"
> > @@ -11,6 +12,34 @@ / {
> >  	model = "Indiedroid Nova";
> >  	compatible = "indiedroid,nova", "rockchip,rk3588s";
> >  
> > +	adc_keys0 {
> 
> No underscores in node names.

My apologies, I should have known better...

> 
> Suffixes usually are after -
> 

Thank you.

> Best regards,
> Krzysztof
> 

I'll correct this and resend.

Chris

Re: [PATCH 3/3] arm64: dts: rockchip: Add saradc node to rk3588s-indiedroid-nova

[Chris Morgan]

On Fri, Sep 15, 2023 at 11:49:05AM -0500, Chris Morgan wrote:
> On Tue, Sep 12, 2023 at 10:31:19AM +0200, Krzysztof Kozlowski wrote:
> > On 08/09/2023 18:41, Chris Morgan wrote:
> > > From: Chris Morgan <macromorgan@hotmail.com>
> > > 
> > > Add ADC support for the Indiedroid Nova, as well as the two ADC buttons
> > > found on the device. The buttons are documented as "boot" and
> > > "recovery". The boot button is used by the bootloader to boot into USB
> > > recovery mode. The recovery button use is currently unknown.
> > > 
> > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > > ---
> > >  .../dts/rockchip/rk3588s-indiedroid-nova.dts  | 34 +++++++++++++++++++
> > >  1 file changed, 34 insertions(+)
> > > 
> > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
> > > index 1e2336d3065b..4c2d662d9c97 100644
> > > --- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
> > > +++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
> > > @@ -3,6 +3,7 @@
> > >  /dts-v1/;
> > >  
> > >  #include <dt-bindings/gpio/gpio.h>
> > > +#include <dt-bindings/input/linux-event-codes.h>
> > >  #include <dt-bindings/pinctrl/rockchip.h>
> > >  #include <dt-bindings/usb/pd.h>
> > >  #include "rk3588s.dtsi"
> > > @@ -11,6 +12,34 @@ / {
> > >  	model = "Indiedroid Nova";
> > >  	compatible = "indiedroid,nova", "rockchip,rk3588s";
> > >  
> > > +	adc_keys0 {
> > 
> > No underscores in node names.
> 
> My apologies, I should have known better...
> 
> > 
> > Suffixes usually are after -
> > 
> 
> Thank you.
> 
> > Best regards,
> > Krzysztof
> > 
> 
> I'll correct this and resend.
> 
> Chris

Sorry, one more thing. I've checked for examples of adc-keys naming and
in every instance I see it as adc-keys (or adc-keys0 and adc-keys1 in a
few examples). Is the proper way going forward something like key0-adc
and key1-adc?

Thank you,
Chris.

Re: [PATCH 3/3] arm64: dts: rockchip: Add saradc node to rk3588s-indiedroid-nova

[Krzysztof Kozlowski]

On 15/09/2023 19:05, Chris Morgan wrote:
> On Fri, Sep 15, 2023 at 11:49:05AM -0500, Chris Morgan wrote:
>> On Tue, Sep 12, 2023 at 10:31:19AM +0200, Krzysztof Kozlowski wrote:
>>> On 08/09/2023 18:41, Chris Morgan wrote:
>>>> From: Chris Morgan <macromorgan@hotmail.com>
>>>>
>>>> Add ADC support for the Indiedroid Nova, as well as the two ADC buttons
>>>> found on the device. The buttons are documented as "boot" and
>>>> "recovery". The boot button is used by the bootloader to boot into USB
>>>> recovery mode. The recovery button use is currently unknown.
>>>>
>>>> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
>>>> ---
>>>>  .../dts/rockchip/rk3588s-indiedroid-nova.dts  | 34 +++++++++++++++++++
>>>>  1 file changed, 34 insertions(+)
>>>>
>>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
>>>> index 1e2336d3065b..4c2d662d9c97 100644
>>>> --- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
>>>> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
>>>> @@ -3,6 +3,7 @@
>>>>  /dts-v1/;
>>>>  
>>>>  #include <dt-bindings/gpio/gpio.h>
>>>> +#include <dt-bindings/input/linux-event-codes.h>
>>>>  #include <dt-bindings/pinctrl/rockchip.h>
>>>>  #include <dt-bindings/usb/pd.h>
>>>>  #include "rk3588s.dtsi"
>>>> @@ -11,6 +12,34 @@ / {
>>>>  	model = "Indiedroid Nova";
>>>>  	compatible = "indiedroid,nova", "rockchip,rk3588s";
>>>>  
>>>> +	adc_keys0 {
>>>
>>> No underscores in node names.
>>
>> My apologies, I should have known better...
>>
>>>
>>> Suffixes usually are after -
>>>
>>
>> Thank you.
>>
>>> Best regards,
>>> Krzysztof
>>>
>>
>> I'll correct this and resend.
>>
>> Chris
> 
> Sorry, one more thing. I've checked for examples of adc-keys naming and
> in every instance I see it as adc-keys (or adc-keys0 and adc-keys1 in a
> few examples). Is the proper way going forward something like key0-adc
> and key1-adc?

I meant by suffix "-0" or "-1", so:

adc-keys-0
adc-keys-1

Best regards,
Krzysztof