From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> To: Grygorii Strashko <grygorii.strashko@ti.com> Cc: Wolfram Sang <wsa@the-dreams.de>, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@deeprootsystems.com>, Santosh Shilimkar <ssantosh@kernel.org>, Murali Karicheri <m-karicheri2@ti.com>, Ben Gardiner <bengardiner@nanometrics.ca>, Mike Looijmans <milo-software@users.sourceforge.net> Subject: Re: [5/5] i2c: davinci: use ICPFUNC to toggle I2C as gpio for bus recovery Date: Sun, 23 Nov 2014 18:04:00 +0100 [thread overview] Message-ID: <20141123170400.GC4431@pengutronix.de> (raw) In-Reply-To: <1416477788-5544-6-git-send-email-grygorii.strashko@ti.com> Hello, On Thu, Nov 20, 2014 at 12:03:08PM +0200, Grygorii Strashko wrote: > @@ -664,6 +759,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) > if (!of_property_read_u32(pdev->dev.of_node, "clock-frequency", > &prop)) > dev->pdata->bus_freq = prop / 1000; > + dev->pdata->has_pfunc = true; I don't understand this. Why does this ICPFUNC recovery work if the bus is probed by oftree, but doesn't if not? > } else if (!dev->pdata) { > dev->pdata = &davinci_i2c_platform_data_default; > } > @@ -705,7 +801,9 @@ static int davinci_i2c_probe(struct platform_device *pdev) > adap->timeout = DAVINCI_I2C_TIMEOUT; > adap->dev.of_node = pdev->dev.of_node; > > - if (dev->pdata->scl_pin) { > + if (dev->pdata->has_pfunc) > + adap->bus_recovery_info = &davinci_i2c_scl_recovery_info; > + else if (dev->pdata->scl_pin) { > adap->bus_recovery_info = &davinci_i2c_gpio_recovery_info; > adap->bus_recovery_info->scl_gpio = dev->pdata->scl_pin; > adap->bus_recovery_info->sda_gpio = dev->pdata->sda_pin; > diff --git a/include/linux/platform_data/i2c-davinci.h b/include/linux/platform_data/i2c-davinci.h > index 2312d19..89fd347 100644 > --- a/include/linux/platform_data/i2c-davinci.h > +++ b/include/linux/platform_data/i2c-davinci.h > @@ -18,6 +18,7 @@ struct davinci_i2c_platform_data { > unsigned int bus_delay; /* post-transaction delay (usec) */ > unsigned int sda_pin; /* GPIO pin ID to use for SDA */ > unsigned int scl_pin; /* GPIO pin ID to use for SCL */ > + bool has_pfunc; /*chip has a ICPFUNC register */ Space after /* please Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |
WARNING: multiple messages have this Message-ID (diff)
From: "Uwe Kleine-König" <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> To: Grygorii Strashko <grygorii.strashko-l0cyMroinI0@public.gmane.org> Cc: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org>, Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org>, Santosh Shilimkar <ssantosh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org>, Ben Gardiner <bengardiner-ScDXFp4xN3PN+rMO2ozGnw@public.gmane.org>, Mike Looijmans <milo-software-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org> Subject: Re: [5/5] i2c: davinci: use ICPFUNC to toggle I2C as gpio for bus recovery Date: Sun, 23 Nov 2014 18:04:00 +0100 [thread overview] Message-ID: <20141123170400.GC4431@pengutronix.de> (raw) In-Reply-To: <1416477788-5544-6-git-send-email-grygorii.strashko-l0cyMroinI0@public.gmane.org> Hello, On Thu, Nov 20, 2014 at 12:03:08PM +0200, Grygorii Strashko wrote: > @@ -664,6 +759,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) > if (!of_property_read_u32(pdev->dev.of_node, "clock-frequency", > &prop)) > dev->pdata->bus_freq = prop / 1000; > + dev->pdata->has_pfunc = true; I don't understand this. Why does this ICPFUNC recovery work if the bus is probed by oftree, but doesn't if not? > } else if (!dev->pdata) { > dev->pdata = &davinci_i2c_platform_data_default; > } > @@ -705,7 +801,9 @@ static int davinci_i2c_probe(struct platform_device *pdev) > adap->timeout = DAVINCI_I2C_TIMEOUT; > adap->dev.of_node = pdev->dev.of_node; > > - if (dev->pdata->scl_pin) { > + if (dev->pdata->has_pfunc) > + adap->bus_recovery_info = &davinci_i2c_scl_recovery_info; > + else if (dev->pdata->scl_pin) { > adap->bus_recovery_info = &davinci_i2c_gpio_recovery_info; > adap->bus_recovery_info->scl_gpio = dev->pdata->scl_pin; > adap->bus_recovery_info->sda_gpio = dev->pdata->sda_pin; > diff --git a/include/linux/platform_data/i2c-davinci.h b/include/linux/platform_data/i2c-davinci.h > index 2312d19..89fd347 100644 > --- a/include/linux/platform_data/i2c-davinci.h > +++ b/include/linux/platform_data/i2c-davinci.h > @@ -18,6 +18,7 @@ struct davinci_i2c_platform_data { > unsigned int bus_delay; /* post-transaction delay (usec) */ > unsigned int sda_pin; /* GPIO pin ID to use for SDA */ > unsigned int scl_pin; /* GPIO pin ID to use for SCL */ > + bool has_pfunc; /*chip has a ICPFUNC register */ Space after /* please Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2014-11-23 17:04 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-11-20 10:03 [PATCH 0/5] i2c: davinci improvements and fixes Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-20 10:03 ` [PATCH 1/5] i2c: i2c-davinci: switch to use platform_get_irq Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-20 21:48 ` [1/5] " Uwe Kleine-König 2014-11-21 11:01 ` Grygorii Strashko 2014-11-21 11:01 ` Grygorii Strashko 2014-11-21 14:03 ` Rob Herring 2014-11-21 14:03 ` Rob Herring 2014-11-21 14:59 ` Grygorii Strashko 2014-11-20 10:03 ` [PATCH 2/5] i2c: davinci: query STP always when NACK is received Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-20 22:19 ` [2/5] " Uwe Kleine-König 2014-11-20 22:19 ` Uwe Kleine-König 2014-11-21 12:48 ` Grygorii Strashko 2014-11-21 12:48 ` Grygorii Strashko 2014-11-21 13:10 ` Uwe Kleine-König 2014-11-21 13:10 ` Uwe Kleine-König 2014-11-21 15:33 ` Grygorii Strashko 2014-11-21 15:33 ` Grygorii Strashko 2014-11-23 20:33 ` Uwe Kleine-König 2014-11-23 20:33 ` Uwe Kleine-König 2014-11-24 13:34 ` Grygorii Strashko 2014-11-24 13:34 ` Grygorii Strashko 2014-11-24 20:02 ` Uwe Kleine-König 2014-11-24 20:02 ` Uwe Kleine-König 2014-11-20 10:03 ` [PATCH 3/5] i2c: recovery: change input parameter to i2c_adapter for prepare/unprepare_recovery Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-21 18:49 ` [3/5] " Uwe Kleine-König 2014-11-21 18:49 ` Uwe Kleine-König 2014-11-20 10:03 ` [PATCH 4/5] i2c: davinci: use bus recovery infrastructure Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-21 19:07 ` [4/5] " Uwe Kleine-König 2014-11-21 19:07 ` Uwe Kleine-König 2014-11-21 19:33 ` Grygorii Strashko 2014-11-21 19:33 ` Grygorii Strashko 2014-11-23 20:36 ` Uwe Kleine-König 2014-11-23 20:36 ` Uwe Kleine-König 2014-11-24 13:26 ` Grygorii Strashko 2014-11-24 13:26 ` Grygorii Strashko 2014-11-24 20:07 ` Uwe Kleine-König 2014-11-24 20:07 ` Uwe Kleine-König 2014-11-20 10:03 ` [PATCH 5/5] i2c: davinci: use ICPFUNC to toggle I2C as gpio for bus recovery Grygorii Strashko 2014-11-20 10:03 ` Grygorii Strashko 2014-11-23 17:04 ` Uwe Kleine-König [this message] 2014-11-23 17:04 ` [5/5] " Uwe Kleine-König 2014-11-24 13:15 ` Grygorii Strashko 2014-11-24 13:15 ` Grygorii Strashko 2014-11-24 18:13 ` Mike Looijmans 2014-11-24 18:13 ` Mike Looijmans 2014-11-24 19:22 ` Grygorii Strashko 2014-11-24 19:22 ` Grygorii Strashko 2014-11-24 19:45 ` Uwe Kleine-König 2014-11-24 19:45 ` Uwe Kleine-König 2014-11-25 13:04 ` Grygorii Strashko 2014-11-25 13:04 ` Grygorii Strashko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20141123170400.GC4431@pengutronix.de \ --to=u.kleine-koenig@pengutronix.de \ --cc=bengardiner@nanometrics.ca \ --cc=grygorii.strashko@ti.com \ --cc=khilman@deeprootsystems.com \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=m-karicheri2@ti.com \ --cc=milo-software@users.sourceforge.net \ --cc=nsekhar@ti.com \ --cc=ssantosh@kernel.org \ --cc=wsa@the-dreams.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.