watchdog: sp805: Add clock-frequency property
PATCH 1/1 watchdog: sp805: Add clock-frequency property
Use clock-frequency property given in _DSD object of ACPI device to calculate Watchdog rate as binding clock devices are not available as device tree.
Note: There is no formal review process for _DSD properties
--- drivers/watchdog/sp805_wdt.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
drivers/watchdog/sp805_wdt.c +25 -10
@@ -11,6 +11,7 @@* warranty of any kind, whether express or implied. */ +#include <linux/acpi.h> #include <linux/device.h> #include <linux/resource.h> #include <linux/amba/bus.h>
@@ -22,6 +23,7 @@#include <linux/math64.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/of.h> #include <linux/pm.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -65,6 +67,7 @@ struct sp805_wdt {spinlock_t lock;void __iomem *base;struct clk *clk; +u64 rate;struct amba_device *adev;unsigned int load_val; };
@@ -80,7 +83,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)struct sp805_wdt *wdt =watchdog_get_drvdata (wdd);u64 load, rate; - rate =clk_get_rate (wdt->clk); + rate = wdt->rate;/* * sp805 runs counter with given value twice, after the end of first
@@ -106,9 +109,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)static unsigned int wdt_timeleft (struct watchdog_device *wdd) {struct sp805_wdt *wdt =watchdog_get_drvdata (wdd); -u64 load, rate; - - rate =clk_get_rate (wdt->clk); +u64 load;spin_lock (&wdt->lock); load =readl_relaxed (wdt->base +WDTVALUE );
@@ -118,7 +119,7 @@ static unsigned int wdt_timeleft(struct watchdog_device *wdd) load += wdt->load_val +1 ;spin_unlock (&wdt->lock); -return div_u64 (load, rate); +return div_u64 (load, wdt->rate); } static int
@@ -228,11 +229,25 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)if (IS_ERR (wdt->base))return PTR_ERR (wdt->base); - wdt->clk =devm_clk_get (&adev->dev,NULL ); -if (IS_ERR (wdt->clk)) { -dev_warn (&adev->dev,"Clock not found\n" ); - ret =PTR_ERR (wdt->clk); - goto err; +if (adev->dev.of_node) { + wdt->clk =devm_clk_get (&adev->dev,NULL ); +if (IS_ERR (wdt->clk)) { +dev_err (&adev->dev,"Clock not found\n" ); +return PTR_ERR (wdt->clk); + } + wdt->rate =clk_get_rate (wdt->clk); + }else if (has_acpi_companion (&adev->dev)) { +/* +* When Driver probe with ACPI device, clock devices +* are not available, so watchdog rate get from +* clock-frequency property given in _DSD object. +*/ +device_property_read_u64 (&adev->dev,"clock-frequency" , + &wdt->rate); +if (!wdt->rate) { +dev_err (&adev->dev,"no clock-frequency property\n" ); +return -ENODEV ; + } } wdt->adev = adev;
Signature · 1 line
2.7.4
Guenter Roeck
maintainerQuoted 9 lines · Srinath Mannam
Use clock-frequency property given in
_DSDobject of ACPI device to calculate Watchdog rate as binding clock devices are not available as device tree.Note: There is no formal review process for
_DSDpropertiesSigned-off-by Srinath Mannam <[email protected]>Signed-off-by Guenter Roeck <[email protected]>
I just noticed this. This is completely inappropriate. It is the equivalent of forging a signature on a check.
_Never_ add a Signed-off-by: statement for anyone but yourself.
Guenter
Quoted 96 lines
Reviewed-by Guenter Roeck <[email protected]>Reviewed-by Ray Jui <[email protected]>Reviewed-by Scott Branden <[email protected]>--- drivers/watchdog/sp805_wdt.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)drivers/watchdog/sp805_wdt.c +25
-10@@ -11,6 +11,7 @@* warranty of any kind, whether express or implied. */ +#include <linux/acpi.h> #include <linux/device.h> #include <linux/resource.h> #include <linux/amba/bus.h> @@ -22,6 +23,7 @@#include <linux/math64.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/of.h> #include <linux/pm.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -65,6 +67,7 @@ struct sp805_wdt {spinlock_t lock;void __iomem *base;struct clk *clk; +u64 rate;struct amba_device *adev;unsigned int load_val; };@@ -80,7 +83,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)struct sp805_wdt *wdt =watchdog_get_drvdata (wdd);u64 load, rate; - rate =clk_get_rate (wdt->clk); + rate = wdt->rate;/* * sp805 runs counter with given value twice, after the end of first @@ -106,9 +109,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)static unsigned int wdt_timeleft (struct watchdog_device *wdd) {struct sp805_wdt *wdt =watchdog_get_drvdata (wdd); -u64 load, rate; - - rate =clk_get_rate (wdt->clk); +u64 load;spin_lock (&wdt->lock); load =readl_relaxed (wdt->base +WDTVALUE );@@ -118,7 +119,7 @@ static unsigned int wdt_timeleft(struct watchdog_device *wdd) load += wdt->load_val +1 ;spin_unlock (&wdt->lock); -return div_u64 (load, rate); +return div_u64 (load, wdt->rate); } static int@@ -228,11 +229,25 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)if (IS_ERR (wdt->base))return PTR_ERR (wdt->base); - wdt->clk =devm_clk_get (&adev->dev,NULL ); -if (IS_ERR (wdt->clk)) { -dev_warn (&adev->dev,"Clock not found\n" ); - ret =PTR_ERR (wdt->clk); - goto err; +if (adev->dev.of_node) { + wdt->clk =devm_clk_get (&adev->dev,NULL ); +if (IS_ERR (wdt->clk)) { +dev_err (&adev->dev,"Clock not found\n" ); +return PTR_ERR (wdt->clk); + } + wdt->rate =clk_get_rate (wdt->clk); + }else if (has_acpi_companion (&adev->dev)) { +/* +* When Driver probe with ACPI device, clock devices +* are not available, so watchdog rate get from +* clock-frequency property given in _DSD object. +*/ +device_property_read_u64 (&adev->dev,"clock-frequency" , + &wdt->rate); +if (!wdt->rate) { +dev_err (&adev->dev,"no clock-frequency property\n" ); +return -ENODEV ; + } } wdt->adev = adev;
Hi Guenter,
It was my mistake sorry for that. I thought to add as Rivewed-by your name.. Many changes are made based on your review comments and suggestions. So, Can I add your name in Reviewed list?
I will modify and send next patchset.
thank you.
Regards,
Srinath.
Quoted 115 lines · Guenter Roeck
Quoted 10 lines · Srinath Mannam
Use clock-frequency property given in
_DSDobject of ACPI device to calculate Watchdog rate as binding clock devices are not available as device tree.Note: There is no formal review process for
_DSDpropertiesSigned-off-by Srinath Mannam <[email protected]>Signed-off-by Guenter Roeck <[email protected]>I just noticed this. This is completely inappropriate. It is the equivalent of forging a signature on a check.
_Never_ add a Signed-off-by: statement for anyone but yourself.
Guenter
Quoted 94 lines
Reviewed-by Guenter Roeck <[email protected]>Reviewed-by Ray Jui <[email protected]>Reviewed-by Scott Branden <[email protected]>--- drivers/watchdog/sp805_wdt.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)drivers/watchdog/sp805_wdt.c +3
-0@@ -11,6 +11,7 @@* warranty of any kind, whether express or implied. */ +#include <linux/acpi.h>#include <linux/device.h> #include <linux/resource.h> #include <linux/amba/bus.h> @@ -22,6 +23,7 @@#include <linux/math64.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/of.h> #include <linux/pm.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -65,6 +67,7 @@ struct sp805_wdt {spinlock_t lock;void __iomem *base;struct clk *clk; +u64 rate;struct amba_device *adev;unsigned int load_val; };@@ -80,7 +83,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)struct sp805_wdt *wdt =watchdog_get_drvdata (wdd);u64 load, rate; - rate =clk_get_rate (wdt->clk); + rate = wdt->rate;/* * sp805 runs counter with given value twice, after the end of first
drivers/watchdog/sp805_wdt.c +21
-7@@ -106,9 +109,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)static unsigned int wdt_timeleft (struct watchdog_device *wdd) {struct sp805_wdt *wdt =watchdog_get_drvdata (wdd); -u64 load, rate; - - rate =clk_get_rate (wdt->clk); +u64 load;spin_lock (&wdt->lock); load =readl_relaxed (wdt->base +WDTVALUE );@@ -118,7 +119,7 @@ static unsigned int wdt_timeleft(struct watchdog_device *wdd) load += wdt->load_val + 1;spin_unlock (&wdt->lock); - return div_u64(load, rate); +return div_u64 (load, wdt->rate); } static int@@ -228,11 +229,25 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)if (IS_ERR (wdt->base))return PTR_ERR (wdt->base); - wdt->clk =devm_clk_get (&adev->dev,NULL ); -if (IS_ERR (wdt->clk)) { -dev_warn (&adev->dev,"Clock not found\n" ); - ret =PTR_ERR (wdt->clk); - goto err; +if (adev->dev.of_node) { + wdt->clk =devm_clk_get (&adev->dev,NULL ); +if (IS_ERR (wdt->clk)) { +dev_err (&adev->dev,"Clock not found\n" ); +return PTR_ERR (wdt->clk); + } + wdt->rate =clk_get_rate (wdt->clk); + }else if (has_acpi_companion (&adev->dev)) { +/* +* When Driver probe with ACPI device, clock devices +* are not available, so watchdog rate get from +* clock-frequency property given in _DSD object. +*/ +device_property_read_u64 (&adev->dev,"clock-frequency" , + &wdt->rate); +if (!wdt->rate) { +dev_err (&adev->dev,"no clock-frequency property\n"); +return -ENODEV ; + } } wdt->adev = adev;
Guenter Roeck
maintainerQuoted 5 lines · Srinath Mannam
Hi Guenter,
It was my mistake sorry for that. I thought to add as Rivewed-by your name.. Many changes are made based on your review comments and suggestions. So, Can I add your name in Reviewed list?
You did that already below, and I am ok with that.
Guenter
Quoted 124 lines
I will modify and send next patchset.
thank you.
Regards,
Srinath.Quoted 115 lines · Guenter Roeck
Quoted 10 lines · Srinath Mannam
Use clock-frequency property given in
_DSDobject of ACPI device to calculate Watchdog rate as binding clock devices are not available as device tree.Note: There is no formal review process for
_DSDpropertiesSigned-off-by Srinath Mannam <[email protected]>Signed-off-by Guenter Roeck <[email protected]>I just noticed this. This is completely inappropriate. It is the equivalent of forging a signature on a check.
_Never_ add a Signed-off-by: statement for anyone but yourself.
Guenter
Quoted 94 lines
Reviewed-by Guenter Roeck <[email protected]>Reviewed-by Ray Jui <[email protected]>Reviewed-by Scott Branden <[email protected]>--- drivers/watchdog/sp805_wdt.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)drivers/watchdog/sp805_wdt.c +3
-0@@ -11,6 +11,7 @@* warranty of any kind, whether express or implied. */ +#include <linux/acpi.h>#include <linux/device.h> #include <linux/resource.h> #include <linux/amba/bus.h> @@ -22,6 +23,7 @@#include <linux/math64.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/of.h> #include <linux/pm.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -65,6 +67,7 @@ struct sp805_wdt {spinlock_t lock;void __iomem *base;struct clk *clk; +u64 rate;struct amba_device *adev;unsigned int load_val; };@@ -80,7 +83,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)struct sp805_wdt *wdt =watchdog_get_drvdata (wdd);u64 load, rate; - rate =clk_get_rate (wdt->clk); + rate = wdt->rate;/* * sp805 runs counter with given value twice, after the end of first
drivers/watchdog/sp805_wdt.c +21
-7@@ -106,9 +109,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)static unsigned int wdt_timeleft (struct watchdog_device *wdd) {struct sp805_wdt *wdt =watchdog_get_drvdata (wdd); -u64 load, rate; - - rate =clk_get_rate (wdt->clk); +u64 load;spin_lock (&wdt->lock); load =readl_relaxed (wdt->base +WDTVALUE );@@ -118,7 +119,7 @@ static unsigned int wdt_timeleft(struct watchdog_device *wdd) load += wdt->load_val + 1;spin_unlock (&wdt->lock); - return div_u64(load, rate); +return div_u64 (load, wdt->rate); } static int@@ -228,11 +229,25 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)if (IS_ERR (wdt->base))return PTR_ERR (wdt->base); - wdt->clk =devm_clk_get (&adev->dev,NULL ); -if (IS_ERR (wdt->clk)) { -dev_warn (&adev->dev,"Clock not found\n" ); - ret =PTR_ERR (wdt->clk); - goto err; +if (adev->dev.of_node) { + wdt->clk =devm_clk_get (&adev->dev,NULL ); +if (IS_ERR (wdt->clk)) { +dev_err (&adev->dev,"Clock not found\n" ); +return PTR_ERR (wdt->clk); + } + wdt->rate =clk_get_rate (wdt->clk); + }else if (has_acpi_companion (&adev->dev)) { +/* +* When Driver probe with ACPI device, clock devices +* are not available, so watchdog rate get from +* clock-frequency property given in _DSD object. +*/ +device_property_read_u64 (&adev->dev,"clock-frequency" , + &wdt->rate); +if (!wdt->rate) { +dev_err (&adev->dev,"no clock-frequency property\n"); +return -ENODEV ; + } } wdt->adev = adev;
Hi Guenter,
Thank you.. I sent next version patch with modification.
Regards,
Srinath.
Quoted 143 lines · Guenter Roeck
Quoted 7 lines · Srinath Mannam
Hi Guenter,
It was my mistake sorry for that. I thought to add as Rivewed-by your name..
Many changes are made based on your review comments and suggestions. So, Can I add your name in Reviewed list?You did that already below, and I am ok with that.
Guenter
Quoted 128 lines
I will modify and send next patchset.
thank you.
Regards,
Srinath.Quoted 118 lines · Guenter Roeck
Quoted 11 lines · Srinath Mannam
Use clock-frequency property given in
_DSDobject of ACPI device to calculate Watchdog rate as binding clock devices are not available as device tree.Note: There is no formal review process for
_DSDpropertiesSigned-off-by Srinath Mannam <[email protected]>Signed-off-by Guenter Roeck <[email protected]>I just noticed this. This is completely inappropriate. It is the equivalent of forging a signature on a check.
_Never_ add a Signed-off-by: statement for anyone but yourself.
Guenter
Quoted 94 lines
Reviewed-by Guenter Roeck <[email protected]>Reviewed-by Ray Jui <[email protected]>Reviewed-by Scott Branden <[email protected]>--- drivers/watchdog/sp805_wdt.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)drivers/watchdog/sp805_wdt.c +3
-0@@ -11,6 +11,7 @@* warranty of any kind, whether express or implied. */ +#include <linux/acpi.h>#include <linux/device.h> #include <linux/resource.h> #include <linux/amba/bus.h> @@ -22,6 +23,7 @@#include <linux/math64.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/of.h> #include <linux/pm.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -65,6 +67,7 @@ struct sp805_wdt {spinlock_t lock;void __iomem *base;struct clk *clk; +u64 rate;struct amba_device *adev;unsigned int load_val; };@@ -80,7 +83,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)struct sp805_wdt *wdt =watchdog_get_drvdata (wdd);u64 load, rate; - rate =clk_get_rate (wdt->clk); + rate = wdt->rate;/* * sp805 runs counter with given value twice, after the end of first
drivers/watchdog/sp805_wdt.c +21
-7@@ -106,9 +109,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)static unsigned int wdt_timeleft (struct watchdog_device *wdd) {struct sp805_wdt *wdt =watchdog_get_drvdata (wdd); -u64 load, rate; - - rate =clk_get_rate (wdt->clk); +u64 load;spin_lock (&wdt->lock); load =readl_relaxed (wdt->base +WDTVALUE );@@ -118,7 +119,7 @@ static unsigned int wdt_timeleft(struct watchdog_device *wdd) load += wdt->load_val + 1;spin_unlock (&wdt->lock); - return div_u64(load, rate); +return div_u64 (load, wdt->rate); } static int@@ -228,11 +229,25 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)if (IS_ERR (wdt->base))return PTR_ERR (wdt->base); - wdt->clk =devm_clk_get (&adev->dev,NULL ); -if (IS_ERR (wdt->clk)) { -dev_warn (&adev->dev,"Clock not found\n" ); - ret =PTR_ERR (wdt->clk); - goto err; +if (adev->dev.of_node) { + wdt->clk =devm_clk_get (&adev->dev,NULL ); +if (IS_ERR (wdt->clk)) { +dev_err (&adev->dev,"Clock not found\n" ); +return PTR_ERR (wdt->clk); + } + wdt->rate =clk_get_rate (wdt->clk); + }else if (has_acpi_companion (&adev->dev)) { +/* +* When Driver probe with ACPI device, clock devices +* are not available, so watchdog rate get from +* clock-frequency property given in _DSD object. +*/ +device_property_read_u64 (&adev->dev,"clock-frequency" , + &wdt->rate); +if (!wdt->rate) { +dev_err (&adev->dev,"no clock-frequency property\n"); +return -ENODEV ; + } } wdt->adev = adev;