Skip to contentSkip to conversation

wdt: sunxi: Introduce a new compatible for the A10 and A31

PATCH New Maxime Ripard 2 participants 5 messages Feb 2, 2014 – Feb 7, 2014

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 wdt: sunxi: Introduce a new compatible for the A10 and A31

For historical reasons, the Allwinner A10 compatibles are not following the patterns used for this other Allwinner SoCs.

Introduce a new compatible following the usual pattern, and deprecate the olders.

---
 Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 7 ++++---
 drivers/watchdog/sunxi_wdt.c                             | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +4 -3
index e39cb26..6e8c937 100644
@@ -2,13 +2,14 @@ Allwinner SoCs Watchdog timer
 
 Required properties:
 
-- compatible : should be "allwinner,<soc-family>-wdt", the currently supported
-  SoC families being sun4i and sun6i
+- compatible : should be either "allwinner,sun4i-a10-wdt" or
+               "allwinner,sun6i-a31-wdt" (deprecated:
+               "allwinner,sun4i-wdt", "allwinner,sun6i-wdt")
 - reg : Specifies base physical address and size of the registers.
 
 Example:
 
 wdt: watchdog at 01c20c90 {
-	compatible = "allwinner,sun4i-wdt";
+	compatible = "allwinner,sun4i-a10-wdt";
 	reg = <0x01c20c90 0x10>;
 };
drivers/watchdog/sunxi_wdt.c +1 -0
index 76332d8..7c8923d 100644
@@ -206,6 +206,7 @@ static void sunxi_wdt_shutdown(struct platform_device *pdev)
 
 static const struct of_device_id sunxi_wdt_dt_ids[] = {
 	{ .compatible = "allwinner,sun4i-wdt" },
+	{ .compatible = "allwinner,sun4i-a10-wdt" },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);
Signature · 1 line
1.8.4.2
#1 lore raw

PATCH 2/3 ARM: sunxi: Add the new watchog compatibles to the reboot code

Now that the watchdog driver has new compatibles, we need to support them in the machine reboot code too.

---
 arch/arm/mach-sunxi/sunxi.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-sunxi/sunxi.c +2 -0
index aeea6ce..c310df6 100644
@@ -95,7 +95,9 @@ static void sun6i_restart(enum reboot_mode mode, const char *cmd)
 
 static struct of_device_id sunxi_restart_ids[] = {
 	{ .compatible = "allwinner,sun4i-wdt" },
+	{ .compatible = "allwinner,sun4i-a10-wdt" },
 	{ .compatible = "allwinner,sun6i-wdt" },
+	{ .compatible = "allwinner,sun6i-a31-wdt" },
 	{ /*sentinel*/ }
 };
 
Signature · 1 line
1.8.4.2
#2 lore raw

PATCH 3/3 ARM: sunxi: dt: Update the watchdog compatibles

In reply to Maxime Ripard

The watchdog compatibles were following a different pattern than the one found in the other devices. Now that the driver supports the right pattern, switch to it in the DT.

---
 arch/arm/boot/dts/sun4i-a10.dtsi  | 2 +-
 arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +-
 arch/arm/boot/dts/sun5i-a13.dtsi  | 2 +-
 arch/arm/boot/dts/sun6i-a31.dtsi  | 2 +-
 arch/arm/boot/dts/sun7i-a20.dtsi  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/sun4i-a10.dtsi +1 -1
index 040bb0e..f1eb8718 100644
@@ -410,7 +410,7 @@
 		};
 
 		wdt: watchdog at 01c20c90 {
-			compatible = "allwinner,sun4i-wdt";
+			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
 		};
 
arch/arm/boot/dts/sun5i-a10s.dtsi +1 -1
index ea16054..c4a4b23 100644
@@ -373,7 +373,7 @@
 		};
 
 		wdt: watchdog at 01c20c90 {
-			compatible = "allwinner,sun4i-wdt";
+			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
 		};
 
arch/arm/boot/dts/sun5i-a13.dtsi +1 -1
index 320335a..143656b 100644
@@ -336,7 +336,7 @@
 		};
 
 		wdt: watchdog at 01c20c90 {
-			compatible = "allwinner,sun4i-wdt";
+			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
 		};
 
arch/arm/boot/dts/sun6i-a31.dtsi +1 -1
index 5256ad9..cc691d1 100644
@@ -242,7 +242,7 @@
 		};
 
 		wdt1: watchdog at 01c20ca0 {
-			compatible = "allwinner,sun6i-wdt";
+			compatible = "allwinner,sun6i-a31-wdt";
 			reg = <0x01c20ca0 0x20>;
 		};
 
arch/arm/boot/dts/sun7i-a20.dtsi +1 -1
index 119f066..aaa7b3d 100644
@@ -447,7 +447,7 @@
 		};
 
 		wdt: watchdog at 01c20c90 {
-			compatible = "allwinner,sun4i-wdt";
+			compatible = "allwinner,sun4i-a10-wdt";
 			reg = <0x01c20c90 0x10>;
 		};
 
Signature · 1 line
1.8.4.2
#3 lore raw

PATCH 1/3 wdt: sunxi: Introduce a new compatible for the A10 and A31

In reply to Maxime Ripard

Hi,

Quoted 23 lines · Maxime Ripard

For historical reasons, the Allwinner A10 compatibles are not following the patterns used for this other Allwinner SoCs.

Introduce a new compatible following the usual pattern, and deprecate the olders.

---
  Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 7 ++++---
  drivers/watchdog/sunxi_wdt.c                             | 1 +
  2 files changed, 5 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +2 -2
index e39cb26..6e8c937 100644
@@ -2,13 +2,14 @@ Allwinner SoCs Watchdog timer
 
  Required properties:
 
-- compatible : should be "allwinner,<soc-family>-wdt", the currently supported
-  SoC families being sun4i and sun6i
+- compatible : should be either "allwinner,sun4i-a10-wdt" or
+               "allwinner,sun6i-a31-wdt" (deprecated:

Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt Allwinner SoCs Watchdog timer · line 15

Quoted 10 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +2 -1
+               "allwinner,sun4i-wdt", "allwinner,sun6i-wdt")
  - reg : Specifies base physical address and size of the registers.
 
  Example:
 
  wdt: watchdog at 01c20c90 {
-	compatible = "allwinner,sun4i-wdt";
+	compatible = "allwinner,sun4i-a10-wdt";
  	reg = <0x01c20c90 0x10>;
  };

You talk about deprecating the old compat strings in the commit message, but here you outright replace them, which will break things with old dtb files ?

Other 2 patches in the series look good and are:

drivers/watchdog/sunxi_wdt.c static void sunxi_wdt_shutdown(struct platform_device *pdev) · line 212

Quoted 13 lines
drivers/watchdog/sunxi_wdt.c +1 -0
index 76332d8..7c8923d 100644
@@ -206,6 +206,7 @@ static void sunxi_wdt_shutdown(struct platform_device *pdev)
 
  static const struct of_device_id sunxi_wdt_dt_ids[] = {
  	{ .compatible = "allwinner,sun4i-wdt" },
+	{ .compatible = "allwinner,sun4i-a10-wdt" },
  	{ /* sentinel */ }
  };
  MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);

Regards,

Hans

#4 lore raw

PATCH 1/3 wdt: sunxi: Introduce a new compatible for the A10 and A31

Hi Hans,

Quoted 29 lines · Hans de Goede
Quoted 28 lines · Maxime Ripard

For historical reasons, the Allwinner A10 compatibles are not following the patterns used for this other Allwinner SoCs.

Introduce a new compatible following the usual pattern, and deprecate the olders.

---
 Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 7 ++++---
 drivers/watchdog/sunxi_wdt.c                             | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +3 -2
index e39cb26..6e8c937 100644
@@ -2,13 +2,14 @@ Allwinner SoCs Watchdog timer
 
 Required properties:
 
-- compatible : should be "allwinner,<soc-family>-wdt", the currently supported
-  SoC families being sun4i and sun6i
+- compatible : should be either "allwinner,sun4i-a10-wdt" or
+               "allwinner,sun6i-a31-wdt" (deprecated:
+               "allwinner,sun4i-wdt", "allwinner,sun6i-wdt")
 - reg : Specifies base physical address and size of the registers.
 
 Example:
 
Quoted 8 lines

Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt Allwinner SoCs Watchdog timer · line 15

Quoted 5 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +1 -1
 wdt: watchdog at 01c20c90 {
-	compatible = "allwinner,sun4i-wdt";
+	compatible = "allwinner,sun4i-a10-wdt";
 	reg = <0x01c20c90 0x10>;
 };

You talk about deprecating the old compat strings in the commit message, but here you outright replace them, which will break things with old dtb files ?

I'm replacing them only in the Documentation here.

I only add it to the driver after that, which means that the driver will be probed with both the new and the old compatibles.

However, the DT maintainers said it was ok to remove them entirely, so I'll send a v2.

Maxime

Quoted 23 lines

Other 2 patches in the series look good and are:

drivers/watchdog/sunxi_wdt.c static void sunxi_wdt_shutdown(struct platform_device *pdev) · line 212

Quoted 13 lines
drivers/watchdog/sunxi_wdt.c +1 -0
index 76332d8..7c8923d 100644
@@ -206,6 +206,7 @@ static void sunxi_wdt_shutdown(struct platform_device *pdev)
 
 static const struct of_device_id sunxi_wdt_dt_ids[] = {
 	{ .compatible = "allwinner,sun4i-wdt" },
+	{ .compatible = "allwinner,sun4i-a10-wdt" },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);

Regards,

Hans

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140207/f1d6c888/attachment.sig>