watchdog: bcm6345: switch to raw I/O functions
PATCH v3 1/6 watchdog: bcm6345: switch to raw I/O functions
This driver is used on several big endian mips board. So we could use raw I/O function instead of forcing big endian access.
--- drivers/watchdog/bcm6345_wdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Changelog:
v2:
- add a commit message (thanks Marek)
v3:
- no change
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 ; }
Signature · 1 line
2.7.4
PATCH v3 2/6 watchdog: bcm6345: allow to use this driver on arm bcm6858
This IP is also used on some arm SoC, so we allow to use it on arm bcm6858 too.
--- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Changelog:
v2:
- add a commit message (thanks Marek)
v3:
- only enable this driver on bcm6858 (thanks Daniel)
drivers/watchdog/Kconfig +1 -1
@@ -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 || ARCH_BCM6858) help Select this to enable watchdog timer for BCM6345 SoCs. The watchdog timer is stopped when initialized.
Signature · 1 line
2.7.4
PATCH v3 2/6 watchdog: bcm6345: allow to use this driver on arm bcm6858
Quoted 4 lines · Philippe Reynes
This IP is also used on some arm SoC, so we allow to use it on arm bcm6858 too.
Signed-off-by Philippe Reynes <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190210/f992a319/attachment.sig>
PATCH v3 3/6 dt: bcm6838: add watchdog
In reply to Philippe ReynesThis commit add watchdog and sysreset watchdog
in the bcm6838 device tree.
--- arch/mips/dts/brcm,bcm6838.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
Changelog:
v2:
- add a commit message (thanks Marek)
v3:
- no change
arch/mips/dts/brcm,bcm6838.dtsi +17 -0
@@ -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
PATCH v3 3/6 dt: bcm6838: add watchdog
Quoted 4 lines · Philippe Reynes
This commit add watchdog and sysreset watchdog
in the bcm6838 device tree.Signed-off-by Philippe Reynes <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190210/18761ea6/attachment.sig>
PATCH v3 4/6 dt: bcm6858: add watchdog
In reply to Philippe ReynesThis commit add watchdog and sysreset watchdog
in the bcm6858 device tree.
--- arch/arm/dts/bcm6858.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
Changelog:
v2:
- add a commit message (thanks Marek)
v3:
- no change
arch/arm/dts/bcm6858.dtsi +17 -0
@@ -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
PATCH v3 4/6 dt: bcm6858: add watchdog
Quoted 4 lines · Philippe Reynes
This commit add watchdog and sysreset watchdog
in the bcm6858 device tree.Signed-off-by Philippe Reynes <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190210/340ab12e/attachment.sig>
PATCH v3 5/6 bcm968380gerg: enable watchdog and reboot with watchdog
In reply to Philippe ReynesEnable watchdog and reboot with watchdog in the configuration.
--- configs/bcm968380gerg_ram_defconfig | 2 ++ 1 file changed, 2 insertions(+)
Changelog:
v2:
- add a commit message (thanks Marek)
v3:
- no change
configs/bcm968380gerg_ram_defconfig +2 -0
@@ -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
PATCH v3 5/6 bcm968380gerg: enable watchdog and reboot with watchdog
Quoted 3 lines · Philippe Reynes
Enable watchdog and reboot with watchdog in the configuration.
Signed-off-by Philippe Reynes <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190210/63f2ce2d/attachment.sig>
PATCH v3 6/6 bcm968580: enable watchdog and reboot with watchdog
In reply to Philippe ReynesEnable watchdog and reboot with watchdog in the configuration.
--- configs/bcm968580_ram_defconfig | 2 ++ 1 file changed, 2 insertions(+)
Changelog:
v2:
- add a commit message (thanks Marek)
v3:
- no change
configs/bcm968580_ram_defconfig +2 -0
@@ -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
PATCH v3 6/6 bcm968580: enable watchdog and reboot with watchdog
Quoted 3 lines · Philippe Reynes
Enable watchdog and reboot with watchdog in the configuration.
Signed-off-by Philippe Reynes <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190210/65a95777/attachment.sig>
PATCH v3 1/6 watchdog: bcm6345: switch to raw I/O functions
In reply to Philippe ReynesQuoted 6 lines · Philippe Reynes
This driver is used on several big endian mips board. So we could use raw I/O function instead of forcing big endian access.
Signed-off-by Philippe Reynes <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190210/5977e383/attachment.sig>