[U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions

All of lore.kernel.org
 help / color / mirror / Atom feed

* [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions
@ 2019-01-21 17:07 Philippe Reynes
  2019-01-21 17:07 ` [U-Boot] [PATCH 2/6] watchdog: bcm6345: allow to use this driver on arm Philippe Reynes
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Philippe Reynes @ 2019-01-21 17:07 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
---
 drivers/watchdog/bcm6345_wdt.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c
index e1bd73d..44f5662 100644
--- a/drivers/watchdog/bcm6345_wdt.c
+++ b/drivers/watchdog/bcm6345_wdt.c
@@ -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;
 }
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 2/6] watchdog: bcm6345: allow to use this driver on arm
  2019-01-21 17:07 [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Philippe Reynes
@ 2019-01-21 17:07 ` Philippe Reynes
  2019-01-21 17:07 ` [U-Boot] [PATCH 3/6] dt: bcm6838: add watchdog Philippe Reynes
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Philippe Reynes @ 2019-01-21 17:07 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 10fd303..e723c5e 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -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.
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 3/6] dt: bcm6838: add watchdog
  2019-01-21 17:07 [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Philippe Reynes
  2019-01-21 17:07 ` [U-Boot] [PATCH 2/6] watchdog: bcm6345: allow to use this driver on arm Philippe Reynes
@ 2019-01-21 17:07 ` Philippe Reynes
  2019-01-21 17:07 ` [U-Boot] [PATCH 4/6] dt: bcm6858: " Philippe Reynes
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Philippe Reynes @ 2019-01-21 17:07 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
---
 arch/mips/dts/brcm,bcm6838.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/arch/mips/dts/brcm,bcm6838.dtsi b/arch/mips/dts/brcm,bcm6838.dtsi
index 77d6a8e..b6f9559 100644
--- a/arch/mips/dts/brcm,bcm6838.dtsi
+++ b/arch/mips/dts/brcm,bcm6838.dtsi
@@ -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>;
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 4/6] dt: bcm6858: add watchdog
  2019-01-21 17:07 [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Philippe Reynes
  2019-01-21 17:07 ` [U-Boot] [PATCH 2/6] watchdog: bcm6345: allow to use this driver on arm Philippe Reynes
  2019-01-21 17:07 ` [U-Boot] [PATCH 3/6] dt: bcm6838: add watchdog Philippe Reynes
@ 2019-01-21 17:07 ` Philippe Reynes
  2019-01-21 17:07 ` [U-Boot] [PATCH 5/6] bcm968380gerg_ram_defconfig: enable watchdog and reboot with watchdog Philippe Reynes
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Philippe Reynes @ 2019-01-21 17:07 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
---
 arch/arm/dts/bcm6858.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/arch/arm/dts/bcm6858.dtsi b/arch/arm/dts/bcm6858.dtsi
index d78d34d..23b80c6 100644
--- a/arch/arm/dts/bcm6858.dtsi
+++ b/arch/arm/dts/bcm6858.dtsi
@@ -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>;
+		};
 	};
 };
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 5/6] bcm968380gerg_ram_defconfig: enable watchdog and reboot with watchdog
  2019-01-21 17:07 [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Philippe Reynes
                   ` (2 preceding siblings ...)
  2019-01-21 17:07 ` [U-Boot] [PATCH 4/6] dt: bcm6858: " Philippe Reynes
@ 2019-01-21 17:07 ` Philippe Reynes
  2019-01-21 17:07 ` [U-Boot] [PATCH 6/6] bcm968580_ram_defconfig: " Philippe Reynes
  2019-01-21 23:37 ` [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Marek Behun
  5 siblings, 0 replies; 7+ messages in thread
From: Philippe Reynes @ 2019-01-21 17:07 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
---
 configs/bcm968380gerg_ram_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/bcm968380gerg_ram_defconfig b/configs/bcm968380gerg_ram_defconfig
index fdecc0f..d98fe51 100644
--- a/configs/bcm968380gerg_ram_defconfig
+++ b/configs/bcm968380gerg_ram_defconfig
@@ -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
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 6/6] bcm968580_ram_defconfig: enable watchdog and reboot with watchdog
  2019-01-21 17:07 [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Philippe Reynes
                   ` (3 preceding siblings ...)
  2019-01-21 17:07 ` [U-Boot] [PATCH 5/6] bcm968380gerg_ram_defconfig: enable watchdog and reboot with watchdog Philippe Reynes
@ 2019-01-21 17:07 ` Philippe Reynes
  2019-01-21 23:37 ` [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Marek Behun
  5 siblings, 0 replies; 7+ messages in thread
From: Philippe Reynes @ 2019-01-21 17:07 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
---
 configs/bcm968580_ram_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/bcm968580_ram_defconfig b/configs/bcm968580_ram_defconfig
index 56e0a56..b23f960 100644
--- a/configs/bcm968580_ram_defconfig
+++ b/configs/bcm968580_ram_defconfig
@@ -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
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions
  2019-01-21 17:07 [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Philippe Reynes
                   ` (4 preceding siblings ...)
  2019-01-21 17:07 ` [U-Boot] [PATCH 6/6] bcm968580_ram_defconfig: " Philippe Reynes
@ 2019-01-21 23:37 ` Marek Behun
  5 siblings, 0 replies; 7+ messages in thread
From: Marek Behun @ 2019-01-21 23:37 UTC (permalink / raw)
  To: u-boot

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

On Mon, 21 Jan 2019 18:07:28 +0100
Philippe Reynes <philippe.reynes@softathome.com> wrote:

> Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
> ---
>  drivers/watchdog/bcm6345_wdt.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/watchdog/bcm6345_wdt.c
> b/drivers/watchdog/bcm6345_wdt.c index e1bd73d..44f5662 100644
> --- a/drivers/watchdog/bcm6345_wdt.c
> +++ b/drivers/watchdog/bcm6345_wdt.c
> @@ -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;
>  }

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-01-21 23:37 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-21 17:07 [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Philippe Reynes
2019-01-21 17:07 ` [U-Boot] [PATCH 2/6] watchdog: bcm6345: allow to use this driver on arm Philippe Reynes
2019-01-21 17:07 ` [U-Boot] [PATCH 3/6] dt: bcm6838: add watchdog Philippe Reynes
2019-01-21 17:07 ` [U-Boot] [PATCH 4/6] dt: bcm6858: " Philippe Reynes
2019-01-21 17:07 ` [U-Boot] [PATCH 5/6] bcm968380gerg_ram_defconfig: enable watchdog and reboot with watchdog Philippe Reynes
2019-01-21 17:07 ` [U-Boot] [PATCH 6/6] bcm968580_ram_defconfig: " Philippe Reynes
2019-01-21 23:37 ` [U-Boot] [PATCH 1/6] watchdog: bcm6345: switch to raw I/O functions Marek Behun

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.