public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali@kernel.org>
To: Stefan Roese <sr@denx.de>,
	Konstantin Porotchkin <kostap@marvell.com>,
	Marek Behun <marek.behun@nic.cz>,
	Vladimir Vid <vladimir.vid@sartura.hr>,
	Luka Perkov <luka.perkov@sartura.hr>,
	Luis Torres <luis.torres@methode.com>,
	Scott Roberts <scott.roberts@telus.com>,
	Paul Arola <paul.arola@telus.com>
Cc: u-boot@lists.denx.de
Subject: [PATCH u-boot-marvell 4/9] watchdog: armada_37xx: Convert to official DT bindings
Date: Mon, 14 Feb 2022 11:34:25 +0100	[thread overview]
Message-ID: <20220214103430.24242-5-pali@kernel.org> (raw)
In-Reply-To: <20220214103430.24242-1-pali@kernel.org>

Official DT bindings have only one reg property: watchdog address space.
Convert armada-37xx-wdt.c driver to offical DT bindings and access sel_reg
register via MVEBU_REGISTER() macro, as its value (required by U-Boot
driver) is not in DT yet. In later stage can be driver cleaned to not use
it.

This change would allow U-Boot to use A3720 watchdog DTS structure from
Linux kernel.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 arch/arm/dts/armada-37xx.dtsi      | 3 +--
 drivers/watchdog/armada-37xx-wdt.c | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi
index a427d9cf6218..4c686c380cee 100644
--- a/arch/arm/dts/armada-37xx.dtsi
+++ b/arch/arm/dts/armada-37xx.dtsi
@@ -109,8 +109,7 @@
 
 			wdt: watchdog-timer@8300 {
 				compatible = "marvell,armada-3700-wdt";
-				reg = <0xd064 0x4>,
-				      <0x8300 0x40>;
+				reg = <0x8300 0x40>;
 			};
 
 			nb_periph_clk: nb-periph-clk@13000 {
diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index 6b5e1ab6fc35..2e119b9b5aad 100644
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -155,12 +155,9 @@ static int a37xx_wdt_probe(struct udevice *dev)
 	struct a37xx_wdt *priv = dev_get_priv(dev);
 	fdt_addr_t addr;
 
-	addr = dev_read_addr_index(dev, 0);
-	if (addr == FDT_ADDR_T_NONE)
-		goto err;
-	priv->sel_reg = (void __iomem *)addr;
+	priv->sel_reg = (void __iomem *)MVEBU_REGISTER(0x0d064);
 
-	addr = dev_read_addr_index(dev, 1);
+	addr = dev_read_addr(dev);
 	if (addr == FDT_ADDR_T_NONE)
 		goto err;
 	priv->reg = (void __iomem *)addr;
-- 
2.20.1


  parent reply	other threads:[~2022-02-14 10:35 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-14 10:34 [PATCH u-boot-marvell 0/9] arm: a37xx: Fix code and update DTS files to upstream version Pali Rohár
2022-02-14 10:34 ` [PATCH u-boot-marvell 1/9] rtc: ds1307: Add bindings for microchip, mcp7940x Pali Rohár
2022-02-15  9:23   ` [PATCH u-boot-marvell 1/9] rtc: ds1307: Add bindings for microchip,mcp7940x Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 2/9] phy: marvell: a3700: Update compatible string to official DT bindings Pali Rohár
2022-02-15  9:23   ` Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 3/9] usb: ehci: ehci-marvell: " Pali Rohár
2022-02-15  9:24   ` Stefan Roese
2022-02-14 10:34 ` Pali Rohár [this message]
2022-02-15  9:25   ` [PATCH u-boot-marvell 4/9] watchdog: armada_37xx: Convert " Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 5/9] arm: mvebu: turris_mox: Remove hardcoded ethernet node names Pali Rohár
2022-02-15  9:27   ` Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 6/9] arm: a37xx: Update sdhci pointers to official DT bindings Pali Rohár
2022-02-15  9:28   ` Stefan Roese
2022-02-15  9:32     ` Pali Rohár
2022-02-14 10:34 ` [PATCH u-boot-marvell 7/9] arm: a37xx: espressobin: Move U-Boot specific partitions node to -u-boot.dtsi Pali Rohár
2022-02-15  9:28   ` Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 8/9] arm: a37xx: espressobin: Explicitly enable eMMC node in -u-boot.dtsi Pali Rohár
2022-02-15  9:29   ` Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 9/9] arm: a37xx: Update DTS files to version from upstream Linux kernel Pali Rohár
2022-02-15  9:31   ` Stefan Roese
2022-02-17 15:37 ` [PATCH u-boot-marvell 0/9] arm: a37xx: Fix code and update DTS files to upstream version Stefan Roese

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=20220214103430.24242-5-pali@kernel.org \
    --to=pali@kernel.org \
    --cc=kostap@marvell.com \
    --cc=luis.torres@methode.com \
    --cc=luka.perkov@sartura.hr \
    --cc=marek.behun@nic.cz \
    --cc=paul.arola@telus.com \
    --cc=scott.roberts@telus.com \
    --cc=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    --cc=vladimir.vid@sartura.hr \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox