2016-03-01 13:53:57

by Jan Glauber

Subject: [PATCH] i2c-thunderx: fix compile error for x86_64

The i2c-thunderx driver only depends on 64BIT and PCI,
because there is no reason to limit it to ARM64.

Adjusting the check in the header file that selects Octeon
or ThunderX values to check for CONFIG_I2C_THUNDERX
instead of CONFIG_ARCH_THUNDER fixes the compile error
on x86_64.

Signed-off-by: Jan Glauber <[email protected]>
---
drivers/i2c/busses/i2c-cavium.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-cavium.h b/drivers/i2c/busses/i2c-cavium.h
index 8357997..c7398f4 100644
--- a/drivers/i2c/busses/i2c-cavium.h
+++ b/drivers/i2c/busses/i2c-cavium.h
@@ -8,7 +8,7 @@
#include <linux/pci.h>

/* Register offsets */
-#ifdef CONFIG_ARCH_THUNDER
+#ifdef CONFIG_I2C_THUNDERX
#define SW_TWSI 0x1000
#define TWSI_INT 0x1010
#define SW_TWSI_EXT 0x1018
--
1.9.1

2016-03-01 17:02:29

by David Daney

Subject: Re: [PATCH] i2c-thunderx: fix compile error for x86_64

On 03/01/2016 05:53 AM, Jan Glauber wrote:
> The i2c-thunderx driver only depends on 64BIT and PCI,
> because there is no reason to limit it to ARM64.
>
> Adjusting the check in the header file that selects Octeon
> or ThunderX values to check for CONFIG_I2C_THUNDERX
> instead of CONFIG_ARCH_THUNDER fixes the compile error
> on x86_64.
>
> Signed-off-by: Jan Glauber <[email protected]>

Yes, CONFIG_ARCH_THUNDER must die wherever it is encountered.

Acked-by: David Daney <[email protected]>

That said, since the previous patch set didn't build under some
configurations, can you fold this in, and submit a v2 that is complete
and stand alone?

Thanks,
David Daney

> ---
> drivers/i2c/busses/i2c-cavium.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/i2c/busses/i2c-cavium.h b/drivers/i2c/busses/i2c-cavium.h
> index 8357997..c7398f4 100644
> --- a/drivers/i2c/busses/i2c-cavium.h
> +++ b/drivers/i2c/busses/i2c-cavium.h
> @@ -8,7 +8,7 @@
> #include <linux/pci.h>
>
> /* Register offsets */
> -#ifdef CONFIG_ARCH_THUNDER
> +#ifdef CONFIG_I2C_THUNDERX
> #define SW_TWSI 0x1000
> #define TWSI_INT 0x1010
> #define SW_TWSI_EXT 0x1018
>