[PATCH v5 0/2] riscv: sophgo: Add pinctrl support for CV1800 series SoC

[PATCH v5 0/2] riscv: sophgo: Add pinctrl support for CV1800 series SoC

[Inochi Amaoto]

Add basic pinctrl driver for Sophgo CV1800 series SoCs.
This patch series aims to replace the previous patch from Jisheng [1].
Since the pinctrl of cv1800 has nested mux and its pin definination
is discrete, it is not suitable to use "pinctrl-single" to cover the
pinctrl device.

This patch require another patch [2] that provides standard attribute
"input-schmitt-microvolt"

The v4 version is from [3]

Note: As current documentation is not enough to guess the pin
configuration of Huashan Pi, only the pinctrl node is added.

[1] https://lore.kernel.org/linux-riscv/20231113005702.2467-1-jszhang@kernel.org/
[2] https://lore.kernel.org/all/IA1PR20MB495346246245074234D337A6BBAC2@IA1PR20MB4953.namprd20.prod.outlook.com/
[3] https://lore.kernel.org/all/IA1PR20MB4953DC78BB0FE0C57EA94F91BBB32@IA1PR20MB4953.namprd20.prod.outlook.com/

Changed from v4:
1. remove the alreay applied patch
2. fix 1812h header file problem.

Changed from v3:
1. binding: drop unnecessary type
2. binding: use right ref for pin node.
3. binding: remove mixed spaces and tabs.

Changed from v2:
1. remove unused export function.
2. drop "drive-strength" and only use "drive-strength-microamp" in
the binding.
3. drop unnecessary ref in the binding.
4. drop unnecessary entry for binding example.

Changed from v1:
1. replace attribute "sophgo,bus-holder" with standard "bias-bus-hold".
2. replace attribute "input-schmitt" with "input-schmitt-microvolt".
3. add vddio operations support to report pin state.

Inochi Amaoto (2):
  riscv: dts: sophgo: cv1800b: add pinctrl support
  riscv: dts: sophgo: cv1812h: add pinctrl support

 .../boot/dts/sophgo/cv1800b-milkv-duo.dts     | 49 +++++++++++++++++++
 arch/riscv/boot/dts/sophgo/cv1800b.dtsi       | 10 ++++
 arch/riscv/boot/dts/sophgo/cv1812h.dtsi       | 10 ++++
 3 files changed, 69 insertions(+)

--
2.46.0

[PATCH v5 1/2] riscv: dts: sophgo: cv1800b: add pinctrl support

[Inochi Amaoto]

Add pinctrl node and related pin configuration for CV1800B SoC.

Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
---
 .../boot/dts/sophgo/cv1800b-milkv-duo.dts     | 49 +++++++++++++++++++
 arch/riscv/boot/dts/sophgo/cv1800b.dtsi       | 10 ++++
 2 files changed, 59 insertions(+)

diff --git a/arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts b/arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts
index 375ff2661b6e..9feb520eaec4 100644
--- a/arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts
+++ b/arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts
@@ -39,7 +39,54 @@ &osc {
 	clock-frequency = <25000000>;
 };
 
+&pinctrl {
+	uart0_cfg: uart0-cfg {
+		uart0-pins {
+			pinmux = <PINMUX(PIN_UART0_TX, 0)>,
+				 <PINMUX(PIN_UART0_RX, 0)>;
+			bias-pull-up;
+			drive-strength-microamp = <10800>;
+			power-source = <3300>;
+		};
+	};
+
+	sdhci0_cfg: sdhci0-cfg {
+		sdhci0-clk-pins {
+			pinmux = <PINMUX(PIN_SD0_CLK, 0)>;
+			bias-pull-up;
+			drive-strength-microamp = <16100>;
+			power-source = <3300>;
+		};
+
+		sdhci0-cmd-pins {
+			pinmux = <PINMUX(PIN_SD0_CMD, 0)>;
+			bias-pull-up;
+			drive-strength-microamp = <10800>;
+			power-source = <3300>;
+		};
+
+		sdhci0-data-pins {
+			pinmux = <PINMUX(PIN_SD0_D0, 0)>,
+				 <PINMUX(PIN_SD0_D1, 0)>,
+				 <PINMUX(PIN_SD0_D2, 0)>,
+				 <PINMUX(PIN_SD0_D3, 0)>;
+			bias-pull-up;
+			drive-strength-microamp = <10800>;
+			power-source = <3300>;
+		};
+
+		sdhci0-cd-pins {
+			pinmux = <PINMUX(PIN_SD0_CD, 0)>;
+			bias-pull-up;
+			drive-strength-microamp = <10800>;
+			power-source = <3300>;
+		};
+	};
+};
+
 &sdhci0 {
+	pinctrl-0 = <&sdhci0_cfg>;
+	pinctrl-names = "default";
 	status = "okay";
 	bus-width = <4>;
 	no-1-8-v;
@@ -49,5 +96,7 @@ &sdhci0 {
 };
 
 &uart0 {
+	pinctrl-0 = <&uart0_cfg>;
+	pinctrl-names = "default";
 	status = "okay";
 };
diff --git a/arch/riscv/boot/dts/sophgo/cv1800b.dtsi b/arch/riscv/boot/dts/sophgo/cv1800b.dtsi
index ec9530972ae2..6a958b822097 100644
--- a/arch/riscv/boot/dts/sophgo/cv1800b.dtsi
+++ b/arch/riscv/boot/dts/sophgo/cv1800b.dtsi
@@ -3,6 +3,7 @@
  * Copyright (C) 2023 Jisheng Zhang <jszhang@kernel.org>
  */
 
+#include <dt-bindings/pinctrl/pinctrl-cv1800b.h>
 #include "cv18xx.dtsi"
 
 / {
@@ -12,6 +13,15 @@ memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x4000000>;
 	};
+
+	soc {
+		pinctrl: pinctrl@3008000 {
+			compatible = "sophgo,cv1800b-pinctrl";
+			reg = <0x03001000 0x1000>,
+			      <0x05027000 0x1000>;
+			reg-names = "sys", "rtc";
+		};
+	};
 };
 
 &plic {
-- 
2.46.0

[PATCH v5 2/2] riscv: dts: sophgo: cv1812h: add pinctrl support

[Inochi Amaoto]

Add pinctrl node for CV1812H SoC.

Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
---
 arch/riscv/boot/dts/sophgo/cv1812h.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/riscv/boot/dts/sophgo/cv1812h.dtsi b/arch/riscv/boot/dts/sophgo/cv1812h.dtsi
index 7fa4c1e2d1da..12e44edebfc1 100644
--- a/arch/riscv/boot/dts/sophgo/cv1812h.dtsi
+++ b/arch/riscv/boot/dts/sophgo/cv1812h.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/pinctrl/pinctrl-cv1812h.h>
 #include "cv18xx.dtsi"
 
 / {
@@ -13,6 +14,15 @@ memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>;
 	};
+
+	soc {
+		pinctrl: pinctrl@3008000 {
+			compatible = "sophgo,cv1812h-pinctrl";
+			reg = <0x03001000 0x1000>,
+			      <0x05027000 0x1000>;
+			reg-names = "sys", "rtc";
+		};
+	};
 };
 
 &plic {
-- 
2.46.0

Re: [PATCH v5 0/2] riscv: sophgo: Add pinctrl support for CV1800 series SoC

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 1068 bytes --]

On Sat, Aug 31, 2024 at 06:38:40AM +0800, Inochi Amaoto wrote:
> Add basic pinctrl driver for Sophgo CV1800 series SoCs.
> This patch series aims to replace the previous patch from Jisheng [1].
> Since the pinctrl of cv1800 has nested mux and its pin definination
> is discrete, it is not suitable to use "pinctrl-single" to cover the
> pinctrl device.
> 
> This patch require another patch [2] that provides standard attribute
> "input-schmitt-microvolt"
> 
> The v4 version is from [3]

Which version of this ended up in linux-next? I see a link to v4 in
what's been applied, but this v5 was sent before that code was
committed.

Either way, what's been applied and what's here produce warnings:
cv1812h.dtsi:19.28-24.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
cv1800b.dtsi:18.28-23.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"

It's just a copy-paste error I would imagine, but please send a fix.

Thanks,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v5 0/2] riscv: sophgo: Add pinctrl support for CV1800 series SoC

[Inochi Amaoto]

On Mon, Sep 09, 2024 at 03:41:10PM GMT, Conor Dooley wrote:
> On Sat, Aug 31, 2024 at 06:38:40AM +0800, Inochi Amaoto wrote:
> > Add basic pinctrl driver for Sophgo CV1800 series SoCs.
> > This patch series aims to replace the previous patch from Jisheng [1].
> > Since the pinctrl of cv1800 has nested mux and its pin definination
> > is discrete, it is not suitable to use "pinctrl-single" to cover the
> > pinctrl device.
> > 
> > This patch require another patch [2] that provides standard attribute
> > "input-schmitt-microvolt"
> > 
> > The v4 version is from [3]
> 
> Which version of this ended up in linux-next? I see a link to v4 in
> what's been applied, but this v5 was sent before that code was
> committed.
> 
> Either way, what's been applied and what's here produce warnings:
> cv1812h.dtsi:19.28-24.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> cv1800b.dtsi:18.28-23.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> 
> It's just a copy-paste error I would imagine, but please send a fix.
> 
> Thanks,
> Conor.

Yes, it is like some copy-paste error, I will fix it.

Regards,
Inochi

Re: [PATCH v5 0/2] riscv: sophgo: Add pinctrl support for CV1800 series SoC

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]

On Tue, Sep 10, 2024 at 06:24:34AM +0800, Inochi Amaoto wrote:
> On Mon, Sep 09, 2024 at 03:41:10PM GMT, Conor Dooley wrote:
> > On Sat, Aug 31, 2024 at 06:38:40AM +0800, Inochi Amaoto wrote:
> > > Add basic pinctrl driver for Sophgo CV1800 series SoCs.
> > > This patch series aims to replace the previous patch from Jisheng [1].
> > > Since the pinctrl of cv1800 has nested mux and its pin definination
> > > is discrete, it is not suitable to use "pinctrl-single" to cover the
> > > pinctrl device.
> > > 
> > > This patch require another patch [2] that provides standard attribute
> > > "input-schmitt-microvolt"
> > > 
> > > The v4 version is from [3]
> > 
> > Which version of this ended up in linux-next? I see a link to v4 in
> > what's been applied, but this v5 was sent before that code was
> > committed.
> > 
> > Either way, what's been applied and what's here produce warnings:
> > cv1812h.dtsi:19.28-24.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > cv1800b.dtsi:18.28-23.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > 
> > It's just a copy-paste error I would imagine, but please send a fix.
> 
> Yes, it is like some copy-paste error, I will fix it.

I'd rather you had sent some follow-up patches, than rebase your tree at
this point in the cycle. I assume you hadn't yet sent that stuff in a PR
to Arnd?

Cheers,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v5 0/2] riscv: sophgo: Add pinctrl support for CV1800 series SoC

[Inochi Amaoto]

On Tue, Sep 10, 2024 at 05:13:43PM GMT, Conor Dooley wrote:
> On Tue, Sep 10, 2024 at 06:24:34AM +0800, Inochi Amaoto wrote:
> > On Mon, Sep 09, 2024 at 03:41:10PM GMT, Conor Dooley wrote:
> > > On Sat, Aug 31, 2024 at 06:38:40AM +0800, Inochi Amaoto wrote:
> > > > Add basic pinctrl driver for Sophgo CV1800 series SoCs.
> > > > This patch series aims to replace the previous patch from Jisheng [1].
> > > > Since the pinctrl of cv1800 has nested mux and its pin definination
> > > > is discrete, it is not suitable to use "pinctrl-single" to cover the
> > > > pinctrl device.
> > > > 
> > > > This patch require another patch [2] that provides standard attribute
> > > > "input-schmitt-microvolt"
> > > > 
> > > > The v4 version is from [3]
> > > 
> > > Which version of this ended up in linux-next? I see a link to v4 in
> > > what's been applied, but this v5 was sent before that code was
> > > committed.
> > > 
> > > Either way, what's been applied and what's here produce warnings:
> > > cv1812h.dtsi:19.28-24.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > > cv1800b.dtsi:18.28-23.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > > 
> > > It's just a copy-paste error I would imagine, but please send a fix.
> > 
> > Yes, it is like some copy-paste error, I will fix it.
> 
> I'd rather you had sent some follow-up patches, than rebase your tree at
> this point in the cycle. I assume you hadn't yet sent that stuff in a PR
> to Arnd?
> 
> Cheers,
> Conor.

Yes, the pinctrl dts needs binding header, which is taken by Linus.
So we hadn't sent them. This is why I sent a new version to fix this.

Thanks,
Inochi
 

Re: [PATCH v5 0/2] riscv: sophgo: Add pinctrl support for CV1800 series SoC

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 1964 bytes --]

On Wed, Sep 11, 2024 at 06:25:49AM +0800, Inochi Amaoto wrote:
> On Tue, Sep 10, 2024 at 05:13:43PM GMT, Conor Dooley wrote:
> > On Tue, Sep 10, 2024 at 06:24:34AM +0800, Inochi Amaoto wrote:
> > > On Mon, Sep 09, 2024 at 03:41:10PM GMT, Conor Dooley wrote:
> > > > On Sat, Aug 31, 2024 at 06:38:40AM +0800, Inochi Amaoto wrote:
> > > > > Add basic pinctrl driver for Sophgo CV1800 series SoCs.
> > > > > This patch series aims to replace the previous patch from Jisheng [1].
> > > > > Since the pinctrl of cv1800 has nested mux and its pin definination
> > > > > is discrete, it is not suitable to use "pinctrl-single" to cover the
> > > > > pinctrl device.
> > > > > 
> > > > > This patch require another patch [2] that provides standard attribute
> > > > > "input-schmitt-microvolt"
> > > > > 
> > > > > The v4 version is from [3]
> > > > 
> > > > Which version of this ended up in linux-next? I see a link to v4 in
> > > > what's been applied, but this v5 was sent before that code was
> > > > committed.
> > > > 
> > > > Either way, what's been applied and what's here produce warnings:
> > > > cv1812h.dtsi:19.28-24.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > > > cv1800b.dtsi:18.28-23.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > > > 
> > > > It's just a copy-paste error I would imagine, but please send a fix.
> > > 
> > > Yes, it is like some copy-paste error, I will fix it.
> > 
> > I'd rather you had sent some follow-up patches, than rebase your tree at
> > this point in the cycle. I assume you hadn't yet sent that stuff in a PR
> > to Arnd?
> > 
> Yes, the pinctrl dts needs binding header, which is taken by Linus.
> So we hadn't sent them. This is why I sent a new version to fix this.

Oh, I'm surprised that you didn't get a shared branch from him for that
to be honest.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v5 0/2] riscv: sophgo: Add pinctrl support for CV1800 series SoC

[Inochi Amaoto]

On Wed, Sep 11, 2024 at 08:11:15PM GMT, Conor Dooley wrote:
> On Wed, Sep 11, 2024 at 06:25:49AM +0800, Inochi Amaoto wrote:
> > On Tue, Sep 10, 2024 at 05:13:43PM GMT, Conor Dooley wrote:
> > > On Tue, Sep 10, 2024 at 06:24:34AM +0800, Inochi Amaoto wrote:
> > > > On Mon, Sep 09, 2024 at 03:41:10PM GMT, Conor Dooley wrote:
> > > > > On Sat, Aug 31, 2024 at 06:38:40AM +0800, Inochi Amaoto wrote:
> > > > > > Add basic pinctrl driver for Sophgo CV1800 series SoCs.
> > > > > > This patch series aims to replace the previous patch from Jisheng [1].
> > > > > > Since the pinctrl of cv1800 has nested mux and its pin definination
> > > > > > is discrete, it is not suitable to use "pinctrl-single" to cover the
> > > > > > pinctrl device.
> > > > > > 
> > > > > > This patch require another patch [2] that provides standard attribute
> > > > > > "input-schmitt-microvolt"
> > > > > > 
> > > > > > The v4 version is from [3]
> > > > > 
> > > > > Which version of this ended up in linux-next? I see a link to v4 in
> > > > > what's been applied, but this v5 was sent before that code was
> > > > > committed.
> > > > > 
> > > > > Either way, what's been applied and what's here produce warnings:
> > > > > cv1812h.dtsi:19.28-24.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > > > > cv1800b.dtsi:18.28-23.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > > > > 
> > > > > It's just a copy-paste error I would imagine, but please send a fix.
> > > > 
> > > > Yes, it is like some copy-paste error, I will fix it.
> > > 
> > > I'd rather you had sent some follow-up patches, than rebase your tree at
> > > this point in the cycle. I assume you hadn't yet sent that stuff in a PR
> > > to Arnd?
> > > 
> > Yes, the pinctrl dts needs binding header, which is taken by Linus.
> > So we hadn't sent them. This is why I sent a new version to fix this.
> 
> Oh, I'm surprised that you didn't get a shared branch from him for that
> to be honest.

He did provide a shared branch, but I am not sure the right way to use 
it. He said it is used for SoC tree to pull it. So I think it is just 
used as dependency. Is it OK to just mention it in the PR and add the 
pinctrl dts? Or need some other git tags to tell the dependency?

Regards,
Inochi

Re: [PATCH v5 0/2] riscv: sophgo: Add pinctrl support for CV1800 series SoC

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 2956 bytes --]

On Thu, Sep 12, 2024 at 06:43:31AM +0800, Inochi Amaoto wrote:
> On Wed, Sep 11, 2024 at 08:11:15PM GMT, Conor Dooley wrote:
> > On Wed, Sep 11, 2024 at 06:25:49AM +0800, Inochi Amaoto wrote:
> > > On Tue, Sep 10, 2024 at 05:13:43PM GMT, Conor Dooley wrote:
> > > > On Tue, Sep 10, 2024 at 06:24:34AM +0800, Inochi Amaoto wrote:
> > > > > On Mon, Sep 09, 2024 at 03:41:10PM GMT, Conor Dooley wrote:
> > > > > > On Sat, Aug 31, 2024 at 06:38:40AM +0800, Inochi Amaoto wrote:
> > > > > > > Add basic pinctrl driver for Sophgo CV1800 series SoCs.
> > > > > > > This patch series aims to replace the previous patch from Jisheng [1].
> > > > > > > Since the pinctrl of cv1800 has nested mux and its pin definination
> > > > > > > is discrete, it is not suitable to use "pinctrl-single" to cover the
> > > > > > > pinctrl device.
> > > > > > > 
> > > > > > > This patch require another patch [2] that provides standard attribute
> > > > > > > "input-schmitt-microvolt"
> > > > > > > 
> > > > > > > The v4 version is from [3]
> > > > > > 
> > > > > > Which version of this ended up in linux-next? I see a link to v4 in
> > > > > > what's been applied, but this v5 was sent before that code was
> > > > > > committed.
> > > > > > 
> > > > > > Either way, what's been applied and what's here produce warnings:
> > > > > > cv1812h.dtsi:19.28-24.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > > > > > cv1800b.dtsi:18.28-23.5: Warning (simple_bus_reg): /soc/pinctrl@3008000: simple-bus unit address format error, expected "3001000"
> > > > > > 
> > > > > > It's just a copy-paste error I would imagine, but please send a fix.
> > > > > 
> > > > > Yes, it is like some copy-paste error, I will fix it.
> > > > 
> > > > I'd rather you had sent some follow-up patches, than rebase your tree at
> > > > this point in the cycle. I assume you hadn't yet sent that stuff in a PR
> > > > to Arnd?
> > > > 
> > > Yes, the pinctrl dts needs binding header, which is taken by Linus.
> > > So we hadn't sent them. This is why I sent a new version to fix this.
> > 
> > Oh, I'm surprised that you didn't get a shared branch from him for that
> > to be honest.
> 
> He did provide a shared branch, but I am not sure the right way to use 
> it. He said it is used for SoC tree to pull it. So I think it is just 
> used as dependency. Is it OK to just mention it in the PR and add the 
> pinctrl dts? Or need some other git tags to tell the dependency?

It's a bit late now to be adding stuff for 6.12, but for next time what
you do is git pull the tag he gave you here
https://lore.kernel.org/all/CACRpkdZ5zAgQyo9y_nO8M0Z6b8zqbkg5H_3ceEJN6z6mHL4TOQ@mail.gmail.com/
into your for-next branch and then apply the dts patches to your tree
after that.

And then you make sure to write a commit message for the resulting
merge commit that explains why it was pulled.



[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]