From: Andre Przywara <andre.przywara@arm.com> To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org> Cc: Rob Herring <robh+dt@kernel.org>, Mesih Kilinc <mesihkilinc@gmail.com>, Icenowy Zheng <icenowy@aosc.io>, Jesse Taube <mr.bossman075@gmail.com>, Giulio Benetti <giulio.benetti@benettiengineering.com>, George Hilliard <thirtythreeforty@gmail.com>, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Wim Van Sebroeck <wim@linux-watchdog.org>, Guenter Roeck <linux@roeck-us.net>, linux-watchdog@vger.kernel.org Subject: [PATCH 02/14] ARM: dts: suniv: F1C100: fix watchdog compatible Date: Mon, 7 Mar 2022 14:34:09 +0000 [thread overview] Message-ID: <20220307143421.1106209-3-andre.przywara@arm.com> (raw) In-Reply-To: <20220307143421.1106209-1-andre.przywara@arm.com> The F1C100 series of SoCs actually have their watchdog IP being compatible with the newer Allwinner generation, not the older one. The currently described sun4i-a10-wdt actually does not work, neither the watchdog functionality (just never fires), nor the reset part (reboot hangs). Replace the compatible string with the one used by the newer generation. Verified to work with both the watchdog and reboot functionality on a LicheePi Nano. Also add the missing interrupt line and clock source, to make it binding compliant. Fixes: 4ba16d17efdd ("ARM: dts: suniv: add initial DTSI file for F1C100s") Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- arch/arm/boot/dts/suniv-f1c100s.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/suniv-f1c100s.dtsi b/arch/arm/boot/dts/suniv-f1c100s.dtsi index 6100d3b75f61..def830101448 100644 --- a/arch/arm/boot/dts/suniv-f1c100s.dtsi +++ b/arch/arm/boot/dts/suniv-f1c100s.dtsi @@ -104,8 +104,10 @@ timer@1c20c00 { wdt: watchdog@1c20ca0 { compatible = "allwinner,suniv-f1c100s-wdt", - "allwinner,sun4i-a10-wdt"; + "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; + interrupts = <16>; + clocks = <&osc32k>; }; uart0: serial@1c25000 { -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Andre Przywara <andre.przywara@arm.com> To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org> Cc: Rob Herring <robh+dt@kernel.org>, Mesih Kilinc <mesihkilinc@gmail.com>, Icenowy Zheng <icenowy@aosc.io>, Jesse Taube <mr.bossman075@gmail.com>, Giulio Benetti <giulio.benetti@benettiengineering.com>, George Hilliard <thirtythreeforty@gmail.com>, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Wim Van Sebroeck <wim@linux-watchdog.org>, Guenter Roeck <linux@roeck-us.net>, linux-watchdog@vger.kernel.org Subject: [PATCH 02/14] ARM: dts: suniv: F1C100: fix watchdog compatible Date: Mon, 7 Mar 2022 14:34:09 +0000 [thread overview] Message-ID: <20220307143421.1106209-3-andre.przywara@arm.com> (raw) In-Reply-To: <20220307143421.1106209-1-andre.przywara@arm.com> The F1C100 series of SoCs actually have their watchdog IP being compatible with the newer Allwinner generation, not the older one. The currently described sun4i-a10-wdt actually does not work, neither the watchdog functionality (just never fires), nor the reset part (reboot hangs). Replace the compatible string with the one used by the newer generation. Verified to work with both the watchdog and reboot functionality on a LicheePi Nano. Also add the missing interrupt line and clock source, to make it binding compliant. Fixes: 4ba16d17efdd ("ARM: dts: suniv: add initial DTSI file for F1C100s") Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- arch/arm/boot/dts/suniv-f1c100s.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/suniv-f1c100s.dtsi b/arch/arm/boot/dts/suniv-f1c100s.dtsi index 6100d3b75f61..def830101448 100644 --- a/arch/arm/boot/dts/suniv-f1c100s.dtsi +++ b/arch/arm/boot/dts/suniv-f1c100s.dtsi @@ -104,8 +104,10 @@ timer@1c20c00 { wdt: watchdog@1c20ca0 { compatible = "allwinner,suniv-f1c100s-wdt", - "allwinner,sun4i-a10-wdt"; + "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; + interrupts = <16>; + clocks = <&osc32k>; }; uart0: serial@1c25000 { -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-03-07 14:34 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-07 14:34 [PATCH 00/14] ARM: suniv: dts: update Allwinner F1C100 Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-07 14:34 ` [PATCH 01/14] dt-bindings: watchdog: sunxi: fix F1C100s compatible Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-08 16:08 ` Rob Herring 2022-03-08 16:08 ` Rob Herring 2022-03-09 23:02 ` Guenter Roeck 2022-03-09 23:02 ` Guenter Roeck 2022-03-10 0:46 ` Samuel Holland 2022-03-10 0:46 ` Samuel Holland 2022-03-14 17:39 ` Andre Przywara 2022-03-14 17:39 ` Andre Przywara 2022-03-07 14:34 ` Andre Przywara [this message] 2022-03-07 14:34 ` [PATCH 02/14] ARM: dts: suniv: F1C100: fix watchdog compatible Andre Przywara 2022-03-09 23:03 ` Guenter Roeck 2022-03-09 23:03 ` Guenter Roeck 2022-03-07 14:34 ` [PATCH 03/14] dt-bindings: arm: sunxi: document LicheePi Nano name Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-08 16:09 ` Rob Herring 2022-03-08 16:09 ` Rob Herring 2022-03-11 1:27 ` Samuel Holland 2022-03-11 1:27 ` Samuel Holland 2022-03-07 14:34 ` [PATCH 04/14] ARM: dts: suniv: F1C100: add clock and reset macros Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-11 1:30 ` Samuel Holland 2022-03-11 1:30 ` Samuel Holland 2022-03-07 14:34 ` [PATCH 05/14] ARM: dts: suniv: F1C100: fix CPU node Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-08 2:44 ` Jesse Taube 2022-03-08 2:44 ` Jesse Taube 2022-03-08 4:23 ` Icenowy Zheng 2022-03-08 4:23 ` Icenowy Zheng 2022-03-08 10:42 ` Andre Przywara 2022-03-08 10:42 ` Andre Przywara 2022-03-07 14:34 ` [PATCH 06/14] ARM: dts: suniv: F1C100: fix timer node Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-11 2:19 ` Samuel Holland 2022-03-11 2:19 ` Samuel Holland 2022-03-07 14:34 ` [PATCH 07/14] dt-bindings: mmc: sunxi: add Allwinner F1c100s compatible Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-08 16:10 ` Rob Herring 2022-03-08 16:10 ` Rob Herring 2022-03-11 2:19 ` Samuel Holland 2022-03-11 2:19 ` Samuel Holland 2022-03-11 15:41 ` Ulf Hansson 2022-03-11 15:41 ` Ulf Hansson 2022-03-07 14:34 ` [PATCH 08/14] ARM: dts: suniv: F1C100: add MMC controllers Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-11 2:19 ` Samuel Holland 2022-03-11 2:19 ` Samuel Holland 2022-03-07 14:34 ` [PATCH 09/14] ARM: dts: suniv: licheepi-nano: add microSD card Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-11 2:19 ` Samuel Holland 2022-03-11 2:19 ` Samuel Holland 2022-03-07 14:34 ` [PATCH 10/14] dt-bindings: spi: sunxi: document F1C100 controllers Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-08 16:10 ` Rob Herring 2022-03-08 16:10 ` Rob Herring 2022-03-11 2:19 ` Samuel Holland 2022-03-11 2:19 ` Samuel Holland 2022-03-07 14:34 ` [PATCH 11/14] ARM: dts: suniv: F1C100: add SPI support Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-11 2:19 ` Samuel Holland 2022-03-11 2:19 ` Samuel Holland 2022-03-11 13:33 ` Andre Przywara 2022-03-11 13:33 ` Andre Przywara 2022-03-07 14:34 ` [PATCH 12/14] ARM: dts: suniv: licheepi-nano: add SPI flash Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-11 2:20 ` Samuel Holland 2022-03-11 2:20 ` Samuel Holland 2022-03-07 14:34 ` [PATCH 13/14] ARM: configs: sync multi_v5_defconfig from savedefconfig Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-08 9:38 ` Arnd Bergmann 2022-03-08 9:38 ` Arnd Bergmann 2022-03-08 12:07 ` Andre Przywara 2022-03-08 12:07 ` Andre Przywara 2022-03-08 13:33 ` Arnd Bergmann 2022-03-08 13:33 ` Arnd Bergmann 2022-03-08 13:40 ` Arnd Bergmann 2022-03-08 13:40 ` Arnd Bergmann 2022-03-08 14:30 ` Nicolas Ferre 2022-03-08 14:30 ` Nicolas Ferre 2022-03-08 15:17 ` Arnd Bergmann 2022-03-08 15:17 ` Arnd Bergmann 2022-03-10 10:33 ` Andre Przywara 2022-03-10 10:33 ` Andre Przywara 2022-03-07 14:34 ` [PATCH 14/14] ARM: configs: multi_v5: Enable Allwinner F1C100 Andre Przywara 2022-03-07 14:34 ` Andre Przywara 2022-03-07 18:03 ` [PATCH 00/14] ARM: suniv: dts: update " Jesse Taube 2022-03-07 18:03 ` Jesse Taube 2022-03-07 18:22 ` Giulio Benetti 2022-03-07 18:22 ` Giulio Benetti 2022-03-11 1:38 ` Jesse Taube 2022-03-11 1:38 ` Jesse Taube
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220307143421.1106209-3-andre.przywara@arm.com \ --to=andre.przywara@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=giulio.benetti@benettiengineering.com \ --cc=icenowy@aosc.io \ --cc=jernej.skrabec@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-sunxi@lists.linux.dev \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=mesihkilinc@gmail.com \ --cc=mr.bossman075@gmail.com \ --cc=mripard@kernel.org \ --cc=robh+dt@kernel.org \ --cc=samuel@sholland.org \ --cc=thirtythreeforty@gmail.com \ --cc=wens@csie.org \ --cc=wim@linux-watchdog.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.