Skip to contentSkip to conversation

watchdog: bcm6345: switch to raw I/O functions

PATCH Superseded Philippe Reynes 2 participants 7 messages Jan 21, 2019

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 watchdog: bcm6345: switch to raw I/O functions

---
 drivers/watchdog/bcm6345_wdt.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/watchdog/bcm6345_wdt.c +5 -5
index e1bd73d..44f5662 100644
@@ -32,8 +32,8 @@ static int bcm6345_wdt_reset(struct udevice *dev)
 {
 	struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
 
-	writel_be(WDT_CTL_START1_MASK, priv->regs + WDT_CTL_REG);
-	writel_be(WDT_CTL_START2_MASK, priv->regs + WDT_CTL_REG);
+	writel(WDT_CTL_START1_MASK, priv->regs + WDT_CTL_REG);
+	writel(WDT_CTL_START2_MASK, priv->regs + WDT_CTL_REG);
 
 	return 0;
 }
@@ -50,7 +50,7 @@ static int bcm6345_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
 		timeout = WDT_VAL_MAX;
 	}
 
-	writel_be(timeout, priv->regs + WDT_VAL_REG);
+	writel(timeout, priv->regs + WDT_VAL_REG);
 
 	return bcm6345_wdt_reset(dev);
 }
@@ -64,8 +64,8 @@ static int bcm6345_wdt_stop(struct udevice *dev)
 {
 	struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
 
-	writel_be(WDT_CTL_STOP1_MASK, priv->regs + WDT_CTL_REG);
-	writel_be(WDT_CTL_STOP2_MASK, priv->regs + WDT_CTL_REG);
+	writel(WDT_CTL_STOP1_MASK, priv->regs + WDT_CTL_REG);
+	writel(WDT_CTL_STOP2_MASK, priv->regs + WDT_CTL_REG);
 
 	return 0;
 }
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/6 watchdog: bcm6345: allow to use this driver on arm

---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/Kconfig +1 -1
index 10fd303..e723c5e 100644
@@ -88,7 +88,7 @@ config WDT_ASPEED
 
 config WDT_BCM6345
 	bool "BCM6345 watchdog timer support"
-	depends on WDT && ARCH_BMIPS
+	depends on WDT && (ARCH_BMIPS || ARM)
 	help
 	  Select this to enable watchdog timer for BCM6345 SoCs.
 	  The watchdog timer is stopped when initialized.
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/6 dt: bcm6838: add watchdog

In reply to Philippe Reynes
---
 arch/mips/dts/brcm,bcm6838.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/mips/dts/brcm,bcm6838.dtsi +17 -0
index 77d6a8e..b6f9559 100644
@@ -73,6 +73,23 @@
 			status = "disabled";
 		};
 
+		wdt0: watchdog at 14e002d0 {
+			compatible = "brcm,bcm6345-wdt";
+			reg = <0x14e002d0 0xc>;
+			clocks = <&periph_osc>;
+		};
+
+		wdt1: watchdog at 14e002dc {
+			compatible = "brcm,bcm6345-wdt";
+			reg = <0x14e002dc 0xc>;
+			clocks = <&periph_osc>;
+		};
+
+		wdt-reboot {
+			compatible = "wdt-reboot";
+			wdt = <&wdt0>;
+		};
+
 		leds: led-controller at 14e00f00 {
 			compatible = "brcm,bcm6328-leds";
 			reg = <0x14e00f00 0x28>;
Signature · 1 line
2.7.4
#3 lore raw

PATCH 4/6 dt: bcm6858: add watchdog

In reply to Philippe Reynes
---
 arch/arm/dts/bcm6858.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/dts/bcm6858.dtsi +17 -0
index d78d34d..23b80c6 100644
@@ -81,5 +81,22 @@
 
 			status = "disabled";
 		};
+
+		wdt1: watchdog at ff802780 {
+			compatible = "brcm,bcm6345-wdt";
+			reg = <0x0 0xff802780 0x0 0x14>;
+			clocks = <&periph_osc>;
+		};
+
+		wdt2: watchdog at ff8027c0 {
+			compatible = "brcm,bcm6345-wdt";
+			reg = <0x0 0xff8027c0 0x0 0x14>;
+			clocks = <&periph_osc>;
+		};
+
+		wdt-reboot {
+			compatible = "wdt-reboot";
+			wdt = <&wdt1>;
+		};
 	};
 };
Signature · 1 line
2.7.4
#4 lore raw

PATCH 5/6 bcm968380gerg_ram_defconfig: enable watchdog and reboot with watchdog

In reply to Philippe Reynes
---
 configs/bcm968380gerg_ram_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/bcm968380gerg_ram_defconfig +2 -0
index fdecc0f..d98fe51 100644
@@ -46,4 +46,6 @@ CONFIG_RESET_BCM6345=y
 # CONFIG_SPL_SERIAL_PRESENT is not set
 CONFIG_DM_SERIAL=y
 CONFIG_BCM6345_SERIAL=y
+CONFIG_SYSRESET_WATCHDOG=y
+CONFIG_WDT_BCM6345=y
 CONFIG_LZO=y
Signature · 1 line
2.7.4
#5 lore raw

PATCH 6/6 bcm968580_ram_defconfig: enable watchdog and reboot with watchdog

In reply to Philippe Reynes
---
 configs/bcm968580_ram_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/bcm968580_ram_defconfig +2 -0
index 56e0a56..b23f960 100644
@@ -31,5 +31,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_SERIAL_SEARCH_ALL=y
 CONFIG_BCM6345_SERIAL=y
 CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
+CONFIG_WDT_BCM6345=y
 CONFIG_REGEX=y
 # CONFIG_GENERATE_SMBIOS_TABLE is not set
Signature · 1 line
2.7.4
#6 lore raw

PATCH 1/6 watchdog: bcm6345: switch to raw I/O functions

In reply to Philippe Reynes

Hi,
You have to add some commit message, even if it is only one line, describing why are you doing these changes.
Marek

Quoted 40 lines · On Mon, 21 Jan 2019 18:07:28 +0100 Philippe Reynes…
---
 drivers/watchdog/bcm6345_wdt.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/drivers/watchdog/bcm6345_wdt.c index e1bd73d..44f5662 100644

drivers/watchdog/bcm6345_wdt.c +5 -5
@@ -32,8 +32,8 @@ static int bcm6345_wdt_reset(struct udevice *dev)
 {
 	struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
 
-	writel_be(WDT_CTL_START1_MASK, priv->regs + WDT_CTL_REG);
-	writel_be(WDT_CTL_START2_MASK, priv->regs + WDT_CTL_REG);
+	writel(WDT_CTL_START1_MASK, priv->regs + WDT_CTL_REG);
+	writel(WDT_CTL_START2_MASK, priv->regs + WDT_CTL_REG);
 
 	return 0;
 }
@@ -50,7 +50,7 @@ static int bcm6345_wdt_start(struct udevice *dev,
 u64 timeout, ulong flags) timeout = WDT_VAL_MAX;
 	}
 
-	writel_be(timeout, priv->regs + WDT_VAL_REG);
+	writel(timeout, priv->regs + WDT_VAL_REG);
 
 	return bcm6345_wdt_reset(dev);
 }
@@ -64,8 +64,8 @@ static int bcm6345_wdt_stop(struct udevice *dev)
 {
 	struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
 
-	writel_be(WDT_CTL_STOP1_MASK, priv->regs + WDT_CTL_REG);
-	writel_be(WDT_CTL_STOP2_MASK, priv->regs + WDT_CTL_REG);
+	writel(WDT_CTL_STOP1_MASK, priv->regs + WDT_CTL_REG);
+	writel(WDT_CTL_STOP2_MASK, priv->regs + WDT_CTL_REG);
 
 	return 0;
 }