Add the core reset for UARTs of StarFive JH7110
Subsystems (6)
v2 cover Add the core reset for UARTs of StarFive JH7110
The UART of StarFive JH7110 needs two reset signals (apb, core) to initialize. This patch series adds the missing core reset.
Changes since v1:
- Set maxItems to 1 for resets from other platforms.
History:
v1: https://lore.kernel.org/all/[email protected]/
Hal Feng (3):
dt-bindings: serial: snps-dw-apb-uart: Add one more reset signal for
StarFive JH7110 SoC
serial: 8250_dw: Use reset array API to get resets
riscv: dts: starfive: jh7110: Add the core reset and jh7110 compatible
for uarts
.../bindings/serial/snps-dw-apb-uart.yaml | 18 ++++++++++- arch/riscv/boot/dts/starfive/jh7110.dtsi | 30 +++++++++++-------- drivers/tty/serial/8250/8250_dw.c | 2 +- 3 files changed, 36 insertions(+), 14 deletions(-)
base-commit: c3f38fa61af77b49866b006939479069cd451173
Signature · 1 line
2.43.2
PATCH v2 1/3 dt-bindings: serial: snps-dw-apb-uart: Add one more reset signal for StarFive JH7110 SoC
The UART of StarFive JH7110 has two reset signals. Both of them are necessary for JH7110 to initialize UART.
--- .../bindings/serial/snps-dw-apb-uart.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml +17 -1
@@ -13,6 +13,20 @@ allOf: - $ref: serial.yaml# - $ref: rs485.yaml# + - if: + properties: + compatible: + contains: + const: starfive,jh7110-uart + then: + properties: + resets: + minItems: 2 + else: + properties: + resets: + maxItems: 1 + properties: compatible: oneOf:
@@ -48,6 +62,7 @@ properties: - enum: - starfive,jh7100-hsuart - starfive,jh7100-uart + - starfive,jh7110-uart - const: snps,dw-apb-uart - const: snps,dw-apb-uart
@@ -82,7 +97,8 @@ properties: type: boolean resets: - maxItems: 1 + minItems: 1 + maxItems: 2 reg-shift: true
Signature · 1 line
2.43.2
Re: [PATCH v2 1/3] dt-bindings: serial: snps-dw-apb-uart: Add one more reset signal for StarFive JH7110 SoC
Quoted 4 lines · Hal Feng
The UART of StarFive JH7110 has two reset signals. Both of them are necessary for JH7110 to initialize UART.
Signed-off-by Hal Feng <[email protected]>
Thanks,
Conor.
PATCH v2 2/3 serial: 8250_dw: Use reset array API to get resets
In reply to Hal FengSome SoCs like StarFive JH7110 require two or more resets. So change to use the reset array API to get resets.
--- drivers/tty/serial/8250/8250_dw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/8250/8250_dw.c +1 -1
@@ -584,7 +584,7 @@ static int dw8250_probe(struct platform_device *pdev)if (IS_ERR (data->pclk))return PTR_ERR (data->pclk); - data->rst =devm_reset_control_get_optional_exclusive (dev,NULL ); + data->rst =devm_reset_control_array_get_optional_exclusive (dev);if (IS_ERR (data->rst))return PTR_ERR (data->rst);
Signature · 1 line
2.43.2
PATCH v2 3/3 riscv: dts: starfive: jh7110: Add the core reset and jh7110 compatible for uarts
In reply to Hal FengAdd the core reset for uarts, which is necessary for uarts to work.
--- arch/riscv/boot/dts/starfive/jh7110.dtsi | 30 ++++++++++++++---------- 1 file changed, 18 insertions(+), 12 deletions(-)
arch/riscv/boot/dts/starfive/jh7110.dtsi +18 -12
@@ -387,12 +387,13 @@ plic: interrupt-controller@c000000 { }; uart0: serial@10000000 { - compatible = "snps,dw-apb-uart"; + compatible = "starfive,jh7110-uart", "snps,dw-apb-uart"; reg = <0x0 0x10000000 0x0 0x10000>; clocks = <&syscrg JH7110_SYSCLK_UART0_CORE>, <&syscrg JH7110_SYSCLK_UART0_APB>; clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART0_APB>; + resets = <&syscrg JH7110_SYSRST_UART0_APB>, + <&syscrg JH7110_SYSRST_UART0_CORE>; interrupts = <32>; reg-io-width = <4>; reg-shift = <2>;
@@ -400,12 +401,13 @@ uart0: serial@10000000 { }; uart1: serial@10010000 { - compatible = "snps,dw-apb-uart"; + compatible = "starfive,jh7110-uart", "snps,dw-apb-uart"; reg = <0x0 0x10010000 0x0 0x10000>; clocks = <&syscrg JH7110_SYSCLK_UART1_CORE>, <&syscrg JH7110_SYSCLK_UART1_APB>; clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART1_APB>; + resets = <&syscrg JH7110_SYSRST_UART1_APB>, + <&syscrg JH7110_SYSRST_UART1_CORE>; interrupts = <33>; reg-io-width = <4>; reg-shift = <2>;
@@ -413,12 +415,13 @@ uart1: serial@10010000 { }; uart2: serial@10020000 { - compatible = "snps,dw-apb-uart"; + compatible = "starfive,jh7110-uart", "snps,dw-apb-uart"; reg = <0x0 0x10020000 0x0 0x10000>; clocks = <&syscrg JH7110_SYSCLK_UART2_CORE>, <&syscrg JH7110_SYSCLK_UART2_APB>; clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART2_APB>; + resets = <&syscrg JH7110_SYSRST_UART2_APB>, + <&syscrg JH7110_SYSRST_UART2_CORE>; interrupts = <34>; reg-io-width = <4>; reg-shift = <2>;
@@ -642,12 +645,13 @@ stg_syscon: syscon@10240000 { }; uart3: serial@12000000 { - compatible = "snps,dw-apb-uart"; + compatible = "starfive,jh7110-uart", "snps,dw-apb-uart"; reg = <0x0 0x12000000 0x0 0x10000>; clocks = <&syscrg JH7110_SYSCLK_UART3_CORE>, <&syscrg JH7110_SYSCLK_UART3_APB>; clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART3_APB>; + resets = <&syscrg JH7110_SYSRST_UART3_APB>, + <&syscrg JH7110_SYSRST_UART3_CORE>; interrupts = <45>; reg-io-width = <4>; reg-shift = <2>;
@@ -655,12 +659,13 @@ uart3: serial@12000000 { }; uart4: serial@12010000 { - compatible = "snps,dw-apb-uart"; + compatible = "starfive,jh7110-uart", "snps,dw-apb-uart"; reg = <0x0 0x12010000 0x0 0x10000>; clocks = <&syscrg JH7110_SYSCLK_UART4_CORE>, <&syscrg JH7110_SYSCLK_UART4_APB>; clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART4_APB>; + resets = <&syscrg JH7110_SYSRST_UART4_APB>, + <&syscrg JH7110_SYSRST_UART4_CORE>; interrupts = <46>; reg-io-width = <4>; reg-shift = <2>;
@@ -668,12 +673,13 @@ uart4: serial@12010000 { }; uart5: serial@12020000 { - compatible = "snps,dw-apb-uart"; + compatible = "starfive,jh7110-uart", "snps,dw-apb-uart"; reg = <0x0 0x12020000 0x0 0x10000>; clocks = <&syscrg JH7110_SYSCLK_UART5_CORE>, <&syscrg JH7110_SYSCLK_UART5_APB>; clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART5_APB>; + resets = <&syscrg JH7110_SYSRST_UART5_APB>, + <&syscrg JH7110_SYSRST_UART5_CORE>; interrupts = <47>; reg-io-width = <4>; reg-shift = <2>;
Signature · 1 line
2.43.2
This series was applied to riscv/linux.git (for-next) by Greg Kroah-Hartman <[email protected]>:
Hello:
This series was applied to riscv/linux.git (for-next) by Greg Kroah-Hartman <[email protected]>:
Quoted 10 lines · On Tue, 4 Jun 2024 16:47:26 +0800 you wrote:
The UART of StarFive JH7110 needs two reset signals (apb, core) to initialize. This patch series adds the missing core reset.
Changes since v1:
- Set maxItems to 1 for resets from other platforms.History:
v1: https://lore.kernel.org/all/[email protected]/[...]
Here is the summary with links:
- [v2,1/3] dt-bindings: serial: snps-dw-apb-uart: Add one more reset signal for StarFive JH7110 SoC (no matching commit)
- [v2,2/3] serial: 8250_dw: Use reset array API to get resets
(no matching commit)
- [v2,3/3] riscv: dts: starfive: jh7110: Add the core reset and jh7110 compatible for uarts
https://git.kernel.org/riscv/c/4ed81d9dd75f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html