2023-09-26 05:58:34

by Huqiang Qin

[permalink] [raw]
Subject: [PATCH V2 0/2] Add watchdog support for Amlogic C3 SoCs

Amlogic C3 has the same watchdog controller as Amlogic T7.

[PATCH 1/2]:
V1 -> V2: Added compatibles.

[PATCH 2/2]:
V1 -> V2: Increase compatibles of C3 watchdog.

Huqiang Qin (2):
dt-bindings: watchdog: Add support for Amlogic C3 SoCs
arm64: dts: Add watchdog node for Amlogic C3 SoCs

.../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 1 +
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 6 ++++++
2 files changed, 7 insertions(+)


base-commit: 8fff9184d1b5810dca5dd1a02726d4f844af88fc
--
2.42.0


2023-09-26 06:04:53

by Huqiang Qin

[permalink] [raw]
Subject: [PATCH V2 2/2] arm64: dts: Add watchdog node for Amlogic C3 SoCs

Add watchdog device.

Signed-off-by: Huqiang Qin <[email protected]>
---

V1 -> V2: Increase compatibles of C3 watchdog.

arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
index 998f5050795c..2ad1f8eef199 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
@@ -81,6 +81,12 @@ apb4: bus@fe000000 {
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;

+ watchdog@2100 {
+ compatible = "amlogic,c3-wdt", "amlogic,t7-wdt";
+ reg = <0x0 0x2100 0x0 0x10>;
+ clocks = <&xtal>;
+ };
+
periphs_pinctrl: pinctrl@4000 {
compatible = "amlogic,c3-periphs-pinctrl";
#address-cells = <2>;
--
2.42.0

2023-09-26 08:05:04

by Conor Dooley

[permalink] [raw]
Subject: Re: [PATCH V2 2/2] arm64: dts: Add watchdog node for Amlogic C3 SoCs

On Tue, Sep 26, 2023 at 01:55:12PM +0800, Huqiang Qin wrote:
> Add watchdog device.
>
> Signed-off-by: Huqiang Qin <[email protected]>
> ---
>
> V1 -> V2: Increase compatibles of C3 watchdog.
>
> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
> index 998f5050795c..2ad1f8eef199 100644
> --- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
> @@ -81,6 +81,12 @@ apb4: bus@fe000000 {
> #size-cells = <2>;
> ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
>
> + watchdog@2100 {
> + compatible = "amlogic,c3-wdt", "amlogic,t7-wdt";

Does this pass dtbs_check?
The binding patch doesn't seem to permit this combo..

> + reg = <0x0 0x2100 0x0 0x10>;
> + clocks = <&xtal>;
> + };
> +
> periphs_pinctrl: pinctrl@4000 {
> compatible = "amlogic,c3-periphs-pinctrl";
> #address-cells = <2>;
> --
> 2.42.0
>

Attachments:
(No filename) (1.05 kB)
 signature.asc (235.00 B)
 Download all attachments

2023-09-27 20:19:19

by Huqiang Qin

[permalink] [raw]
Subject: Re: [PATCH V2 2/2] arm64: dts: Add watchdog node for Amlogic C3 SoCs


On 2023/9/26 16:03, Conor Dooley wrote:
>> +++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
>> @@ -81,6 +81,12 @@ apb4: bus@fe000000 {
>> #size-cells = <2>;
>> ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
>>
>> + watchdog@2100 {
>> + compatible = "amlogic,c3-wdt", "amlogic,t7-wdt";
> Does this pass dtbs_check?
> The binding patch doesn't seem to permit this combo..
>

Ah... I ran dtbs_check again, and there is indeed
`watchdog@2100: compatible: ['amlogic,c3-wdt', 'amlogic,t7-wdt'] is too long`
in the output.

I'll correct it in the next version, thanks for pointing it out.


Best regards,
Huqiang Qin