[PATCH 0/2] i2c: fix compile failures

[PATCH 0/2] i2c: fix compile failures

[Phil Reid]

This fixes the 2 compile issues related to my series:
"i2c: designware: add i2c gpio recovery option"

I'm not sure if you want patches on top of i2c/for-next or a 
respin of the series. I'm sure you'll let me know.

I've got some particular combination of Kconfig flags that
is pulling gpio/consumer.h into the i2c-core-base, but I can't
see what it is.

And I didn't pick up that the designware driver was split into 
two separate modules. oops.


Phil Reid (2):
  i2c: core: fix compile issue related to incorrect gpio header
  i2c: designware: fix building driver as module

 drivers/i2c/busses/i2c-designware-common.c | 1 +
 drivers/i2c/i2c-core-base.c                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
1.8.3.1

[PATCH 1/2] i2c: core: fix compile issue related to incorrect gpio header

[Phil Reid]

The correct header to include for the gpiod interface is
<linux/gpio/consumer.h>.

fixes commit 3991c5c80beaf7eb9 ("i2c: Switch to using gpiod interface
for gpio bus recovery")

Signed-off-by: Phil Reid <preid@electromag.com.au>
---
 drivers/i2c/i2c-core-base.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 54ffc8d..bf52cca 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -27,7 +27,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/i2c-smbus.h>
 #include <linux/idr.h>
-- 
1.8.3.1

[PATCH 2/2] i2c: designware: fix building driver as module

[Phil Reid]

The designware core and platform are built as separate modules.
Export i2c_dw_prepare_clk() so it can be used by the platform
driver.

Fixes commit a34a0b6da22540d19e57
("i2c: designware: move i2c_dw_plat_prepare_clk to common")

Signed-off-by: Phil Reid <preid@electromag.com.au>
---
 drivers/i2c/busses/i2c-designware-common.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index 6b82809..27ebd90 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -197,6 +197,7 @@ int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare)
 	clk_disable_unprepare(dev->clk);
 	return 0;
 }
+EXPORT_SYMBOL_GPL(i2c_dw_prepare_clk);
 
 int i2c_dw_acquire_lock(struct dw_i2c_dev *dev)
 {
-- 
1.8.3.1

Re: [PATCH 2/2] i2c: designware: fix building driver as module

[Jarkko Nikula]

On 11/28/2017 05:09 AM, Phil Reid wrote:
> The designware core and platform are built as separate modules.
> Export i2c_dw_prepare_clk() so it can be used by the platform
> driver.
> 
> Fixes commit a34a0b6da22540d19e57
> ("i2c: designware: move i2c_dw_plat_prepare_clk to common")
> 
> Signed-off-by: Phil Reid <preid@electromag.com.au>
> ---
>   drivers/i2c/busses/i2c-designware-common.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
> index 6b82809..27ebd90 100644
> --- a/drivers/i2c/busses/i2c-designware-common.c
> +++ b/drivers/i2c/busses/i2c-designware-common.c
> @@ -197,6 +197,7 @@ int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare)
>   	clk_disable_unprepare(dev->clk);
>   	return 0;
>   }
> +EXPORT_SYMBOL_GPL(i2c_dw_prepare_clk);
>   
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>

Re: [PATCH 1/2] i2c: core: fix compile issue related to incorrect gpio header

[Jarkko Nikula]

On 11/28/2017 05:09 AM, Phil Reid wrote:
> The correct header to include for the gpiod interface is
> <linux/gpio/consumer.h>.
> 
> fixes commit 3991c5c80beaf7eb9 ("i2c: Switch to using gpiod interface
> for gpio bus recovery")
> 
> Signed-off-by: Phil Reid <preid@electromag.com.au>
> ---
>   drivers/i2c/i2c-core-base.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> index 54ffc8d..bf52cca 100644
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -27,7 +27,7 @@
>   #include <linux/delay.h>
>   #include <linux/err.h>
>   #include <linux/errno.h>
> -#include <linux/gpio.h>
> +#include <linux/gpio/consumer.h>

Looks like this was masked by CONFIG_GPIOLIB=y.

Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>

Re: [PATCH 1/2] i2c: core: fix compile issue related to incorrect gpio header

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

On Tue, Nov 28, 2017 at 11:09:10AM +0800, Phil Reid wrote:
> The correct header to include for the gpiod interface is
> <linux/gpio/consumer.h>.
> 
> fixes commit 3991c5c80beaf7eb9 ("i2c: Switch to using gpiod interface
> for gpio bus recovery")

Thanks for the fixes tag, yet please use this format in the future:

Fixes: <sha> ("desc")

like

Fixes: a34a0b6da22540d19e57 ("i2c: designware: move i2c_dw_plat_prepare_clk to common")

Fixed it myself for these two patches.


> Signed-off-by: Phil Reid <preid@electromag.com.au>

Applied to for-next, thanks for the fast reaction!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/2] i2c: designware: fix building driver as module

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

On Tue, Nov 28, 2017 at 11:09:11AM +0800, Phil Reid wrote:
> The designware core and platform are built as separate modules.
> Export i2c_dw_prepare_clk() so it can be used by the platform
> driver.
> 
> Fixes commit a34a0b6da22540d19e57
> ("i2c: designware: move i2c_dw_plat_prepare_clk to common")
> 
> Signed-off-by: Phil Reid <preid@electromag.com.au>

Applied to for-next, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]