[PATCH v2 0/2] ARM: bcm281xx: Board specific reboot code

[PATCH v2 0/2] ARM: bcm281xx: Board specific reboot code

[Markus Mayer]

This is a slightly reworked version of the reboot code posted earlier.
It has been rebased on 3.11-rc1.

The original patches are here:

http://lists.infradead.org/pipermail/linux-arm-kernel/2013-June/180814.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-June/180817.html

Changes since v1 include:
  - change vendor prefix for watchdog from "bcm," to "brcm,"
  - change bcm_kona_restart() to use enum reboot_mode as first parameter
  - error checking to catch unmapped watchdog or missing DT entry
  - removal of unused #define
  - formatting changes
  - additional comments in code


Markus Mayer (2):
  ARM: bcm281xx: Board specific reboot code
  ARM: bcm281xx: DT changes for reboot code

 .../devicetree/bindings/arm/bcm/bcm,kona-wdt.txt   |   15 +++++
 arch/arm/boot/dts/bcm11351.dtsi                    |    7 ++-
 arch/arm/mach-bcm/Makefile                         |    4 +-
 arch/arm/mach-bcm/board_bcm.c                      |   20 +++++-
 arch/arm/mach-bcm/kona.c                           |   65 ++++++++++++++++++++
 arch/arm/mach-bcm/kona.h                           |   17 +++++
 6 files changed, 122 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
 create mode 100644 arch/arm/mach-bcm/kona.c
 create mode 100644 arch/arm/mach-bcm/kona.h

-- 
1.7.9.5

[PATCH v2 0/2] ARM: bcm281xx: Board specific reboot code

[Markus Mayer]

This is a slightly reworked version of the reboot code posted earlier.
It has been rebased on 3.11-rc1.

The original patches are here:

http://lists.infradead.org/pipermail/linux-arm-kernel/2013-June/180814.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-June/180817.html

Changes since v1 include:
  - change vendor prefix for watchdog from "bcm," to "brcm,"
  - change bcm_kona_restart() to use enum reboot_mode as first parameter
  - error checking to catch unmapped watchdog or missing DT entry
  - removal of unused #define
  - formatting changes
  - additional comments in code


Markus Mayer (2):
  ARM: bcm281xx: Board specific reboot code
  ARM: bcm281xx: DT changes for reboot code

 .../devicetree/bindings/arm/bcm/bcm,kona-wdt.txt   |   15 +++++
 arch/arm/boot/dts/bcm11351.dtsi                    |    7 ++-
 arch/arm/mach-bcm/Makefile                         |    4 +-
 arch/arm/mach-bcm/board_bcm.c                      |   20 +++++-
 arch/arm/mach-bcm/kona.c                           |   65 ++++++++++++++++++++
 arch/arm/mach-bcm/kona.h                           |   17 +++++
 6 files changed, 122 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
 create mode 100644 arch/arm/mach-bcm/kona.c
 create mode 100644 arch/arm/mach-bcm/kona.h

-- 
1.7.9.5

[PATCH v2 1/2] ARM: bcm281xx: Board specific reboot code

[Markus Mayer]

This patch adds the code needed to trigger a reboot on the bcm281xx
family.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
Reviewed-by: Matt Porter <matt.porter@linaro.org>
Reviewed-by: Alex Elder <alex.elder@linaro.org>
Acked-by: Christian Daudt <csd@broadcom.com>
---
 arch/arm/mach-bcm/Makefile    |    4 +--
 arch/arm/mach-bcm/board_bcm.c |   20 +++++++++++--
 arch/arm/mach-bcm/kona.c      |   65 +++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-bcm/kona.h      |   17 +++++++++++
 4 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm/mach-bcm/kona.c
 create mode 100644 arch/arm/mach-bcm/kona.h

diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 6adb6aec..7e5ca0a 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 Broadcom Corporation
+# Copyright (C) 2012-2013 Broadcom Corporation
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -10,6 +10,6 @@
 # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-obj-$(CONFIG_ARCH_BCM)		:= board_bcm.o bcm_kona_smc.o bcm_kona_smc_asm.o
+obj-$(CONFIG_ARCH_BCM)	:= board_bcm.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_bcm_kona_smc_asm.o	:=-Wa,-march=armv7-a$(plus_sec)
diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
index 2859932..1e49ec0 100644
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Broadcom Corporation
+ * Copyright (C) 2012-2013 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -21,8 +21,8 @@
 #include <asm/mach/time.h>
 #include <asm/hardware/cache-l2x0.h>
 
-
 #include "bcm_kona_smc.h"
+#include "kona.h"
 
 static int __init kona_l2_cache_init(void)
 {
@@ -40,13 +40,26 @@ static int __init kona_l2_cache_init(void)
 	return 0;
 }
 
+static void bcm_board_setup_restart(void)
+{
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "bcm,bcm11351");
+	if (np) {
+		if (of_device_is_available(np))
+			bcm_kona_setup_restart();
+		of_node_put(np);
+	}
+	/* Restart setup for other boards goes here */
+}
+
 static void __init board_init(void)
 {
 	of_platform_populate(NULL, of_default_bus_match_table, NULL,
 		&platform_bus);
 
 	bcm_kona_smc_init();
-
+	bcm_board_setup_restart();
 	kona_l2_cache_init();
 }
 
@@ -55,5 +68,6 @@ static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
 DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
 	.init_time = clocksource_of_init,
 	.init_machine = board_init,
+	.restart = bcm_kona_restart,
 	.dt_compat = bcm11351_dt_compat,
 MACHINE_END
diff --git a/arch/arm/mach-bcm/kona.c b/arch/arm/mach-bcm/kona.c
new file mode 100644
index 0000000..6939d90
--- /dev/null
+++ b/arch/arm/mach-bcm/kona.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/of_address.h>
+#include <asm/io.h>
+
+#include "kona.h"
+
+static void __iomem *watchdog_base;
+
+void bcm_kona_setup_restart(void)
+{
+	struct device_node *np_wdog;
+
+	/*
+	 * The assumption is that whoever calls bcm_kona_setup_restart()
+	 * also needs a Kona Watchdog Timer entry in Device Tree, i.e. we
+	 * report an error if the DT entry is missing.
+	 */
+	np_wdog = of_find_compatible_node(NULL, NULL, "brcm,kona-wdt");
+	if (!np_wdog) {
+		pr_err("brcm,kona-wdt not found in DT, reboot disabled\n");
+		return;
+	}
+	watchdog_base = of_iomap(np_wdog, 0);
+	WARN(!watchdog_base, "failed to map watchdog base");
+	of_node_put(np_wdog);
+}
+
+#define SECWDOG_OFFSET			0x00000000
+#define SECWDOG_RESERVED_MASK		0xE2000000
+#define SECWDOG_WD_LOAD_FLAG_MASK	0x10000000
+#define SECWDOG_EN_MASK			0x08000000
+#define SECWDOG_SRSTEN_MASK		0x04000000
+#define SECWDOG_CLKS_SHIFT		20
+#define SECWDOG_LOCK_SHIFT		0
+
+void bcm_kona_restart(enum reboot_mode mode, const char *cmd)
+{
+	uint32_t val;
+
+	if (!watchdog_base)
+		panic("Watchdog not mapped. Reboot failed.\n");
+
+	/* Enable watchdog2 with very short timeout. */
+	val = readl(watchdog_base + SECWDOG_OFFSET);
+	val &= SECWDOG_RESERVED_MASK | SECWDOG_WD_LOAD_FLAG_MASK;
+	val |= SECWDOG_EN_MASK | SECWDOG_SRSTEN_MASK |
+		(0x8 << SECWDOG_CLKS_SHIFT) |
+		(0x8 << SECWDOG_LOCK_SHIFT);
+	writel(val, watchdog_base + SECWDOG_OFFSET);
+
+	while (1)
+		;
+}
diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h
new file mode 100644
index 0000000..291eca3
--- /dev/null
+++ b/arch/arm/mach-bcm/kona.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2013 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/reboot.h>
+
+void bcm_kona_setup_restart(void);
+void bcm_kona_restart(enum reboot_mode mode, const char *cmd);
-- 
1.7.9.5

[PATCH v2 1/2] ARM: bcm281xx: Board specific reboot code

[Markus Mayer]

This patch adds the code needed to trigger a reboot on the bcm281xx
family.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
Reviewed-by: Matt Porter <matt.porter@linaro.org>
Reviewed-by: Alex Elder <alex.elder@linaro.org>
Acked-by: Christian Daudt <csd@broadcom.com>
---
 arch/arm/mach-bcm/Makefile    |    4 +--
 arch/arm/mach-bcm/board_bcm.c |   20 +++++++++++--
 arch/arm/mach-bcm/kona.c      |   65 +++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-bcm/kona.h      |   17 +++++++++++
 4 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm/mach-bcm/kona.c
 create mode 100644 arch/arm/mach-bcm/kona.h

diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 6adb6aec..7e5ca0a 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 Broadcom Corporation
+# Copyright (C) 2012-2013 Broadcom Corporation
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -10,6 +10,6 @@
 # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-obj-$(CONFIG_ARCH_BCM)		:= board_bcm.o bcm_kona_smc.o bcm_kona_smc_asm.o
+obj-$(CONFIG_ARCH_BCM)	:= board_bcm.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_bcm_kona_smc_asm.o	:=-Wa,-march=armv7-a$(plus_sec)
diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
index 2859932..1e49ec0 100644
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Broadcom Corporation
+ * Copyright (C) 2012-2013 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -21,8 +21,8 @@
 #include <asm/mach/time.h>
 #include <asm/hardware/cache-l2x0.h>
 
-
 #include "bcm_kona_smc.h"
+#include "kona.h"
 
 static int __init kona_l2_cache_init(void)
 {
@@ -40,13 +40,26 @@ static int __init kona_l2_cache_init(void)
 	return 0;
 }
 
+static void bcm_board_setup_restart(void)
+{
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "bcm,bcm11351");
+	if (np) {
+		if (of_device_is_available(np))
+			bcm_kona_setup_restart();
+		of_node_put(np);
+	}
+	/* Restart setup for other boards goes here */
+}
+
 static void __init board_init(void)
 {
 	of_platform_populate(NULL, of_default_bus_match_table, NULL,
 		&platform_bus);
 
 	bcm_kona_smc_init();
-
+	bcm_board_setup_restart();
 	kona_l2_cache_init();
 }
 
@@ -55,5 +68,6 @@ static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
 DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
 	.init_time = clocksource_of_init,
 	.init_machine = board_init,
+	.restart = bcm_kona_restart,
 	.dt_compat = bcm11351_dt_compat,
 MACHINE_END
diff --git a/arch/arm/mach-bcm/kona.c b/arch/arm/mach-bcm/kona.c
new file mode 100644
index 0000000..6939d90
--- /dev/null
+++ b/arch/arm/mach-bcm/kona.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/of_address.h>
+#include <asm/io.h>
+
+#include "kona.h"
+
+static void __iomem *watchdog_base;
+
+void bcm_kona_setup_restart(void)
+{
+	struct device_node *np_wdog;
+
+	/*
+	 * The assumption is that whoever calls bcm_kona_setup_restart()
+	 * also needs a Kona Watchdog Timer entry in Device Tree, i.e. we
+	 * report an error if the DT entry is missing.
+	 */
+	np_wdog = of_find_compatible_node(NULL, NULL, "brcm,kona-wdt");
+	if (!np_wdog) {
+		pr_err("brcm,kona-wdt not found in DT, reboot disabled\n");
+		return;
+	}
+	watchdog_base = of_iomap(np_wdog, 0);
+	WARN(!watchdog_base, "failed to map watchdog base");
+	of_node_put(np_wdog);
+}
+
+#define SECWDOG_OFFSET			0x00000000
+#define SECWDOG_RESERVED_MASK		0xE2000000
+#define SECWDOG_WD_LOAD_FLAG_MASK	0x10000000
+#define SECWDOG_EN_MASK			0x08000000
+#define SECWDOG_SRSTEN_MASK		0x04000000
+#define SECWDOG_CLKS_SHIFT		20
+#define SECWDOG_LOCK_SHIFT		0
+
+void bcm_kona_restart(enum reboot_mode mode, const char *cmd)
+{
+	uint32_t val;
+
+	if (!watchdog_base)
+		panic("Watchdog not mapped. Reboot failed.\n");
+
+	/* Enable watchdog2 with very short timeout. */
+	val = readl(watchdog_base + SECWDOG_OFFSET);
+	val &= SECWDOG_RESERVED_MASK | SECWDOG_WD_LOAD_FLAG_MASK;
+	val |= SECWDOG_EN_MASK | SECWDOG_SRSTEN_MASK |
+		(0x8 << SECWDOG_CLKS_SHIFT) |
+		(0x8 << SECWDOG_LOCK_SHIFT);
+	writel(val, watchdog_base + SECWDOG_OFFSET);
+
+	while (1)
+		;
+}
diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h
new file mode 100644
index 0000000..291eca3
--- /dev/null
+++ b/arch/arm/mach-bcm/kona.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2013 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/reboot.h>
+
+void bcm_kona_setup_restart(void);
+void bcm_kona_restart(enum reboot_mode mode, const char *cmd);
-- 
1.7.9.5

[PATCH v2 2/2] ARM: bcm281xx: DT changes for reboot code

[Markus Mayer]

This patch adds the device tree bindings for the bcm281xx reboot code.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
Acked-by: Christian Daudt <csd@broadcom.com>
---
 .../devicetree/bindings/arm/bcm/bcm,kona-wdt.txt   |   15 +++++++++++++++
 arch/arm/boot/dts/bcm11351.dtsi                    |    7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt

diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
new file mode 100644
index 0000000..bb7be64
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
@@ -0,0 +1,15 @@
+Broadcom Kona Family Watchdog Timer
+-----------------------------------
+
+This watchdog timer is used in the following Broadcom SoCs:
+  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
+
+Required properties:
+  - compatible = "brcm,kona-wdt";
+  - reg: memory range
+
+Example:
+	watchdog@35002f40 {
+		compatible = "brcm,kona-wdt";
+		reg = <0x35002f40 0x6c>;
+	};
diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
index c0cdf66..a1c1881 100644
--- a/arch/arm/boot/dts/bcm11351.dtsi
+++ b/arch/arm/boot/dts/bcm11351.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Broadcom Corporation
+ * Copyright (C) 2012-2013 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -56,6 +56,11 @@
 		cache-level = <2>;
 	};
 
+	watchdog@35002f40 {
+		compatible = "bcm,kona-wdt";
+		reg = <0x35002f40 0x6c>;
+	};
+
 	timer@35006000 {
 		compatible = "bcm,kona-timer";
 		reg = <0x35006000 0x1000>;
-- 
1.7.9.5

[PATCH v2 2/2] ARM: bcm281xx: DT changes for reboot code

[Markus Mayer]

This patch adds the device tree bindings for the bcm281xx reboot code.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
Acked-by: Christian Daudt <csd@broadcom.com>
---
 .../devicetree/bindings/arm/bcm/bcm,kona-wdt.txt   |   15 +++++++++++++++
 arch/arm/boot/dts/bcm11351.dtsi                    |    7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt

diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
new file mode 100644
index 0000000..bb7be64
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
@@ -0,0 +1,15 @@
+Broadcom Kona Family Watchdog Timer
+-----------------------------------
+
+This watchdog timer is used in the following Broadcom SoCs:
+  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
+
+Required properties:
+  - compatible = "brcm,kona-wdt";
+  - reg: memory range
+
+Example:
+	watchdog at 35002f40 {
+		compatible = "brcm,kona-wdt";
+		reg = <0x35002f40 0x6c>;
+	};
diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
index c0cdf66..a1c1881 100644
--- a/arch/arm/boot/dts/bcm11351.dtsi
+++ b/arch/arm/boot/dts/bcm11351.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Broadcom Corporation
+ * Copyright (C) 2012-2013 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -56,6 +56,11 @@
 		cache-level = <2>;
 	};
 
+	watchdog at 35002f40 {
+		compatible = "bcm,kona-wdt";
+		reg = <0x35002f40 0x6c>;
+	};
+
 	timer at 35006000 {
 		compatible = "bcm,kona-timer";
 		reg = <0x35006000 0x1000>;
-- 
1.7.9.5

Re: [PATCH v2 2/2] ARM: bcm281xx: DT changes for reboot code

[Markus Mayer]

On 24 July 2013 16:35, Markus Mayer <markus.mayer@linaro.org> wrote:
> This patch adds the device tree bindings for the bcm281xx reboot code.
>
> Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
> Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
> Acked-by: Christian Daudt <csd@broadcom.com>
> ---
>  .../devicetree/bindings/arm/bcm/bcm,kona-wdt.txt   |   15 +++++++++++++++
>  arch/arm/boot/dts/bcm11351.dtsi                    |    7 ++++++-
>  2 files changed, 21 insertions(+), 1 deletion(-)
>  create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
>
> diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
> new file mode 100644
> index 0000000..bb7be64
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
> @@ -0,0 +1,15 @@
> +Broadcom Kona Family Watchdog Timer
> +-----------------------------------
> +
> +This watchdog timer is used in the following Broadcom SoCs:
> +  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
> +
> +Required properties:
> +  - compatible = "brcm,kona-wdt";
> +  - reg: memory range
> +
> +Example:
> +       watchdog@35002f40 {
> +               compatible = "brcm,kona-wdt";
> +               reg = <0x35002f40 0x6c>;
> +       };
> diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
> index c0cdf66..a1c1881 100644
> --- a/arch/arm/boot/dts/bcm11351.dtsi
> +++ b/arch/arm/boot/dts/bcm11351.dtsi
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (C) 2012 Broadcom Corporation
> + * Copyright (C) 2012-2013 Broadcom Corporation
>   *
>   * This program is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU General Public License as
> @@ -56,6 +56,11 @@
>                 cache-level = <2>;
>         };
>
> +       watchdog@35002f40 {
> +               compatible = "bcm,kona-wdt";

This oversight in the compatible string has been fixed.

> +               reg = <0x35002f40 0x6c>;
> +       };
> +
>         timer@35006000 {
>                 compatible = "bcm,kona-timer";
>                 reg = <0x35006000 0x1000>;
> --
> 1.7.9.5
>
>

-- 
Markus Mayer
Broadcom Landing Team

[PATCH v2 2/2] ARM: bcm281xx: DT changes for reboot code

[Markus Mayer]

On 24 July 2013 16:35, Markus Mayer <markus.mayer@linaro.org> wrote:
> This patch adds the device tree bindings for the bcm281xx reboot code.
>
> Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
> Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
> Acked-by: Christian Daudt <csd@broadcom.com>
> ---
>  .../devicetree/bindings/arm/bcm/bcm,kona-wdt.txt   |   15 +++++++++++++++
>  arch/arm/boot/dts/bcm11351.dtsi                    |    7 ++++++-
>  2 files changed, 21 insertions(+), 1 deletion(-)
>  create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
>
> diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
> new file mode 100644
> index 0000000..bb7be64
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
> @@ -0,0 +1,15 @@
> +Broadcom Kona Family Watchdog Timer
> +-----------------------------------
> +
> +This watchdog timer is used in the following Broadcom SoCs:
> +  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
> +
> +Required properties:
> +  - compatible = "brcm,kona-wdt";
> +  - reg: memory range
> +
> +Example:
> +       watchdog at 35002f40 {
> +               compatible = "brcm,kona-wdt";
> +               reg = <0x35002f40 0x6c>;
> +       };
> diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
> index c0cdf66..a1c1881 100644
> --- a/arch/arm/boot/dts/bcm11351.dtsi
> +++ b/arch/arm/boot/dts/bcm11351.dtsi
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (C) 2012 Broadcom Corporation
> + * Copyright (C) 2012-2013 Broadcom Corporation
>   *
>   * This program is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU General Public License as
> @@ -56,6 +56,11 @@
>                 cache-level = <2>;
>         };
>
> +       watchdog at 35002f40 {
> +               compatible = "bcm,kona-wdt";

This oversight in the compatible string has been fixed.

> +               reg = <0x35002f40 0x6c>;
> +       };
> +
>         timer at 35006000 {
>                 compatible = "bcm,kona-timer";
>                 reg = <0x35006000 0x1000>;
> --
> 1.7.9.5
>
>

-- 
Markus Mayer
Broadcom Landing Team

Re: [PATCH v2 2/2] ARM: bcm281xx: DT changes for reboot code

[Markus Mayer]

There are some minor changes necessary for this patch.

> This patch adds the device tree bindings for the bcm281xx reboot code.

> diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
> new file mode 100644
> index 0000000..bb7be64
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt

Name changed to brcm,kona-wdt.txt.

> @@ -0,0 +1,15 @@
> +Broadcom Kona Family Watchdog Timer
> +-----------------------------------
> +
> +This watchdog timer is used in the following Broadcom SoCs:
> +  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
> +
> +Required properties:
> +  - compatible = "brcm,kona-wdt";

Change to:  - compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

> +  - reg: memory range
> +
> +Example:
> +       watchdog@35002f40 {
> +               compatible = "brcm,kona-wdt";

Change to: compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

> +               reg = <0x35002f40 0x6c>;
> +       };
> diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
> index c0cdf66..a1c1881 100644
> --- a/arch/arm/boot/dts/bcm11351.dtsi
> +++ b/arch/arm/boot/dts/bcm11351.dtsi
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (C) 2012 Broadcom Corporation
> + * Copyright (C) 2012-2013 Broadcom Corporation
>   *
>   * This program is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU General Public License as
> @@ -56,6 +56,11 @@
>                 cache-level = <2>;
>         };
>
> +       watchdog@35002f40 {
> +               compatible = "bcm,kona-wdt";

Change to: compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

> +               reg = <0x35002f40 0x6c>;
> +       };
> +
>         timer@35006000 {
>                 compatible = "bcm,kona-timer";
>                 reg = <0x35006000 0x1000>;
> --
> 1.7.9.5
>
>

-- 
Markus Mayer
Broadcom Landing Team

[PATCH v2 2/2] ARM: bcm281xx: DT changes for reboot code

[Markus Mayer]

There are some minor changes necessary for this patch.

> This patch adds the device tree bindings for the bcm281xx reboot code.

> diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt
> new file mode 100644
> index 0000000..bb7be64
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt

Name changed to brcm,kona-wdt.txt.

> @@ -0,0 +1,15 @@
> +Broadcom Kona Family Watchdog Timer
> +-----------------------------------
> +
> +This watchdog timer is used in the following Broadcom SoCs:
> +  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
> +
> +Required properties:
> +  - compatible = "brcm,kona-wdt";

Change to:  - compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

> +  - reg: memory range
> +
> +Example:
> +       watchdog at 35002f40 {
> +               compatible = "brcm,kona-wdt";

Change to: compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

> +               reg = <0x35002f40 0x6c>;
> +       };
> diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
> index c0cdf66..a1c1881 100644
> --- a/arch/arm/boot/dts/bcm11351.dtsi
> +++ b/arch/arm/boot/dts/bcm11351.dtsi
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (C) 2012 Broadcom Corporation
> + * Copyright (C) 2012-2013 Broadcom Corporation
>   *
>   * This program is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU General Public License as
> @@ -56,6 +56,11 @@
>                 cache-level = <2>;
>         };
>
> +       watchdog at 35002f40 {
> +               compatible = "bcm,kona-wdt";

Change to: compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

> +               reg = <0x35002f40 0x6c>;
> +       };
> +
>         timer at 35006000 {
>                 compatible = "bcm,kona-timer";
>                 reg = <0x35006000 0x1000>;
> --
> 1.7.9.5
>
>

-- 
Markus Mayer
Broadcom Landing Team