[PATCH V3 0/3] Add watchdog support for Amlogic C3 and S4 SoCs

[PATCH V3 0/3] Add watchdog support for Amlogic C3 and S4 SoCs

[Huqiang Qin]

Amlogic C3 and S4 has the same watchdog controller as Amlogic T7.

Changes since V2 [2]:
- Modified yaml document to ensure that dtbs_check passes.
- Added a patch for watchdog support for S4.

Changes since V1 [1]:
- Added C3 compatibles, with T7 compatibles list as fallback.

[1]: https://lore.kernel.org/all/20230925090641.1185942-1-huqiang.qin@amlogic.com/
[2]: https://lore.kernel.org/all/20230926055512.2355390-1-huqiang.qin@amlogic.com/

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

 .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml    | 12 +++++++++---
 arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi          |  6 ++++++
 arch/arm64/boot/dts/amlogic/meson-s4.dtsi            |  6 ++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

-- 
2.42.0

[PATCH V3 1/3] dt-bindings: watchdog: Add support for Amlogic C3 and S4 SoCs

[Huqiang Qin]

Update dt-binding document for watchdog of Amlogic C3 and S4 SoCs.

Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
---
 .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
index 443e2e7ab467..69845ec32e81 100644
--- a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
@@ -15,9 +15,15 @@ allOf:
 
 properties:
   compatible:
-    enum:
-      - amlogic,meson-gxbb-wdt
-      - amlogic,t7-wdt
+    oneOf:
+      - enum:
+          - amlogic,meson-gxbb-wdt
+          - amlogic,t7-wdt
+      - items:
+          - enum:
+              - amlogic,c3-wdt
+              - amlogic,s4-wdt
+          - const: amlogic,t7-wdt
 
   reg:
     maxItems: 1
-- 
2.42.0

[PATCH V3 2/3] arm64: dts: Add watchdog node for Amlogic C3 SoCs

[Huqiang Qin]

Add watchdog device.

Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
---
 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

[PATCH V3 3/3] arm64: dts: Add watchdog node for Amlogic S4 SoCs

[Huqiang Qin]

Add watchdog device.

Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
index e0cfc54ebccb..2344b2d741c3 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -92,6 +92,12 @@ apb4: bus@fe000000 {
 			#size-cells = <2>;
 			ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
 
+			watchdog@2100 {
+				compatible = "amlogic,s4-wdt", "amlogic,t7-wdt";
+				reg = <0x0 0x2100 0x0 0x10>;
+				clocks = <&xtal>;
+			};
+
 			periphs_pinctrl: pinctrl@4000 {
 				compatible = "amlogic,meson-s4-periphs-pinctrl";
 				#address-cells = <2>;
-- 
2.42.0

Re: [PATCH V3 1/3] dt-bindings: watchdog: Add support for Amlogic C3 and S4 SoCs

[Conor Dooley]

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

On Fri, Oct 27, 2023 at 06:43:56PM +0800, Huqiang Qin wrote:
> Update dt-binding document for watchdog of Amlogic C3 and S4 SoCs.
> 
> Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>

Acked-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.

> ---
>  .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml    | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
> index 443e2e7ab467..69845ec32e81 100644
> --- a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
> @@ -15,9 +15,15 @@ allOf:
>  
>  properties:
>    compatible:
> -    enum:
> -      - amlogic,meson-gxbb-wdt
> -      - amlogic,t7-wdt
> +    oneOf:
> +      - enum:
> +          - amlogic,meson-gxbb-wdt
> +          - amlogic,t7-wdt
> +      - items:
> +          - enum:
> +              - amlogic,c3-wdt
> +              - amlogic,s4-wdt
> +          - const: amlogic,t7-wdt
>  
>    reg:
>      maxItems: 1
> -- 
> 2.42.0
> 
> 

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

Re: [PATCH V3 1/3] dt-bindings: watchdog: Add support for Amlogic C3 and S4 SoCs

[Guenter Roeck]

On 10/27/23 03:43, Huqiang Qin wrote:
> Update dt-binding document for watchdog of Amlogic C3 and S4 SoCs.
> 
> Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml    | 12 +++++++++---
>   1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
> index 443e2e7ab467..69845ec32e81 100644
> --- a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
> @@ -15,9 +15,15 @@ allOf:
>   
>   properties:
>     compatible:
> -    enum:
> -      - amlogic,meson-gxbb-wdt
> -      - amlogic,t7-wdt
> +    oneOf:
> +      - enum:
> +          - amlogic,meson-gxbb-wdt
> +          - amlogic,t7-wdt
> +      - items:
> +          - enum:
> +              - amlogic,c3-wdt
> +              - amlogic,s4-wdt
> +          - const: amlogic,t7-wdt
>   
>     reg:
>       maxItems: 1

Re: [PATCH V3 2/3] arm64: dts: Add watchdog node for Amlogic C3 SoCs

[neil.armstrong]

On 27/10/2023 12:43, Huqiang Qin wrote:
> Add watchdog device.
> 
> Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
> ---
>   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>;

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

Re: [PATCH V3 3/3] arm64: dts: Add watchdog node for Amlogic S4 SoCs

[neil.armstrong]

On 27/10/2023 12:43, Huqiang Qin wrote:
> Add watchdog device.
> 
> Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
> ---
>   arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> index e0cfc54ebccb..2344b2d741c3 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> @@ -92,6 +92,12 @@ apb4: bus@fe000000 {
>   			#size-cells = <2>;
>   			ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
>   
> +			watchdog@2100 {
> +				compatible = "amlogic,s4-wdt", "amlogic,t7-wdt";
> +				reg = <0x0 0x2100 0x0 0x10>;
> +				clocks = <&xtal>;
> +			};
> +
>   			periphs_pinctrl: pinctrl@4000 {
>   				compatible = "amlogic,meson-s4-periphs-pinctrl";
>   				#address-cells = <2>;

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

Re: (subset) [PATCH V3 0/3] Add watchdog support for Amlogic C3 and S4 SoCs

[Neil Armstrong]

Hi,

On Fri, 27 Oct 2023 18:43:55 +0800, Huqiang Qin wrote:
> Amlogic C3 and S4 has the same watchdog controller as Amlogic T7.
> 
> Changes since V2 [2]:
> - Modified yaml document to ensure that dtbs_check passes.
> - Added a patch for watchdog support for S4.
> 
> Changes since V1 [1]:
> - Added C3 compatibles, with T7 compatibles list as fallback.
> 
> [...]

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.8/arm64-dt)

[2/3] arm64: dts: Add watchdog node for Amlogic C3 SoCs
      https://git.kernel.org/amlogic/c/a30c7a73b0ad50c40c01811fa23e74764c3ba007
[3/3] arm64: dts: Add watchdog node for Amlogic S4 SoCs
      https://git.kernel.org/amlogic/c/2d66f91208d1174eb8ad29706e8bdfb587a34d5c

These changes has been applied on the intermediate git tree [1].

The v6.8/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.

In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].

The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.

If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

-- 
Neil