diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2014-05-08 09:56:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-20 02:43:34 +0200 |
| commit | b7ce0b5d03f303cba0fff3f9df17f400d4e7a2d8 (patch) | |
| tree | eb888153def72a66ffcb36d667bc11c8a99b300f | |
| parent | w1: mxc_w1: Optimize mxc_w1_ds2_reset_bus() (diff) | |
| download | linux-b7ce0b5d03f303cba0fff3f9df17f400d4e7a2d8.tar.xz linux-b7ce0b5d03f303cba0fff3f9df17f400d4e7a2d8.zip | |
w1: mxc_w1: Perform a software reset at startup
This patch adds a software reset for 1-Wire module at driver startup.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 0d05abe34362..741d2bb400ae 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -32,6 +32,7 @@ # define MXC_W1_CONTROL_RPP BIT(7) #define MXC_W1_TIME_DIVIDER 0x02 #define MXC_W1_RESET 0x04 +# define MXC_W1_RESET_RST BIT(0) struct mxc_w1_device { void __iomem *regs; @@ -129,6 +130,10 @@ static int mxc_w1_probe(struct platform_device *pdev) if (err) return err; + /* Software reset 1-Wire module */ + writeb(MXC_W1_RESET_RST, mdev->regs + MXC_W1_RESET); + writeb(0, mdev->regs + MXC_W1_RESET); + writeb(clkdiv - 1, mdev->regs + MXC_W1_TIME_DIVIDER); mdev->bus_master.data = mdev; |