* [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure
@ 2013-11-29 11:39 Alexander Shiyan
2013-11-29 11:39 ` [PATCH 2/3] w1: mxc_w1: Add warning for base frequency calculation Alexander Shiyan
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Alexander Shiyan @ 2013-11-29 11:39 UTC (permalink / raw)
To: linux-kernel
Cc: Evgeniy Polyakov, Greg Kroah-Hartman, Shawn Guo, Sascha Hauer,
Alexander Shiyan
Private field "clkdiv" is not used outside "probe", so there are
no reason to keep it in driver.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/w1/masters/mxc_w1.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 15c7251..5de3ca9 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -46,7 +46,6 @@
struct mxc_w1_device {
void __iomem *regs;
- unsigned int clkdiv;
struct clk *clk;
struct w1_bus_master bus_master;
};
@@ -107,6 +106,7 @@ static int mxc_w1_probe(struct platform_device *pdev)
{
struct mxc_w1_device *mdev;
struct resource *res;
+ unsigned int clkdiv;
int err = 0;
mdev = devm_kzalloc(&pdev->dev, sizeof(struct mxc_w1_device),
@@ -118,7 +118,7 @@ static int mxc_w1_probe(struct platform_device *pdev)
if (IS_ERR(mdev->clk))
return PTR_ERR(mdev->clk);
- mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
+ clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mdev->regs = devm_ioremap_resource(&pdev->dev, res);
@@ -126,7 +126,7 @@ static int mxc_w1_probe(struct platform_device *pdev)
return PTR_ERR(mdev->regs);
clk_prepare_enable(mdev->clk);
- __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);
+ __raw_writeb(clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);
mdev->bus_master.data = mdev;
mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] w1: mxc_w1: Add warning for base frequency calculation
2013-11-29 11:39 [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure Alexander Shiyan
@ 2013-11-29 11:39 ` Alexander Shiyan
2013-11-29 11:39 ` [PATCH 3/3] w1: mxc_w1: Check the clk_prepare_enable() return value Alexander Shiyan
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Alexander Shiyan @ 2013-11-29 11:39 UTC (permalink / raw)
To: linux-kernel
Cc: Evgeniy Polyakov, Greg Kroah-Hartman, Shawn Guo, Sascha Hauer,
Alexander Shiyan
Base frequency should be as close as possible to 1 MHz. This patch
adds warnings when clock is unreliable, according to i.MX datasheet.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/w1/masters/mxc_w1.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 5de3ca9..953168c 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -105,6 +105,7 @@ static u8 mxc_w1_ds2_touch_bit(void *data, u8 bit)
static int mxc_w1_probe(struct platform_device *pdev)
{
struct mxc_w1_device *mdev;
+ unsigned long clkrate;
struct resource *res;
unsigned int clkdiv;
int err = 0;
@@ -118,7 +119,16 @@ static int mxc_w1_probe(struct platform_device *pdev)
if (IS_ERR(mdev->clk))
return PTR_ERR(mdev->clk);
- clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
+ clkrate = clk_get_rate(mdev->clk);
+ if (clkrate < 10000000)
+ dev_warn(&pdev->dev,
+ "Low clock frequency causes improper function\n");
+
+ clkdiv = DIV_ROUND_CLOSEST(clkrate, 1000000);
+ clkrate /= clkdiv;
+ if ((clkrate < 980000) || (clkrate > 1020000))
+ dev_warn(&pdev->dev,
+ "Incorrect time base frequency %lu Hz\n", clkrate);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mdev->regs = devm_ioremap_resource(&pdev->dev, res);
@@ -126,7 +136,7 @@ static int mxc_w1_probe(struct platform_device *pdev)
return PTR_ERR(mdev->regs);
clk_prepare_enable(mdev->clk);
- __raw_writeb(clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);
+ __raw_writeb(clkdiv - 1, mdev->regs + MXC_W1_TIME_DIVIDER);
mdev->bus_master.data = mdev;
mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] w1: mxc_w1: Check the clk_prepare_enable() return value
2013-11-29 11:39 [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure Alexander Shiyan
2013-11-29 11:39 ` [PATCH 2/3] w1: mxc_w1: Add warning for base frequency calculation Alexander Shiyan
@ 2013-11-29 11:39 ` Alexander Shiyan
2013-11-29 11:46 ` [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure Marc Kleine-Budde
2013-11-30 22:51 ` Evgeniy Polyakov
3 siblings, 0 replies; 7+ messages in thread
From: Alexander Shiyan @ 2013-11-29 11:39 UTC (permalink / raw)
To: linux-kernel
Cc: Evgeniy Polyakov, Greg Kroah-Hartman, Shawn Guo, Sascha Hauer,
Alexander Shiyan
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/w1/masters/mxc_w1.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 953168c..1e5d94c 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -108,7 +108,7 @@ static int mxc_w1_probe(struct platform_device *pdev)
unsigned long clkrate;
struct resource *res;
unsigned int clkdiv;
- int err = 0;
+ int err;
mdev = devm_kzalloc(&pdev->dev, sizeof(struct mxc_w1_device),
GFP_KERNEL);
@@ -135,20 +135,23 @@ static int mxc_w1_probe(struct platform_device *pdev)
if (IS_ERR(mdev->regs))
return PTR_ERR(mdev->regs);
- clk_prepare_enable(mdev->clk);
+ err = clk_prepare_enable(mdev->clk);
+ if (err)
+ return err;
+
__raw_writeb(clkdiv - 1, mdev->regs + MXC_W1_TIME_DIVIDER);
mdev->bus_master.data = mdev;
mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus;
mdev->bus_master.touch_bit = mxc_w1_ds2_touch_bit;
- err = w1_add_master_device(&mdev->bus_master);
+ platform_set_drvdata(pdev, mdev);
+ err = w1_add_master_device(&mdev->bus_master);
if (err)
- return err;
+ clk_disable_unprepare(mdev->clk);
- platform_set_drvdata(pdev, mdev);
- return 0;
+ return err;
}
/*
--
1.8.3.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure
2013-11-29 11:39 [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure Alexander Shiyan
2013-11-29 11:39 ` [PATCH 2/3] w1: mxc_w1: Add warning for base frequency calculation Alexander Shiyan
2013-11-29 11:39 ` [PATCH 3/3] w1: mxc_w1: Check the clk_prepare_enable() return value Alexander Shiyan
@ 2013-11-29 11:46 ` Marc Kleine-Budde
2013-11-29 11:56 ` Alexander Shiyan
2013-11-30 22:51 ` Evgeniy Polyakov
3 siblings, 1 reply; 7+ messages in thread
From: Marc Kleine-Budde @ 2013-11-29 11:46 UTC (permalink / raw)
To: Alexander Shiyan
Cc: linux-kernel, Evgeniy Polyakov, Greg Kroah-Hartman, Shawn Guo,
Sascha Hauer
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
On 11/29/2013 12:39 PM, Alexander Shiyan wrote:
> Private field "clkdiv" is not used outside "probe", so there are
> no reason to keep it in driver.
Where's the corresponding clk_disable_unprepare()?
regards,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure
2013-11-29 11:46 ` [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure Marc Kleine-Budde
@ 2013-11-29 11:56 ` Alexander Shiyan
2013-11-29 12:02 ` Marc Kleine-Budde
0 siblings, 1 reply; 7+ messages in thread
From: Alexander Shiyan @ 2013-11-29 11:56 UTC (permalink / raw)
To: Marc Kleine-Budde
Cc: linux-kernel, Evgeniy Polyakov, Greg Kroah-Hartman, Shawn Guo,
Sascha Hauer
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf-8, Size: 444 bytes --]
> On 11/29/2013 12:39 PM, Alexander Shiyan wrote:
> > Private field "clkdiv" is not used outside "probe", so there are
> > no reason to keep it in driver.
>
> Where's the corresponding clk_disable_unprepare()?
I do not see any relation "clk_disable_unprepare" with this patch.
---
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure
2013-11-29 11:56 ` Alexander Shiyan
@ 2013-11-29 12:02 ` Marc Kleine-Budde
0 siblings, 0 replies; 7+ messages in thread
From: Marc Kleine-Budde @ 2013-11-29 12:02 UTC (permalink / raw)
To: Alexander Shiyan
Cc: linux-kernel, Evgeniy Polyakov, Greg Kroah-Hartman, Shawn Guo,
Sascha Hauer
[-- Attachment #1: Type: text/plain, Size: 659 bytes --]
On 11/29/2013 12:56 PM, Alexander Shiyan wrote:
>> On 11/29/2013 12:39 PM, Alexander Shiyan wrote:
>>> Private field "clkdiv" is not used outside "probe", so there are
>>> no reason to keep it in driver.
>>
>> Where's the corresponding clk_disable_unprepare()?
>
> I do not see any relation "clk_disable_unprepare" with this patch.
Yes right, sorry for the noise.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure
2013-11-29 11:39 [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure Alexander Shiyan
` (2 preceding siblings ...)
2013-11-29 11:46 ` [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure Marc Kleine-Budde
@ 2013-11-30 22:51 ` Evgeniy Polyakov
3 siblings, 0 replies; 7+ messages in thread
From: Evgeniy Polyakov @ 2013-11-30 22:51 UTC (permalink / raw)
To: Alexander Shiyan, linux-kernel
Cc: Greg Kroah-Hartman, Shawn Guo, Sascha Hauer
Hi
29.11.2013, 15:40, "Alexander Shiyan" <shc_work@mail.ru>:
> Private field "clkdiv" is not used outside "probe", so there are
> no reason to keep it in driver.
The whole serie looks good, thank you
Greg, please pull it into your tree
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-11-30 22:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-29 11:39 [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure Alexander Shiyan
2013-11-29 11:39 ` [PATCH 2/3] w1: mxc_w1: Add warning for base frequency calculation Alexander Shiyan
2013-11-29 11:39 ` [PATCH 3/3] w1: mxc_w1: Check the clk_prepare_enable() return value Alexander Shiyan
2013-11-29 11:46 ` [PATCH 1/3] w1: mxc_w1: Remove unused field "clkdiv" from private structure Marc Kleine-Budde
2013-11-29 11:56 ` Alexander Shiyan
2013-11-29 12:02 ` Marc Kleine-Budde
2013-11-30 22:51 ` Evgeniy Polyakov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).