linux-next: manual merge of the drivers-x86 tree with the tip tree

linux-next: manual merge of the drivers-x86 tree with the tip tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  drivers/platform/x86/intel_pmc_core.c

between commit:

  a69b3b1d4cf0 ("platform/x86: Convert to new CPU match macros")

from the tip tree and commit:

  16292bed9c56 ("platform/x86: intel_pmc_core: Add Atom based Jasper Lake (JSL) platform support")

from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/platform/x86/intel_pmc_core.c
index 3df33ff50faa,d265cd5b1f45..000000000000
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@@ -871,18 -1144,19 +1144,19 @@@ static inline void pmc_core_dbgfs_unreg
  #endif /* CONFIG_DEBUG_FS */
  
  static const struct x86_cpu_id intel_pmc_core_ids[] = {
 -	INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),
 -	INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),
 -	INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),
 -	INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),
 -	INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
 -	INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
 -	INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map),
 -	INTEL_CPU_FAM6(COMETLAKE, cnp_reg_map),
 -	INTEL_CPU_FAM6(COMETLAKE_L, cnp_reg_map),
 -	INTEL_CPU_FAM6(TIGERLAKE_L, tgl_reg_map),
 -	INTEL_CPU_FAM6(TIGERLAKE, tgl_reg_map),
 -	INTEL_CPU_FAM6(ATOM_TREMONT, tgl_reg_map),
 -	INTEL_CPU_FAM6(ATOM_TREMONT_L, tgl_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,		&spt_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,		&spt_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,		&spt_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,		&spt_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L,	&cnp_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		&icl_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI,	&icl_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,		&cnp_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,		&cnp_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		&tgl_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		&tgl_reg_map),
 +	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	&tgl_reg_map),
++	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	&tgl_reg_map),
  	{}
  };
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drivers-x86 tree with the tip tree

[Andy Shevchenko]

On Thu, Mar 26, 2020 at 6:05 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
>   drivers/platform/x86/intel_pmc_core.c
>
> between commit:
>
>   a69b3b1d4cf0 ("platform/x86: Convert to new CPU match macros")
>
> from the tip tree and commit:
>
>   16292bed9c56 ("platform/x86: intel_pmc_core: Add Atom based Jasper Lake (JSL) platform support")
>
> from the drivers-x86 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>

Looks correct to me, i.e. new macro for code in PDx86.
Thank you, Stephen!

> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/platform/x86/intel_pmc_core.c
> index 3df33ff50faa,d265cd5b1f45..000000000000
> --- a/drivers/platform/x86/intel_pmc_core.c
> +++ b/drivers/platform/x86/intel_pmc_core.c
> @@@ -871,18 -1144,19 +1144,19 @@@ static inline void pmc_core_dbgfs_unreg
>   #endif /* CONFIG_DEBUG_FS */
>
>   static const struct x86_cpu_id intel_pmc_core_ids[] = {
>  -      INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),
>  -      INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),
>  -      INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),
>  -      INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),
>  -      INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
>  -      INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
>  -      INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map),
>  -      INTEL_CPU_FAM6(COMETLAKE, cnp_reg_map),
>  -      INTEL_CPU_FAM6(COMETLAKE_L, cnp_reg_map),
>  -      INTEL_CPU_FAM6(TIGERLAKE_L, tgl_reg_map),
>  -      INTEL_CPU_FAM6(TIGERLAKE, tgl_reg_map),
>  -      INTEL_CPU_FAM6(ATOM_TREMONT, tgl_reg_map),
>  -      INTEL_CPU_FAM6(ATOM_TREMONT_L, tgl_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,           &spt_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,             &spt_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,          &spt_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,            &spt_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L,        &cnp_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,           &icl_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI,        &icl_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,           &cnp_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,         &cnp_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,         &tgl_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,           &tgl_reg_map),
>  +      X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,        &tgl_reg_map),
> ++      X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,      &tgl_reg_map),
>         {}
>   };
>


-- 
With Best Regards,
Andy Shevchenko

Re: linux-next: manual merge of the drivers-x86 tree with the tip tree

[Stephen Rothwell]

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

Hi all,

On Thu, 26 Mar 2020 15:05:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
> 
>   drivers/platform/x86/intel_pmc_core.c
> 
> between commit:
> 
>   a69b3b1d4cf0 ("platform/x86: Convert to new CPU match macros")
> 
> from the tip tree and commit:
> 
>   16292bed9c56 ("platform/x86: intel_pmc_core: Add Atom based Jasper Lake (JSL) platform support")
> 
> from the drivers-x86 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/platform/x86/intel_pmc_core.c
> index 3df33ff50faa,d265cd5b1f45..000000000000
> --- a/drivers/platform/x86/intel_pmc_core.c
> +++ b/drivers/platform/x86/intel_pmc_core.c
> @@@ -871,18 -1144,19 +1144,19 @@@ static inline void pmc_core_dbgfs_unreg
>   #endif /* CONFIG_DEBUG_FS */
>   
>   static const struct x86_cpu_id intel_pmc_core_ids[] = {
>  -	INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),
>  -	INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),
>  -	INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),
>  -	INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),
>  -	INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
>  -	INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
>  -	INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map),
>  -	INTEL_CPU_FAM6(COMETLAKE, cnp_reg_map),
>  -	INTEL_CPU_FAM6(COMETLAKE_L, cnp_reg_map),
>  -	INTEL_CPU_FAM6(TIGERLAKE_L, tgl_reg_map),
>  -	INTEL_CPU_FAM6(TIGERLAKE, tgl_reg_map),
>  -	INTEL_CPU_FAM6(ATOM_TREMONT, tgl_reg_map),
>  -	INTEL_CPU_FAM6(ATOM_TREMONT_L, tgl_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,		&spt_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,		&spt_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,		&spt_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,		&spt_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L,	&cnp_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		&icl_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI,	&icl_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,		&cnp_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,		&cnp_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		&tgl_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		&tgl_reg_map),
>  +	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	&tgl_reg_map),
> ++	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	&tgl_reg_map),
>   	{}
>   };
>   


This is now a conflict between the drivers-x86 tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drivers-x86 tree with the tip tree

[Andy Shevchenko]

On Wed, Apr 1, 2020 at 6:14 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Thu, 26 Mar 2020 15:05:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the drivers-x86 tree got a conflict in:
> >
> >   drivers/platform/x86/intel_pmc_core.c
> >
> > between commit:
> >
> >   a69b3b1d4cf0 ("platform/x86: Convert to new CPU match macros")
> >
> > from the tip tree and commit:
> >
> >   16292bed9c56 ("platform/x86: intel_pmc_core: Add Atom based Jasper Lake (JSL) platform support")
> >
> > from the drivers-x86 tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.

> This is now a conflict between the drivers-x86 tree and Linus' tree.

PDx86 is in Linus tree with conflict resolution.

-- 
With Best Regards,
Andy Shevchenko

linux-next: manual merge of the drivers-x86 tree with the tip tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  drivers/platform/x86/intel_mid_powerbtn.c

between commit:

  f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")

from the tip tree and commit:

  a8b60e484f3d ("platform/x86: intel_mid_powerbtn: Get rid of custom ICPU() macro")

from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/platform/x86/intel_mid_powerbtn.c
index 5ad44204a9c3,a8c0fbb7f799..000000000000
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@@ -121,12 -112,9 +112,9 @@@ static const struct mid_pb_ddata mrfld_
  	.setup	= mrfld_setup,
  };
  
- #define ICPU(model, ddata)	\
- 	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (kernel_ulong_t)&ddata }
- 
  static const struct x86_cpu_id mid_pb_cpu_ids[] = {
- 	ICPU(INTEL_FAM6_ATOM_SALTWELL_MID,		mfld_ddata),
- 	ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID,	mrfld_ddata),
 -	INTEL_CPU_FAM6(ATOM_PENWELL,		mfld_ddata),
 -	INTEL_CPU_FAM6(ATOM_MERRIFIELD,		mrfld_ddata),
++	INTEL_CPU_FAM6(ATOM_SALTWELL_MID,	mfld_ddata),
++	INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,	mrfld_ddata),
  	{}
  };
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drivers-x86 tree with the tip tree

[Andy Shevchenko]

On Mon, Oct 8, 2018 at 6:48 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
>   drivers/platform/x86/intel_mid_powerbtn.c
>
> between commit:
>
>   f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
>
> from the tip tree and commit:
>
>   a8b60e484f3d ("platform/x86: intel_mid_powerbtn: Get rid of custom ICPU() macro")
>
> from the drivers-x86 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks!
Looks good to me.

> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/platform/x86/intel_mid_powerbtn.c
> index 5ad44204a9c3,a8c0fbb7f799..000000000000
> --- a/drivers/platform/x86/intel_mid_powerbtn.c
> +++ b/drivers/platform/x86/intel_mid_powerbtn.c
> @@@ -121,12 -112,9 +112,9 @@@ static const struct mid_pb_ddata mrfld_
>         .setup  = mrfld_setup,
>   };
>
> - #define ICPU(model, ddata)    \
> -       { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (kernel_ulong_t)&ddata }
> -
>   static const struct x86_cpu_id mid_pb_cpu_ids[] = {
> -       ICPU(INTEL_FAM6_ATOM_SALTWELL_MID,              mfld_ddata),
> -       ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID,    mrfld_ddata),
>  -      INTEL_CPU_FAM6(ATOM_PENWELL,            mfld_ddata),
>  -      INTEL_CPU_FAM6(ATOM_MERRIFIELD,         mrfld_ddata),
> ++      INTEL_CPU_FAM6(ATOM_SALTWELL_MID,       mfld_ddata),
> ++      INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,     mrfld_ddata),
>         {}
>   };
>


-- 
With Best Regards,
Andy Shevchenko

linux-next: manual merge of the drivers-x86 tree with the tip tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  drivers/platform/x86/intel_int0002_vgpio.c

between commit:

  f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")

from the tip tree and commit:

  96402de65afc ("platform/x86: intel_int0002_vgpio: Enable the driver on Bay Trail platforms")

from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/platform/x86/intel_int0002_vgpio.c
index e89ad4964dc1,c958a628c375..000000000000
--- a/drivers/platform/x86/intel_int0002_vgpio.c
+++ b/drivers/platform/x86/intel_int0002_vgpio.c
@@@ -57,11 -54,7 +54,7 @@@
  #define ICPU(model)	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
  
  static const struct x86_cpu_id int0002_cpu_ids[] = {
- /*
-  * Limit ourselves to Cherry Trail for now, until testing shows we
-  * need to handle the INT0002 device on Baytrail too.
-  *	ICPU(INTEL_FAM6_ATOM_SILVERMONT),	 * Valleyview, Bay Trail *
-  */
 -	ICPU(INTEL_FAM6_ATOM_SILVERMONT1),	/* Valleyview, Bay Trail  */
++	ICPU(INTEL_FAM6_ATOM_SILVERMONT),	/* Valleyview, Bay Trail  */
  	ICPU(INTEL_FAM6_ATOM_AIRMONT),		/* Braswell, Cherry Trail */
  	{}
  };

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drivers-x86 tree with the tip tree

[Andy Shevchenko]

On Mon, Oct 8, 2018 at 6:44 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
>   drivers/platform/x86/intel_int0002_vgpio.c
>
> between commit:
>
>   f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
>
> from the tip tree and commit:
>
>   96402de65afc ("platform/x86: intel_int0002_vgpio: Enable the driver on Bay Trail platforms")
>
> from the drivers-x86 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>

Looks good to me!

> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/platform/x86/intel_int0002_vgpio.c
> index e89ad4964dc1,c958a628c375..000000000000
> --- a/drivers/platform/x86/intel_int0002_vgpio.c
> +++ b/drivers/platform/x86/intel_int0002_vgpio.c
> @@@ -57,11 -54,7 +54,7 @@@
>   #define ICPU(model)   { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
>
>   static const struct x86_cpu_id int0002_cpu_ids[] = {
> - /*
> -  * Limit ourselves to Cherry Trail for now, until testing shows we
> -  * need to handle the INT0002 device on Baytrail too.
> -  *    ICPU(INTEL_FAM6_ATOM_SILVERMONT),        * Valleyview, Bay Trail *
> -  */
>  -      ICPU(INTEL_FAM6_ATOM_SILVERMONT1),      /* Valleyview, Bay Trail  */
> ++      ICPU(INTEL_FAM6_ATOM_SILVERMONT),       /* Valleyview, Bay Trail  */
>         ICPU(INTEL_FAM6_ATOM_AIRMONT),          /* Braswell, Cherry Trail */
>         {}
>   };



-- 
With Best Regards,
Andy Shevchenko

linux-next: manual merge of the drivers-x86 tree with the tip tree

[Stephen Rothwell]

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

Hi Matthew,

Today's linux-next merge of the drivers-x86 tree got a conflicts in
arch/x86/Kconfig and arch/x86/platform/geode/Makefile between commit
da4e3302949f ("x86/geode/net5501: Add platform driver for Soekris
Engineering net5501") from the tip tree and commit b2a2f19ad3db ("geos:
Platform driver for Geos and Geos2 single-board computers") from the
drivers-x86 tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/Kconfig
index 36d459e,3a38c4c..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2146,12 -2133,13 +2146,19 @@@ config ALI
  
  	  Note: You have to set alix.force=1 for boards with Award BIOS.
  
 +config NET5501
 +	bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)"
 +	select GPIOLIB
 +	---help---
 +	  This option enables system support for the Soekris Engineering net5501.
 +
+ config GEOS
+ 	bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"
+ 	select GPIOLIB
+ 	depends on DMI
+ 	---help---
+ 	  This option enables system support for the Traverse Technologies GEOS.
+ 
  endif # X86_32
  
  config AMD_NB
diff --cc arch/x86/platform/geode/Makefile
index 246b788,d8ba564..0000000
--- a/arch/x86/platform/geode/Makefile
+++ b/arch/x86/platform/geode/Makefile
@@@ -1,2 -1,2 +1,3 @@@
  obj-$(CONFIG_ALIX)		+= alix.o
 +obj-$(CONFIG_NET5501)		+= net5501.o
+ obj-$(CONFIG_GEOS)		+= geos.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]