2005-04-30 05:57:53

by Dave Jones

Subject: tighten i2c dependancies

A lot of these drivers show up on pretty much every arch
regardless of whether they make sense. This adds a bunch
of additional dependancies tying down platform specific drivers
that are unlikely to be used on other archs.

Signed-off-by: Dave Jones <[email protected]>

--- linux-2.6.11/drivers/i2c/busses/Kconfig~ 2005-04-16 01:05:36.000000000 -0400
+++ linux-2.6.11/drivers/i2c/busses/Kconfig 2005-04-16 01:06:09.000000000 -0400
@@ -376,7 +376,7 @@ config SCx200_I2C_SDA

config SCx200_ACB
tristate "NatSemi SCx200 ACCESS.bus"
- depends on I2C && PCI
+ depends on SCx200_I2C && PCI
help
Enable the use of the ACCESS.bus controllers of a SCx200 processor.

--- linux-2.6.11/drivers/i2c/busses/Kconfig~ 2005-04-16 01:07:57.000000000 -0400
+++ linux-2.6.11/drivers/i2c/busses/Kconfig 2005-04-16 01:11:10.000000000 -0400
@@ -7,7 +7,7 @@ menu "I2C Hardware Bus support"

config I2C_ALI1535
tristate "ALI 1535"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the SMB
Host controller on Acer Labs Inc. (ALI) M1535 South Bridges. The SMB
@@ -19,7 +19,7 @@ config I2C_ALI1535

config I2C_ALI1563
tristate "ALI 1563"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the SMB
Host controller on Acer Labs Inc. (ALI) M1563 South Bridges. The SMB
@@ -31,7 +31,7 @@ config I2C_ALI1563

config I2C_ALI15X3
tristate "ALI 15x3"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the
Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -41,7 +41,7 @@ config I2C_ALI15X3

config I2C_AMD756
tristate "AMD 756/766/768/8111 and nVidia nForce"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the AMD
756/766/768 mainboard I2C interfaces. The driver also includes
@@ -53,7 +53,7 @@ config I2C_AMD756

config I2C_AMD756_S4882
tristate "SMBus multiplexing on the Tyan S4882"
- depends on I2C_AMD756 && EXPERIMENTAL
+ depends on X86 && I2C_AMD756 && EXPERIMENTAL
help
Enabling this option will add specific SMBus support for the Tyan
S4882 motherboard. On this 4-CPU board, the SMBus is multiplexed
@@ -66,7 +66,7 @@ config I2C_AMD756_S4882

config I2C_AMD8111
tristate "AMD 8111"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the
second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -109,7 +109,7 @@ config I2C_HYDRA

config I2C_I801
tristate "Intel 82801 (ICH)"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the Intel
801 family of mainboard I2C interfaces. Specifically, the following
@@ -129,7 +129,7 @@ config I2C_I801

config I2C_I810
tristate "Intel 810/815"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
select I2C_ALGOBIT
help
If you say yes to this option, support will be included for the Intel
@@ -145,7 +145,7 @@ config I2C_I810

config I2C_PIIX4
tristate "Intel PIIX4"
- depends on I2C && PCI
+ depends on X86 && I2C && PCI
help
If you say yes to this option, support will be included for the Intel
PIIX4 family of mainboard I2C interfaces. Specifically, the following
@@ -437,7 +437,7 @@ config I2C_STUB

config I2C_VIA
tristate "VIA 82C586B"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on (X86 || PPC) && I2C && PCI && EXPERIMENTAL
select I2C_ALGOBIT
help
If you say yes to this option, support will be included for the VIA
@@ -448,7 +448,7 @@ config I2C_VIA

config I2C_VIAPRO
tristate "VIA 82C596/82C686/823x"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on (X86 || PPC) && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the VIA
82C596/82C686/823x I2C interfaces. Specifically, the following
--- linux-2.6.11/drivers/i2c/busses/Kconfig~ 2005-04-16 01:16:48.000000000 -0400
+++ linux-2.6.11/drivers/i2c/busses/Kconfig 2005-04-16 01:17:11.000000000 -0400
@@ -387,7 +387,7 @@ config SCx200_ACB

config I2C_SIS5595
tristate "SiS 5595"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the
SiS5595 SMBus (a subset of I2C) interface.
@@ -397,7 +397,7 @@ config I2C_SIS5595

config I2C_SIS630
tristate "SiS 630/730"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the
SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@ -407,7 +407,7 @@ config I2C_SIS630

config I2C_SIS96X
tristate "SiS 96x"
- depends on I2C && PCI && EXPERIMENTAL
+ depends on X86 && I2C && PCI && EXPERIMENTAL
help
If you say yes to this option, support will be included for the SiS
96x SMBus (a subset of I2C) interfaces. Specifically, the following

2005-04-30 07:35:48

by Christoph Hellwig

Subject: Re: tighten i2c dependancies

On Sat, Apr 30, 2005 at 01:57:45AM -0400, Dave Jones wrote:
> config I2C_ALI15X3
> tristate "ALI 15x3"
> - depends on I2C && PCI && EXPERIMENTAL
> + depends on X86 && I2C && PCI && EXPERIMENTAL
> help
> If you say yes to this option, support will be included for the
> Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.

one of the ali bridges is used on sparc64 aswell, not sure which one.

> @@ -41,7 +41,7 @@ config I2C_ALI15X3
>
> config I2C_AMD756
> tristate "AMD 756/766/768/8111 and nVidia nForce"
> - depends on I2C && PCI && EXPERIMENTAL
> + depends on X86 && I2C && PCI && EXPERIMENTAL
> help
> If you say yes to this option, support will be included for the AMD
> 756/766/768 mainboard I2C interfaces. The driver also includes

also used on alpha and ppc64


> config I2C_AMD8111
> tristate "AMD 8111"
> - depends on I2C && PCI && EXPERIMENTAL
> + depends on X86 && I2C && PCI && EXPERIMENTAL
> help
> If you say yes to this option, support will be included for the
> second (SMBus 2.0) AMD 8111 mainboard I2C interface.

ppc64

> config I2C_PIIX4
> tristate "Intel PIIX4"
> - depends on I2C && PCI
> + depends on X86 && I2C && PCI
> help
> If you say yes to this option, support will be included for the Intel
> PIIX4 family of mainboard I2C interfaces. Specifically, the following
> @@ -437,7 +437,7 @@ config I2C_STUB

the PIIX is used on various non-x86 systems, at least ppc and mips come to
mind.

2005-04-30 07:42:30

by Geert Uytterhoeven

Subject: Re: tighten i2c dependancies

On Sat, 30 Apr 2005, Christoph Hellwig wrote:
> On Sat, Apr 30, 2005 at 01:57:45AM -0400, Dave Jones wrote:
> > config I2C_ALI15X3
> > tristate "ALI 15x3"
> > - depends on I2C && PCI && EXPERIMENTAL
> > + depends on X86 && I2C && PCI && EXPERIMENTAL
> > help
> > If you say yes to this option, support will be included for the
> > Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
>
> one of the ali bridges is used on sparc64 aswell, not sure which one.

And there's an ALi M1543 on my NEC DDB Vrc-5074 MIPS board.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2005-04-30 11:06:12

by Christer Weinigel

Subject: Re: tighten i2c dependancies

Dave Jones <[email protected]> writes:

> A lot of these drivers show up on pretty much every arch
> regardless of whether they make sense. This adds a bunch
> of additional dependancies tying down platform specific drivers
> that are unlikely to be used on other archs.
>
> Signed-off-by: Dave Jones <[email protected]>
>
> --- linux-2.6.11/drivers/i2c/busses/Kconfig~ 2005-04-16 01:05:36.000000000 -0400
> +++ linux-2.6.11/drivers/i2c/busses/Kconfig 2005-04-16 01:06:09.000000000 -0400
> @@ -376,7 +376,7 @@ config SCx200_I2C_SDA
>
> config SCx200_ACB
> tristate "NatSemi SCx200 ACCESS.bus"
> - depends on I2C && PCI
> + depends on SCx200_I2C && PCI
> help
> Enable the use of the ACCESS.bus controllers of a SCx200 processor.

This is wrong. The ACCESS.bus driver is an alternative to the
bitbanging driver and it's possible to use this driver even without
any other SCx200 stuff configured into the kernel.

/Christer

--
"Just how much can I get away with and still go to heaven?"

Freelance consultant specializing in device driver programming for Linux
Christer Weinigel <[email protected]> http://www.weinigel.se