From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8070BC433F5 for ; Mon, 14 Feb 2022 10:35:56 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3018483BB9; Mon, 14 Feb 2022 11:35:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="iHe4uxAz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AB3A383BD4; Mon, 14 Feb 2022 11:35:26 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DC1B883BCD for ; Mon, 14 Feb 2022 11:35:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9FA3A6135C; Mon, 14 Feb 2022 10:34:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E29BCC340E9; Mon, 14 Feb 2022 10:34:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644834899; bh=QhwEn4audrvzORsUShEpVgV/GC73OYfPUQ+NsyCITEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iHe4uxAzkdejIGTEouAbYlDqlp/A3d8hzBUGlZHU6+w6ANxrqNJ508IcpcRy9npxL 2tjWM1h1KzNt8FizeR/IZQuCpGnm97IcD+wsZ5A23yMaegFslQH7A68Ye/vfNtmhUs 0gdBOi6J5SNA9wN4v6Ok1opWoj2bkMvOR+CAF8Uzka6U7NSXnPAop7jagxkJ+OCU+H dWPIqua3RcwfPV0lO7818ROBeFUUUvSsUNC/DTouU0ReJVvWJFxIz+52nEAG98c0OQ Pl3/3H25fffTIFMLbFLCIYU1/bweIj8okYcGtL6nq+7KNia3j0bQN9mbjeURwCLXGC Bb+a8ncWVEZQA== Received: by pali.im (Postfix) id 983A7CAA; Mon, 14 Feb 2022 11:34:58 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Stefan Roese , Konstantin Porotchkin , Marek Behun , Vladimir Vid , Luka Perkov , Luis Torres , Scott Roberts , Paul Arola 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 Message-Id: <20220214103430.24242-5-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220214103430.24242-1-pali@kernel.org> References: <20220214103430.24242-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean 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 --- 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