riscv: dts: starfive: jh7110-common: Use named definition for mmc1 card detect
Subsystems (3)
PATCH 1/1 riscv: dts: starfive: jh7110-common: Use named definition for mmc1 card detect
Use named definition for mmc1 card detect GPIO instead of numeric literal.
--- arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/boot/dts/starfive/jh7110-common.dtsi +1 -1
@@ -281,7 +281,7 @@ &mmc1 { bus-width = <4>; no-sdio; no-mmc; - cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + cd-gpios = <&sysgpio GPI_SYS_SDIO1_CD GPIO_ACTIVE_LOW>; disable-wp; cap-sd-highspeed; post-power-on-delay-ms = <200>;
base-commit: 708d55db3edbe2ccf88d94b5f2e2b404bc0ba37c
Signature · 1 line
2.45.2
Conor Dooley
maintainerQuoted 3 lines · E Shattow
Use named definition for mmc1 card detect GPIO instead of numeric literal.
Fixes ac9a37e2d6b63 ("riscv: dts: starfive: introduce a common board dtsi for jh7110 based boards")
I don't think this is a fix. Don't resend for that, I'll remove the tag.
Quoted 23 lines
Signed-off-by E Shattow <[email protected]>--- arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/boot/dts/starfive/jh7110-common.dtsi +1
-1@@ -281,7 +281,7 @@ &mmc1 { bus-width = <4>; no-sdio; no-mmc; - cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; + cd-gpios = <&sysgpio GPI_SYS_SDIO1_CD GPIO_ACTIVE_LOW>; disable-wp; cap-sd-highspeed; post-power-on-delay-ms = <200>;base-commit:
708d55db3edbe2ccf88d94b5f2e2b404bc0ba37cSignature · 1 line
2.45.2
From: Conor Dooley <[email protected]>
Quoted 3 lines · E Shattow
Use named definition for mmc1 card detect GPIO instead of numeric literal.
Applied to riscv-dt-for-next, thanks!
[1/1] riscv: dts: starfive: jh7110-common: Use named definition for mmc1 card detect
https://git.kernel.org/conor/c/c96f15d79172
Thanks,
Conor.
Quoted 11 lines · Conor Dooley
Quoted 3 lines · E Shattow
Use named definition for mmc1 card detect GPIO instead of numeric literal.
Applied to riscv-dt-for-next, thanks!
[1/1] riscv: dts: starfive: jh7110-common: Use named definition for mmc1 card detect
https://git.kernel.org/conor/c/c96f15d79172
No, here "41" means the GPIO number, but GPI_SYS_SDIO1_CD means the multiplexed function and should be used by pinctrl pinmux not gpio subsystem. Although GPI-SYS_SDIO1_CD is numerically the same as 41.
Best regards,
Hal
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Hi, Hal
Quoted 12 lines · Hal Feng
Quoted 11 lines · Conor Dooley
Quoted 3 lines · E Shattow
Use named definition for mmc1 card detect GPIO instead of numeric literal.
Applied to riscv-dt-for-next, thanks!
[1/1] riscv: dts: starfive: jh7110-common: Use named definition for mmc1 card detect
https://git.kernel.org/conor/c/c96f15d79172
Quoted 6 lines
No, here "41" means the GPIO number, but
GPI_SYS_SDIO1_CDmeans the multiplexed function and should be used by pinctrl pinmux not gpio subsystem. Although GPI-SYS_SDIO1_CD is numerically the same as 41.Best regards,
Hal
You're right, Hal. I'm confused trying to make sense of this.
From dts/upstream/src/riscv/starfive/jh7110-pinfunc.h:
"gpio nr: gpio number, 0 - 63"
And yet in dts/upstream/src/riscv/starfive/jh7110-common.dtsi there's:
Quoted 10 lines
pinmux = <PINMUX(64, 0)>,
<PINMUX(65, 0)>,
<PINMUX(66, 0)>,
<PINMUX(67, 0)>,
<PINMUX(68, 0)>,
<PINMUX(69, 0)>,
<PINMUX(70, 0)>,
<PINMUX(71, 0)>,
<PINMUX(72, 0)>,
<PINMUX(73, 0)>;Loosely on the subject of MMC interface and GPIO numbering, what is the above code doing? These are not GPIO numbers 0-63 so what is this?
I'm trying to understand this so I can write the Mars CM (-Lite) dts.
Conor, and Hal: sorry for the mistake there.
-E
Conor Dooley
maintainerQuoted 42 lines · E Shattow
Hi, Hal
Quoted 12 lines · Hal Feng
Quoted 11 lines · Conor Dooley
Quoted 3 lines · E Shattow
Use named definition for mmc1 card detect GPIO instead of numeric literal.
Applied to riscv-dt-for-next, thanks!
[1/1] riscv: dts: starfive: jh7110-common: Use named definition for mmc1 card detect
https://git.kernel.org/conor/c/c96f15d79172Quoted 6 lines
No, here "41" means the GPIO number, but
GPI_SYS_SDIO1_CDmeans the multiplexed function and should be used by pinctrl pinmux not gpio subsystem. Although GPI-SYS_SDIO1_CD is numerically the same as 41.Best regards,
HalYou're right, Hal. I'm confused trying to make sense of this.
From
dts/upstream/src/riscv/starfive/jh7110-pinfunc.h:"gpio nr: gpio number, 0 - 63"
And yet in
dts/upstream/src/riscv/starfive/jh7110-common.dtsithere's:Quoted 10 lines
pinmux = <PINMUX(64, 0)>, <PINMUX(65, 0)>, <PINMUX(66, 0)>, <PINMUX(67, 0)>, <PINMUX(68, 0)>, <PINMUX(69, 0)>, <PINMUX(70, 0)>, <PINMUX(71, 0)>, <PINMUX(72, 0)>, <PINMUX(73, 0)>;
Quoted 8 lines
Loosely on the subject of MMC interface and GPIO numbering, what is the above code doing? These are not GPIO numbers 0-63 so what is this?
I'm trying to understand this so I can write the Mars CM (-Lite) dts.
Conor, and Hal: sorry for the mistake there.
No worries, I've dropped the patch.
Quoted 46 lines · Conor Dooley
Quoted 45 lines · E Shattow
Hi, Hal
Quoted 12 lines · Hal Feng
Quoted 11 lines · Conor Dooley
Quoted 3 lines · E Shattow
Use named definition for mmc1 card detect GPIO instead of numeric literal.
Applied to riscv-dt-for-next, thanks!
[1/1] riscv: dts: starfive: jh7110-common: Use named definition for mmc1 card detect
https://git.kernel.org/conor/c/c96f15d79172Quoted 6 lines
No, here "41" means the GPIO number, but
GPI_SYS_SDIO1_CDmeans the multiplexed function and should be used by pinctrl pinmux not gpio subsystem. Although GPI-SYS_SDIO1_CD is numerically the same as 41.Best regards,
HalYou're right, Hal. I'm confused trying to make sense of this.
From
dts/upstream/src/riscv/starfive/jh7110-pinfunc.h:"gpio nr: gpio number, 0 - 63"
And yet in
dts/upstream/src/riscv/starfive/jh7110-common.dtsithere's:Quoted 10 lines
pinmux = <PINMUX(64, 0)>, <PINMUX(65, 0)>, <PINMUX(66, 0)>, <PINMUX(67, 0)>, <PINMUX(68, 0)>, <PINMUX(69, 0)>, <PINMUX(70, 0)>, <PINMUX(71, 0)>, <PINMUX(72, 0)>, <PINMUX(73, 0)>;Loosely on the subject of MMC interface and GPIO numbering, what is the above code doing? These are not GPIO numbers 0-63 so what is this?
Quoted 7 lines
Quoted 5 lines
I'm trying to understand this so I can write the Mars CM (-Lite) dts.
Conor, and Hal: sorry for the mistake there.
No worries, I've dropped the patch.
Okay. I was able to find pad definitions in the vendor Linux source: https://github.com/starfive-tech/linux/blob/5dfc879916d946dcc2521ef1eccd1d8bfb06a75e/include/dt-bindings/pinctrl/starfive%2Cjh7110-pinfunc.h
There are definitions for GPIO indexes beyond 0-63:
Quoted 23 lines
#define PAD_SD0_CLK 64 #define PAD_SD0_CMD 65 #define PAD_SD0_DATA0 66 #define PAD_SD0_DATA1 67 #define PAD_SD0_DATA2 68 #define PAD_SD0_DATA3 69 #define PAD_SD0_DATA4 70 #define PAD_SD0_DATA5 71 #define PAD_SD0_DATA6 72 #define PAD_SD0_DATA7 73 #define PAD_SD0_STRB 74 #define PAD_GMAC1_MDC 75 #define PAD_GMAC1_MDIO 76 #define PAD_GMAC1_RXD0 77 #define PAD_GMAC1_RXD1 78 #define PAD_GMAC1_RXD2 79 #define PAD_GMAC1_RXD3 80 #define PAD_GMAC1_RXDV 81 #define PAD_GMAC1_RXC 82 #define PAD_GMAC1_TXD0 83 #define PAD_GMAC1_TXD1 84 #define PAD_GMAC1_TXD2 85 #define PAD_GMAC1_TXD3 86
Quoted 8 lines
#define PAD_GMAC1_TXEN 87 #define PAD_GMAC1_TXC 88 #define PAD_QSPI_SCLK 89 #define PAD_QSPI_CSn0 90 #define PAD_QSPI_DATA0 91 #define PAD_QSPI_DATA1 92 #define PAD_QSPI_DATA2 93 #define PAD_QSPI_DATA3 94
Where I got lost is that these are in mainline with include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
I did not find these pad definitions above index 63 mentioned in the JH7110 Technical Reference Manual.
Is it worth sending a patch to use those definitions in jh7110-common.dtsi?
-E
Quoted 15 lines · E Shattow
Quoted 7 lines · Conor Dooley
Quoted 6 lines · E Shattow
Hi, Hal
Quoted 3 lines · Hal Feng
Quoted 3 lines · Conor Dooley
Quoted 1 line · E Shattow
Use named definition for mmc1 card detect GPIO instead of numeric
literal.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
Applied to riscv-dt-for-next, thanks!
Quoted 18 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
[1/1] riscv: dts: starfive: jh7110-common: Use named definition for mmc1 card detect
https://git.kernel.org/conor/c/c96f15d79172No, here "41" means the GPIO number, but
GPI_SYS_SDIO1_CDmeansthe
Quoted 1 line
Quoted 1 line
Quoted 1 line
multiplexed function and should be used by pinctrl pinmux not gpio
subsystem.
Quoted 10 lines
Quoted 10 lines
Quoted 4 lines
Although GPI-SYS_SDIO1_CD is numerically the same as 41.
Best regards,
HalYou're right, Hal. I'm confused trying to make sense of this.
From
dts/upstream/src/riscv/starfive/jh7110-pinfunc.h:"gpio nr: gpio number, 0 - 63"
This place needs to be updated.
For sysgpio:
gpio nr: gpio number, 0 - 63 when using GPIOMUX(n, ...),
6 - 63 or 82 when using PINMUX(n, 1 or 2), 64 - 74 or 89 - 94 when using PINMUX(n, 0)
For aongpio:
gpio nr: gpio number, 0 - 3 when using GPIOMUX(n, ...),
0 - 5 when using PINMUX(n, 0)
Quoted 24 lines
Quoted 24 lines
Quoted 23 lines
And yet in
dts/upstream/src/riscv/starfive/jh7110-common.dtsithere's:Quoted 10 lines
pinmux = <PINMUX(64, 0)>, <PINMUX(65, 0)>, <PINMUX(66, 0)>, <PINMUX(67, 0)>, <PINMUX(68, 0)>, <PINMUX(69, 0)>, <PINMUX(70, 0)>, <PINMUX(71, 0)>, <PINMUX(72, 0)>, <PINMUX(73, 0)>;Loosely on the subject of MMC interface and GPIO numbering, what is the above code doing? These are not GPIO numbers 0-63 so what is this?
I'm trying to understand this so I can write the Mars CM (-Lite) dts.
Conor, and Hal: sorry for the mistake there.
Quoted 40 lines
Quoted 1 line
No worries, I've dropped the patch.
Okay. I was able to find pad definitions in the vendor Linux source:
https://github.com/starfive-
tech/linux/blob/5dfc879916d946dcc2521ef1eccd1d8bfb06a75e/include/dt- bindings/pinctrl/starfive%2Cjh7110-pinfunc.hThere are definitions for GPIO indexes beyond 0-63:
Quoted 31 lines
#define PAD_SD0_CLK 64 #define PAD_SD0_CMD 65 #define PAD_SD0_DATA0 66 #define PAD_SD0_DATA1 67 #define PAD_SD0_DATA2 68 #define PAD_SD0_DATA3 69 #define PAD_SD0_DATA4 70 #define PAD_SD0_DATA5 71 #define PAD_SD0_DATA6 72 #define PAD_SD0_DATA7 73 #define PAD_SD0_STRB 74 #define PAD_GMAC1_MDC 75 #define PAD_GMAC1_MDIO 76 #define PAD_GMAC1_RXD0 77 #define PAD_GMAC1_RXD1 78 #define PAD_GMAC1_RXD2 79 #define PAD_GMAC1_RXD3 80 #define PAD_GMAC1_RXDV 81 #define PAD_GMAC1_RXC 82 #define PAD_GMAC1_TXD0 83 #define PAD_GMAC1_TXD1 84 #define PAD_GMAC1_TXD2 85 #define PAD_GMAC1_TXD3 86 #define PAD_GMAC1_TXEN 87 #define PAD_GMAC1_TXC 88 #define PAD_QSPI_SCLK 89 #define PAD_QSPI_CSn0 90 #define PAD_QSPI_DATA0 91 #define PAD_QSPI_DATA1 92 #define PAD_QSPI_DATA2 93 #define PAD_QSPI_DATA3 94
Yes, these pins with indexes beyond 0-63 are actually existed and they are set to unchangeable fixed functions.
Quoted 8 lines
Where I got lost is that these are in mainline with
include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.hI did not find these pad definitions above index 63 mentioned in the JH7110 Technical Reference Manual.
Is it worth sending a patch to use those definitions in
jh7110-common.dtsi?
Yeah, actually it will be more readable to use the definitions to replace pin 64~94.
Best regards,
Hal
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv