leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchdog: armada_37xx: Convert to official DT bindings

Browse Source 
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>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Pali Rohár 2022-02-14 11:34:25 +01:00 committed by Stefan Roese
parent af6d0938f3
commit 0c4625ac7d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/dts/armada-37xx.dtsi
View File

@ -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 {

7
drivers/watchdog/armada-37xx-wdt.c
View File

@ -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;