* [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling @ 2016-04-23 19:57 Stefan Wahren 2016-04-23 19:57 ` [PATCH V3 1/3] iio: mxs-lradc: simplify TS registration Stefan Wahren ` (3 more replies) 0 siblings, 4 replies; 12+ messages in thread From: Stefan Wahren @ 2016-04-23 19:57 UTC (permalink / raw) To: Jonathan Cameron, Dmitry Torokhov, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut Cc: Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Stefan Wahren This patch series simplifies TS handling of mxs-lradc. These patches has been tested with i.MX23 and i.MX28 but without a touchscreen. I added only a bogus touchscreen in devicetree. It would be nice if someone with a real touchscreen could test it. Changes in V3: - remove dev.parent assignment as suggested by Dimitry - add new patch to remove mxs_lradc_ts_unregister - remove PM implementation from series in order to wait until Ksenija has split the driver Changes in V2: - rebase on iio/testing since patch 2 and 3 from V1 has been applied - also remove input_unregister_device in patch 1 - use mask of virtual channels for IRQ disabling in patch 2 Stefan Wahren (3): iio: mxs-lradc: simplify TS registration iio: mxs-lradc: remove mxs_lradc_ts_unregister iio: mxs-lradc: disable only masked channels in mxs_lradc_hw_stop drivers/iio/adc/mxs-lradc.c | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) -- 1.7.9.5 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V3 1/3] iio: mxs-lradc: simplify TS registration 2016-04-23 19:57 [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Stefan Wahren @ 2016-04-23 19:57 ` Stefan Wahren [not found] ` <1461441479-23218-2-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org> 2016-04-23 19:57 ` [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister Stefan Wahren ` (2 subsequent siblings) 3 siblings, 1 reply; 12+ messages in thread From: Stefan Wahren @ 2016-04-23 19:57 UTC (permalink / raw) To: Jonathan Cameron, Dmitry Torokhov, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut Cc: Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio, linux-input, linux-arm-kernel, Stefan Wahren This patch simplifies the TS registration of mxs-lradc by using devm_input_allocate_device. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Reviewed-by: Marek Vasut <marex@denx.de> --- drivers/iio/adc/mxs-lradc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c index ad26da1..3d1d370 100644 --- a/drivers/iio/adc/mxs-lradc.c +++ b/drivers/iio/adc/mxs-lradc.c @@ -1120,18 +1120,16 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) { struct input_dev *input; struct device *dev = lradc->dev; - int ret; if (!lradc->use_touchscreen) return 0; - input = input_allocate_device(); + input = devm_input_allocate_device(dev); if (!input) return -ENOMEM; input->name = DRIVER_NAME; input->id.bustype = BUS_HOST; - input->dev.parent = dev; input->open = mxs_lradc_ts_open; input->close = mxs_lradc_ts_close; @@ -1146,11 +1144,8 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) lradc->ts_input = input; input_set_drvdata(input, lradc); - ret = input_register_device(input); - if (ret) - input_free_device(lradc->ts_input); - return ret; + return input_register_device(input); } static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) @@ -1159,7 +1154,6 @@ static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) return; mxs_lradc_disable_ts(lradc); - input_unregister_device(lradc->ts_input); } /* -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <1461441479-23218-2-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>]
* Re: [PATCH V3 1/3] iio: mxs-lradc: simplify TS registration [not found] ` <1461441479-23218-2-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org> @ 2016-04-25 21:00 ` Dmitry Torokhov 2016-05-04 9:38 ` Jonathan Cameron 0 siblings, 1 reply; 12+ messages in thread From: Dmitry Torokhov @ 2016-04-25 21:00 UTC (permalink / raw) To: Stefan Wahren Cc: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut, Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On Sat, Apr 23, 2016 at 07:57:57PM +0000, Stefan Wahren wrote: > This patch simplifies the TS registration of mxs-lradc by > using devm_input_allocate_device. > > Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org> > Reviewed-by: Marek Vasut <marex-ynQEQJNshbs@public.gmane.org> Acked-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- > drivers/iio/adc/mxs-lradc.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c > index ad26da1..3d1d370 100644 > --- a/drivers/iio/adc/mxs-lradc.c > +++ b/drivers/iio/adc/mxs-lradc.c > @@ -1120,18 +1120,16 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) > { > struct input_dev *input; > struct device *dev = lradc->dev; > - int ret; > > if (!lradc->use_touchscreen) > return 0; > > - input = input_allocate_device(); > + input = devm_input_allocate_device(dev); > if (!input) > return -ENOMEM; > > input->name = DRIVER_NAME; > input->id.bustype = BUS_HOST; > - input->dev.parent = dev; > input->open = mxs_lradc_ts_open; > input->close = mxs_lradc_ts_close; > > @@ -1146,11 +1144,8 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) > > lradc->ts_input = input; > input_set_drvdata(input, lradc); > - ret = input_register_device(input); > - if (ret) > - input_free_device(lradc->ts_input); > > - return ret; > + return input_register_device(input); > } > > static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) > @@ -1159,7 +1154,6 @@ static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) > return; > > mxs_lradc_disable_ts(lradc); > - input_unregister_device(lradc->ts_input); > } > > /* > -- > 1.7.9.5 > -- Dmitry ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V3 1/3] iio: mxs-lradc: simplify TS registration 2016-04-25 21:00 ` Dmitry Torokhov @ 2016-05-04 9:38 ` Jonathan Cameron 0 siblings, 0 replies; 12+ messages in thread From: Jonathan Cameron @ 2016-05-04 9:38 UTC (permalink / raw) To: Dmitry Torokhov, Stefan Wahren Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut, Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio, linux-input, linux-arm-kernel On 25/04/16 22:00, Dmitry Torokhov wrote: > On Sat, Apr 23, 2016 at 07:57:57PM +0000, Stefan Wahren wrote: >> This patch simplifies the TS registration of mxs-lradc by >> using devm_input_allocate_device. >> >> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> >> Reviewed-by: Marek Vasut <marex@denx.de> > > Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Applied to the togreg branch of iio.git - initially going to be pushed out as testing though may not be until the weekend. Jonathan > >> --- >> drivers/iio/adc/mxs-lradc.c | 10 ++-------- >> 1 file changed, 2 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c >> index ad26da1..3d1d370 100644 >> --- a/drivers/iio/adc/mxs-lradc.c >> +++ b/drivers/iio/adc/mxs-lradc.c >> @@ -1120,18 +1120,16 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) >> { >> struct input_dev *input; >> struct device *dev = lradc->dev; >> - int ret; >> >> if (!lradc->use_touchscreen) >> return 0; >> >> - input = input_allocate_device(); >> + input = devm_input_allocate_device(dev); >> if (!input) >> return -ENOMEM; >> >> input->name = DRIVER_NAME; >> input->id.bustype = BUS_HOST; >> - input->dev.parent = dev; >> input->open = mxs_lradc_ts_open; >> input->close = mxs_lradc_ts_close; >> >> @@ -1146,11 +1144,8 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) >> >> lradc->ts_input = input; >> input_set_drvdata(input, lradc); >> - ret = input_register_device(input); >> - if (ret) >> - input_free_device(lradc->ts_input); >> >> - return ret; >> + return input_register_device(input); >> } >> >> static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) >> @@ -1159,7 +1154,6 @@ static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) >> return; >> >> mxs_lradc_disable_ts(lradc); >> - input_unregister_device(lradc->ts_input); >> } >> >> /* >> -- >> 1.7.9.5 >> > ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister 2016-04-23 19:57 [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Stefan Wahren 2016-04-23 19:57 ` [PATCH V3 1/3] iio: mxs-lradc: simplify TS registration Stefan Wahren @ 2016-04-23 19:57 ` Stefan Wahren [not found] ` <1461441479-23218-3-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org> 2016-04-23 19:57 ` [PATCH V3 3/3] iio: mxs-lradc: disable only masked channels in mxs_lradc_hw_stop Stefan Wahren 2016-05-01 20:08 ` [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Jonathan Cameron 3 siblings, 1 reply; 12+ messages in thread From: Stefan Wahren @ 2016-04-23 19:57 UTC (permalink / raw) To: Jonathan Cameron, Dmitry Torokhov, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut Cc: Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio, linux-input, linux-arm-kernel, Stefan Wahren After using devm_input_allocate_device for registration the function mxs_lradc_ts_unregister isn't necessary anymore since mxs_lradc_ts_close already does the job. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/iio/adc/mxs-lradc.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c index 3d1d370..90242ba 100644 --- a/drivers/iio/adc/mxs-lradc.c +++ b/drivers/iio/adc/mxs-lradc.c @@ -1148,14 +1148,6 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) return input_register_device(input); } -static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) -{ - if (!lradc->use_touchscreen) - return; - - mxs_lradc_disable_ts(lradc); -} - /* * IRQ Handling */ @@ -1715,13 +1707,11 @@ static int mxs_lradc_probe(struct platform_device *pdev) ret = iio_device_register(iio); if (ret) { dev_err(dev, "Failed to register IIO device\n"); - goto err_ts; + return ret; } return 0; -err_ts: - mxs_lradc_ts_unregister(lradc); err_ts_register: mxs_lradc_hw_stop(lradc); err_dev: @@ -1739,7 +1729,6 @@ static int mxs_lradc_remove(struct platform_device *pdev) struct mxs_lradc *lradc = iio_priv(iio); iio_device_unregister(iio); - mxs_lradc_ts_unregister(lradc); mxs_lradc_hw_stop(lradc); mxs_lradc_trigger_remove(iio); iio_triggered_buffer_cleanup(iio); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <1461441479-23218-3-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>]
* Re: [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister [not found] ` <1461441479-23218-3-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org> @ 2016-04-25 21:00 ` Dmitry Torokhov 2016-05-04 9:39 ` Jonathan Cameron 0 siblings, 1 reply; 12+ messages in thread From: Dmitry Torokhov @ 2016-04-25 21:00 UTC (permalink / raw) To: Stefan Wahren Cc: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut, Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On Sat, Apr 23, 2016 at 07:57:58PM +0000, Stefan Wahren wrote: > After using devm_input_allocate_device for registration > the function mxs_lradc_ts_unregister isn't necessary anymore > since mxs_lradc_ts_close already does the job. > > Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org> > Suggested-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Acked-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- > drivers/iio/adc/mxs-lradc.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c > index 3d1d370..90242ba 100644 > --- a/drivers/iio/adc/mxs-lradc.c > +++ b/drivers/iio/adc/mxs-lradc.c > @@ -1148,14 +1148,6 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) > return input_register_device(input); > } > > -static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) > -{ > - if (!lradc->use_touchscreen) > - return; > - > - mxs_lradc_disable_ts(lradc); > -} > - > /* > * IRQ Handling > */ > @@ -1715,13 +1707,11 @@ static int mxs_lradc_probe(struct platform_device *pdev) > ret = iio_device_register(iio); > if (ret) { > dev_err(dev, "Failed to register IIO device\n"); > - goto err_ts; > + return ret; > } > > return 0; > > -err_ts: > - mxs_lradc_ts_unregister(lradc); > err_ts_register: > mxs_lradc_hw_stop(lradc); > err_dev: > @@ -1739,7 +1729,6 @@ static int mxs_lradc_remove(struct platform_device *pdev) > struct mxs_lradc *lradc = iio_priv(iio); > > iio_device_unregister(iio); > - mxs_lradc_ts_unregister(lradc); > mxs_lradc_hw_stop(lradc); > mxs_lradc_trigger_remove(iio); > iio_triggered_buffer_cleanup(iio); > -- > 1.7.9.5 > -- Dmitry ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister 2016-04-25 21:00 ` Dmitry Torokhov @ 2016-05-04 9:39 ` Jonathan Cameron 0 siblings, 0 replies; 12+ messages in thread From: Jonathan Cameron @ 2016-05-04 9:39 UTC (permalink / raw) To: Dmitry Torokhov, Stefan Wahren Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut, Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio, linux-input, linux-arm-kernel On 25/04/16 22:00, Dmitry Torokhov wrote: > On Sat, Apr 23, 2016 at 07:57:58PM +0000, Stefan Wahren wrote: >> After using devm_input_allocate_device for registration >> the function mxs_lradc_ts_unregister isn't necessary anymore >> since mxs_lradc_ts_close already does the job. >> >> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> >> Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Applied. > >> --- >> drivers/iio/adc/mxs-lradc.c | 13 +------------ >> 1 file changed, 1 insertion(+), 12 deletions(-) >> >> diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c >> index 3d1d370..90242ba 100644 >> --- a/drivers/iio/adc/mxs-lradc.c >> +++ b/drivers/iio/adc/mxs-lradc.c >> @@ -1148,14 +1148,6 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) >> return input_register_device(input); >> } >> >> -static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) >> -{ >> - if (!lradc->use_touchscreen) >> - return; >> - >> - mxs_lradc_disable_ts(lradc); >> -} >> - >> /* >> * IRQ Handling >> */ >> @@ -1715,13 +1707,11 @@ static int mxs_lradc_probe(struct platform_device *pdev) >> ret = iio_device_register(iio); >> if (ret) { >> dev_err(dev, "Failed to register IIO device\n"); >> - goto err_ts; >> + return ret; >> } >> >> return 0; >> >> -err_ts: >> - mxs_lradc_ts_unregister(lradc); >> err_ts_register: >> mxs_lradc_hw_stop(lradc); >> err_dev: >> @@ -1739,7 +1729,6 @@ static int mxs_lradc_remove(struct platform_device *pdev) >> struct mxs_lradc *lradc = iio_priv(iio); >> >> iio_device_unregister(iio); >> - mxs_lradc_ts_unregister(lradc); >> mxs_lradc_hw_stop(lradc); >> mxs_lradc_trigger_remove(iio); >> iio_triggered_buffer_cleanup(iio); >> -- >> 1.7.9.5 >> > ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V3 3/3] iio: mxs-lradc: disable only masked channels in mxs_lradc_hw_stop 2016-04-23 19:57 [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Stefan Wahren 2016-04-23 19:57 ` [PATCH V3 1/3] iio: mxs-lradc: simplify TS registration Stefan Wahren 2016-04-23 19:57 ` [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister Stefan Wahren @ 2016-04-23 19:57 ` Stefan Wahren [not found] ` <1461441479-23218-4-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org> 2016-05-01 20:08 ` [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Jonathan Cameron 3 siblings, 1 reply; 12+ messages in thread From: Stefan Wahren @ 2016-04-23 19:57 UTC (permalink / raw) To: Jonathan Cameron, Dmitry Torokhov, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut Cc: Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio, linux-input, linux-arm-kernel, Stefan Wahren Disabling of the touchscreen IRQs should be done in mxs_lradc_disable_ts. So disable only the masked virtual channels in mxs_lradc_hw_stop and finally remove the unused function mxs_lradc_irq_en_mask. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Reviewed-by: Marek Vasut <marex@denx.de> Tested-by: Marek Vasut <marex@denx.de> --- drivers/iio/adc/mxs-lradc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c index 90242ba..b84d37c 100644 --- a/drivers/iio/adc/mxs-lradc.c +++ b/drivers/iio/adc/mxs-lradc.c @@ -373,13 +373,6 @@ static u32 mxs_lradc_plate_mask(struct mxs_lradc *lradc) return LRADC_CTRL0_MX28_PLATE_MASK; } -static u32 mxs_lradc_irq_en_mask(struct mxs_lradc *lradc) -{ - if (lradc->soc == IMX23_LRADC) - return LRADC_CTRL1_MX23_LRADC_IRQ_EN_MASK; - return LRADC_CTRL1_MX28_LRADC_IRQ_EN_MASK; -} - static u32 mxs_lradc_irq_mask(struct mxs_lradc *lradc) { if (lradc->soc == IMX23_LRADC) @@ -1496,7 +1489,9 @@ static void mxs_lradc_hw_stop(struct mxs_lradc *lradc) { int i; - mxs_lradc_reg_clear(lradc, mxs_lradc_irq_en_mask(lradc), LRADC_CTRL1); + mxs_lradc_reg_clear(lradc, + lradc->buffer_vchans << LRADC_CTRL1_LRADC_IRQ_EN_OFFSET, + LRADC_CTRL1); for (i = 0; i < LRADC_MAX_DELAY_CHANS; i++) mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(i)); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <1461441479-23218-4-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>]
* Re: [PATCH V3 3/3] iio: mxs-lradc: disable only masked channels in mxs_lradc_hw_stop [not found] ` <1461441479-23218-4-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org> @ 2016-05-04 9:39 ` Jonathan Cameron 0 siblings, 0 replies; 12+ messages in thread From: Jonathan Cameron @ 2016-05-04 9:39 UTC (permalink / raw) To: Stefan Wahren, Dmitry Torokhov, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut Cc: Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On 23/04/16 20:57, Stefan Wahren wrote: > Disabling of the touchscreen IRQs should be done in > mxs_lradc_disable_ts. So disable only the masked virtual channels > in mxs_lradc_hw_stop and finally remove the unused function > mxs_lradc_irq_en_mask. > > Signed-off-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org> > Reviewed-by: Marek Vasut <marex-ynQEQJNshbs@public.gmane.org> > Tested-by: Marek Vasut <marex-ynQEQJNshbs@public.gmane.org> Applied to the togreg branch of iio.git Thanks, Jonathan > --- > drivers/iio/adc/mxs-lradc.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c > index 90242ba..b84d37c 100644 > --- a/drivers/iio/adc/mxs-lradc.c > +++ b/drivers/iio/adc/mxs-lradc.c > @@ -373,13 +373,6 @@ static u32 mxs_lradc_plate_mask(struct mxs_lradc *lradc) > return LRADC_CTRL0_MX28_PLATE_MASK; > } > > -static u32 mxs_lradc_irq_en_mask(struct mxs_lradc *lradc) > -{ > - if (lradc->soc == IMX23_LRADC) > - return LRADC_CTRL1_MX23_LRADC_IRQ_EN_MASK; > - return LRADC_CTRL1_MX28_LRADC_IRQ_EN_MASK; > -} > - > static u32 mxs_lradc_irq_mask(struct mxs_lradc *lradc) > { > if (lradc->soc == IMX23_LRADC) > @@ -1496,7 +1489,9 @@ static void mxs_lradc_hw_stop(struct mxs_lradc *lradc) > { > int i; > > - mxs_lradc_reg_clear(lradc, mxs_lradc_irq_en_mask(lradc), LRADC_CTRL1); > + mxs_lradc_reg_clear(lradc, > + lradc->buffer_vchans << LRADC_CTRL1_LRADC_IRQ_EN_OFFSET, > + LRADC_CTRL1); > > for (i = 0; i < LRADC_MAX_DELAY_CHANS; i++) > mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(i)); > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling 2016-04-23 19:57 [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Stefan Wahren ` (2 preceding siblings ...) 2016-04-23 19:57 ` [PATCH V3 3/3] iio: mxs-lradc: disable only masked channels in mxs_lradc_hw_stop Stefan Wahren @ 2016-05-01 20:08 ` Jonathan Cameron [not found] ` <500c5874-4ef8-b37b-e12f-80fd5205c172-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> 3 siblings, 1 reply; 12+ messages in thread From: Jonathan Cameron @ 2016-05-01 20:08 UTC (permalink / raw) To: Stefan Wahren, Dmitry Torokhov, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut Cc: Ksenija Stanojevic, Fabio Estevam, Juergen Borleis, linux-iio, linux-input, linux-arm-kernel Ksenija, How would you prefer we handle this interaction of this set and your series. Options are: 1. I apply these now and you rebase on top of the result. 2. You pull these into your series, probably after the driver split making sure these improvements end up in the new drivers. 3. We ask Stephan to re roll them at a later date (least preferred option as that adds another person we need to chase down to get to the end of this process!) No immediate rush on any of the above as we've probably missed this cycle now anyway. I've been cut off today so not sure what Linus has said today. Jonathan On 23/04/16 20:57, Stefan Wahren wrote: > This patch series simplifies TS handling of mxs-lradc. > > These patches has been tested with i.MX23 and i.MX28 but without > a touchscreen. I added only a bogus touchscreen in devicetree. > > It would be nice if someone with a real touchscreen could test it. > > Changes in V3: > - remove dev.parent assignment as suggested by Dimitry > - add new patch to remove mxs_lradc_ts_unregister > - remove PM implementation from series in order to wait until > Ksenija has split the driver > > Changes in V2: > - rebase on iio/testing since patch 2 and 3 from V1 has been applied > - also remove input_unregister_device in patch 1 > - use mask of virtual channels for IRQ disabling in patch 2 > > Stefan Wahren (3): > iio: mxs-lradc: simplify TS registration > iio: mxs-lradc: remove mxs_lradc_ts_unregister > iio: mxs-lradc: disable only masked channels in > mxs_lradc_hw_stop > > drivers/iio/adc/mxs-lradc.c | 34 ++++++---------------------------- > 1 file changed, 6 insertions(+), 28 deletions(-) > ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <500c5874-4ef8-b37b-e12f-80fd5205c172-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>]
* Re: [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling [not found] ` <500c5874-4ef8-b37b-e12f-80fd5205c172-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> @ 2016-05-02 6:06 ` Ksenija Stanojević [not found] ` <CAL7P5jJF9EL4Zk-AC9csyadfrmUp4R+6ceVAN_kNm7dKgo+ZgQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 12+ messages in thread From: Ksenija Stanojević @ 2016-05-02 6:06 UTC (permalink / raw) To: Jonathan Cameron Cc: Stefan Wahren, Dmitry Torokhov, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut, Fabio Estevam, Juergen Borleis, linux-iio-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r Hi Jonathan, On Sun, May 1, 2016 at 10:08 PM, Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote: > Ksenija, > > How would you prefer we handle this interaction of this set and your series. > Options are: > > 1. I apply these now and you rebase on top of the result. > 2. You pull these into your series, probably after the driver split making sure these > improvements end up in the new drivers. > 3. We ask Stephan to re roll them at a later date (least preferred option as that adds > another person we need to chase down to get to the end of this process!) > > No immediate rush on any of the above as we've probably missed this cycle now anyway. > I've been cut off today so not sure what Linus has said today. My understanding was that you will take this patch series so I already included changes made by this patch set in touchscreen part, I will check if I missed something. I think the best is to apply these now. Thanks, Ksenija > Jonathan > On 23/04/16 20:57, Stefan Wahren wrote: >> This patch series simplifies TS handling of mxs-lradc. >> >> These patches has been tested with i.MX23 and i.MX28 but without >> a touchscreen. I added only a bogus touchscreen in devicetree. >> >> It would be nice if someone with a real touchscreen could test it. >> >> Changes in V3: >> - remove dev.parent assignment as suggested by Dimitry >> - add new patch to remove mxs_lradc_ts_unregister >> - remove PM implementation from series in order to wait until >> Ksenija has split the driver >> >> Changes in V2: >> - rebase on iio/testing since patch 2 and 3 from V1 has been applied >> - also remove input_unregister_device in patch 1 >> - use mask of virtual channels for IRQ disabling in patch 2 >> >> Stefan Wahren (3): >> iio: mxs-lradc: simplify TS registration >> iio: mxs-lradc: remove mxs_lradc_ts_unregister >> iio: mxs-lradc: disable only masked channels in >> mxs_lradc_hw_stop >> >> drivers/iio/adc/mxs-lradc.c | 34 ++++++---------------------------- >> 1 file changed, 6 insertions(+), 28 deletions(-) >> > ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <CAL7P5jJF9EL4Zk-AC9csyadfrmUp4R+6ceVAN_kNm7dKgo+ZgQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling [not found] ` <CAL7P5jJF9EL4Zk-AC9csyadfrmUp4R+6ceVAN_kNm7dKgo+ZgQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2016-05-04 9:40 ` Jonathan Cameron 0 siblings, 0 replies; 12+ messages in thread From: Jonathan Cameron @ 2016-05-04 9:40 UTC (permalink / raw) To: Ksenija Stanojević Cc: Stefan Wahren, Dmitry Torokhov, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Marek Vasut, Fabio Estevam, Juergen Borleis, linux-iio-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On 02/05/16 07:06, Ksenija Stanojević wrote: > Hi Jonathan, > > On Sun, May 1, 2016 at 10:08 PM, Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote: >> Ksenija, >> >> How would you prefer we handle this interaction of this set and your series. >> Options are: >> >> 1. I apply these now and you rebase on top of the result. >> 2. You pull these into your series, probably after the driver split making sure these >> improvements end up in the new drivers. >> 3. We ask Stephan to re roll them at a later date (least preferred option as that adds >> another person we need to chase down to get to the end of this process!) >> >> No immediate rush on any of the above as we've probably missed this cycle now anyway. >> I've been cut off today so not sure what Linus has said today. > > My understanding was that you will take this patch series so I already included > changes made by this patch set in touchscreen part, I will check if I missed > something. > I think the best is to apply these now. Cool - that's even easier ;) Jonathan > > Thanks, > Ksenija > >> Jonathan >> On 23/04/16 20:57, Stefan Wahren wrote: >>> This patch series simplifies TS handling of mxs-lradc. >>> >>> These patches has been tested with i.MX23 and i.MX28 but without >>> a touchscreen. I added only a bogus touchscreen in devicetree. >>> >>> It would be nice if someone with a real touchscreen could test it. >>> >>> Changes in V3: >>> - remove dev.parent assignment as suggested by Dimitry >>> - add new patch to remove mxs_lradc_ts_unregister >>> - remove PM implementation from series in order to wait until >>> Ksenija has split the driver >>> >>> Changes in V2: >>> - rebase on iio/testing since patch 2 and 3 from V1 has been applied >>> - also remove input_unregister_device in patch 1 >>> - use mask of virtual channels for IRQ disabling in patch 2 >>> >>> Stefan Wahren (3): >>> iio: mxs-lradc: simplify TS registration >>> iio: mxs-lradc: remove mxs_lradc_ts_unregister >>> iio: mxs-lradc: disable only masked channels in >>> mxs_lradc_hw_stop >>> >>> drivers/iio/adc/mxs-lradc.c | 34 ++++++---------------------------- >>> 1 file changed, 6 insertions(+), 28 deletions(-) >>> >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-05-04 14:38 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-04-23 19:57 [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Stefan Wahren 2016-04-23 19:57 ` [PATCH V3 1/3] iio: mxs-lradc: simplify TS registration Stefan Wahren [not found] ` <1461441479-23218-2-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org> 2016-04-25 21:00 ` Dmitry Torokhov 2016-05-04 9:38 ` Jonathan Cameron 2016-04-23 19:57 ` [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister Stefan Wahren [not found] ` <1461441479-23218-3-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org> 2016-04-25 21:00 ` Dmitry Torokhov 2016-05-04 9:39 ` Jonathan Cameron 2016-04-23 19:57 ` [PATCH V3 3/3] iio: mxs-lradc: disable only masked channels in mxs_lradc_hw_stop Stefan Wahren [not found] ` <1461441479-23218-4-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org> 2016-05-04 9:39 ` Jonathan Cameron 2016-05-01 20:08 ` [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Jonathan Cameron [not found] ` <500c5874-4ef8-b37b-e12f-80fd5205c172-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> 2016-05-02 6:06 ` Ksenija Stanojević [not found] ` <CAL7P5jJF9EL4Zk-AC9csyadfrmUp4R+6ceVAN_kNm7dKgo+ZgQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2016-05-04 9:40 ` Jonathan Cameron
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).