[PATCH 1/2] ARM: SPEAr600: add DT description of the watchdog

[PATCH 1/2] ARM: SPEAr600: add DT description of the watchdog

[Quentin Schulz]

The SPEAr600 has a built-in watchdog which already has a DT binding
described in Documentation/devicetree/bindings/watchdog/sp805-wdt.txt.

Let's add the description of the watchdog device in the SPEAr600 Device
Tree.

Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
---
 arch/arm/boot/dts/spear600.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
index 00166eb..d7c3096 100644
--- a/arch/arm/boot/dts/spear600.dtsi
+++ b/arch/arm/boot/dts/spear600.dtsi
@@ -213,6 +213,14 @@
 				interrupts = <6>;
 				status = "disabled";
 			};
+
+			wdt: wdt@fc880000 {
+				compatible = "arm,sp805", "arm,primecell";
+				reg = <0xfc880000 0x1000>;
+				interrupt-parent = <&vic1>;
+				interrupts = <20>;
+				status = "disabled";
+			};
 		};
 	};
 };

base-commit: 5e1dacccbb87780856219e29122f1eccec912ebb
-- 
git-series 0.9.1

[PATCH 2/2] clk: spear: fix WDT clock definition on SPEAr600

[Quentin Schulz]

There is no SPEAr600 device named "wdt". Instead, the description of the
WDT (watchdog) was recently added to the Device Tree, and the device
name is "fc880000.wdt", so we should associate the WDT fixed rate clock
to this device name.

Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
---
 drivers/clk/spear/spear6xx_clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/spear/spear6xx_clock.c b/drivers/clk/spear/spear6xx_clock.c
index f911d9f..47810be 100644
--- a/drivers/clk/spear/spear6xx_clock.c
+++ b/drivers/clk/spear/spear6xx_clock.c
@@ -147,7 +147,7 @@ void __init spear6xx_clk_init(void __iomem *misc_base)
 
 	clk = clk_register_fixed_factor(NULL, "wdt_clk", "osc_30m_clk", 0, 1,
 			1);
-	clk_register_clkdev(clk, NULL, "wdt");
+	clk_register_clkdev(clk, NULL, "fc880000.wdt");
 
 	/* clock derived from pll1 clk */
 	clk = clk_register_fixed_factor(NULL, "cpu_clk", "pll1_clk",
-- 
git-series 0.9.1

Re: [PATCH 1/2] ARM: SPEAr600: add DT description of the watchdog

[Viresh Kumar]

On 06-04-18, 09:50, Quentin Schulz wrote:
> The SPEAr600 has a built-in watchdog which already has a DT binding
> described in Documentation/devicetree/bindings/watchdog/sp805-wdt.txt.
> 
> Let's add the description of the watchdog device in the SPEAr600 Device
> Tree.
> 
> Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
> ---
>  arch/arm/boot/dts/spear600.dtsi | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
> index 00166eb..d7c3096 100644
> --- a/arch/arm/boot/dts/spear600.dtsi
> +++ b/arch/arm/boot/dts/spear600.dtsi
> @@ -213,6 +213,14 @@
>  				interrupts = <6>;
>  				status = "disabled";
>  			};
> +
> +			wdt: wdt@fc880000 {
> +				compatible = "arm,sp805", "arm,primecell";
> +				reg = <0xfc880000 0x1000>;
> +				interrupt-parent = <&vic1>;
> +				interrupts = <20>;
> +				status = "disabled";
> +			};
>  		};
>  	};
>  };

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh

Re: [PATCH 2/2] clk: spear: fix WDT clock definition on SPEAr600

[Viresh Kumar]

On 06-04-18, 09:50, Quentin Schulz wrote:
> There is no SPEAr600 device named "wdt". Instead, the description of the
> WDT (watchdog) was recently added to the Device Tree, and the device
> name is "fc880000.wdt", so we should associate the WDT fixed rate clock
> to this device name.
> 
> Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
> ---
>  drivers/clk/spear/spear6xx_clock.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/spear/spear6xx_clock.c b/drivers/clk/spear/spear6xx_clock.c
> index f911d9f..47810be 100644
> --- a/drivers/clk/spear/spear6xx_clock.c
> +++ b/drivers/clk/spear/spear6xx_clock.c
> @@ -147,7 +147,7 @@ void __init spear6xx_clk_init(void __iomem *misc_base)
>  
>  	clk = clk_register_fixed_factor(NULL, "wdt_clk", "osc_30m_clk", 0, 1,
>  			1);
> -	clk_register_clkdev(clk, NULL, "wdt");
> +	clk_register_clkdev(clk, NULL, "fc880000.wdt");
>  
>  	/* clock derived from pll1 clk */
>  	clk = clk_register_fixed_factor(NULL, "cpu_clk", "pll1_clk",

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh

Re: [PATCH 2/2] clk: spear: fix WDT clock definition on SPEAr600

[Stephen Boyd]

Quoting Quentin Schulz (2018-04-06 00:50:45)
> There is no SPEAr600 device named "wdt". Instead, the description of the
> WDT (watchdog) was recently added to the Device Tree, and the device
> name is "fc880000.wdt", so we should associate the WDT fixed rate clock
> to this device name.
> 
> Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
> ---

Applied to clk-next

I take it there are other problems though, e.g. clcd. Why not use DT
lookups instead of clkdev ones?