x86/geode change for v3.2

GIT PULL Ingo Molnar 1 participant 1 message Oct 26, 2011

Subsystems (3)

x86 LED AMD geode processor/chipset support

lore

Share & tools

lore

Ingo Molnar

author

2011-10-26 15:27 UTC #0 lore raw

Linus,

Please pull the latest x86-geode-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-geode-for-linus

out-of-topic modifications in x86-geode-for-linus:
--------------------------------------------------

drivers/leds/Kconfig               # d4f3e35: x86: geode: New PCEngines Alix sy
drivers/leds/Makefile              # d4f3e35: x86: geode: New PCEngines Alix sy
drivers/leds/leds-alix2.c          # d4f3e35: x86: geode: New PCEngines Alix sy

Thanks,

Ingo

------------------>
Ed Wildgoose (1):
x86: geode: New PCEngines Alix system driver

 arch/x86/Kconfig                 |   14 +++
 arch/x86/platform/Makefile       |    1 +
 arch/x86/platform/geode/Makefile |    1 +
 arch/x86/platform/geode/alix.c   |  142 ++++++++++++++++++++++
 drivers/leds/Kconfig             |    8 --
 drivers/leds/Makefile            |    1 -
 drivers/leds/leds-alix2.c        |  239 --------------------------------------
 7 files changed, 158 insertions(+), 248 deletions(-)
 create mode 100644 arch/x86/platform/geode/Makefile
 create mode 100644 arch/x86/platform/geode/alix.c
 delete mode 100644 drivers/leds/leds-alix2.c

arch/x86/Kconfig +14 -0

index 6a47bb2..8c4e5bc 100644
@@ -2064,6 +2064,20 @@ config OLPC_XO15_SCI
 	   - AC adapter status updates
 	   - Battery status updates
 
+config ALIX
+	bool "PCEngines ALIX System Support (LED setup)"
+	select GPIOLIB
+	---help---
+	  This option enables system support for the PCEngines ALIX.
+	  At present this just sets up LEDs for GPIO control on
+	  ALIX2/3/6 boards.  However, other system specific setup should
+	  get added here.
+
+	  Note: You must still enable the drivers for GPIO and LED support
+	  (GPIO_CS5535 & LEDS_GPIO) to actually use the LEDs
+
+	  Note: You have to set alix.force=1 for boards with Award BIOS.
+
 endif # X86_32
 
 config AMD_NB

arch/x86/platform/Makefile +1 -0

index 021eee9..8d87439 100644
@@ -1,6 +1,7 @@
 # Platform specific code goes here
 obj-y	+= ce4100/
 obj-y	+= efi/
+obj-y	+= geode/
 obj-y	+= iris/
 obj-y	+= mrst/
 obj-y	+= olpc/

arch/x86/platform/geode/Makefile new file +1 -0

new file mode 100644
index 0000000..07c9cd0
@@ -0,0 +1 @@
+obj-$(CONFIG_ALIX)		+= alix.o

arch/x86/platform/geode/alix.c new file +142 -0

142 lines not on this page · raw message

drivers/leds/Kconfig +0 -8

index b591e72..8974d27 100644
@@ -113,14 +113,6 @@ config LEDS_WRAP
 	help
 	  This option enables support for the PCEngines WRAP programmable LEDs.
 
-config LEDS_ALIX2
-	tristate "LED Support for ALIX.2 and ALIX.3 series"
-	depends on LEDS_CLASS
-	depends on X86 && !GPIO_CS5535 && !CS5535_GPIO
-	help
-	  This option enables support for the PCEngines ALIX.2 and ALIX.3 LEDs.
-	  You have to set leds-alix2.force=1 for boards with Award BIOS.
-
 config LEDS_COBALT_QUBE
 	tristate "LED Support for the Cobalt Qube series front LED"
 	depends on LEDS_CLASS

drivers/leds/Makefile +0 -1

index bbfd2e3..a0a1b89 100644
@@ -16,7 +16,6 @@ obj-$(CONFIG_LEDS_AMS_DELTA)		+= leds-ams-delta.o
 obj-$(CONFIG_LEDS_NET48XX)		+= leds-net48xx.o
 obj-$(CONFIG_LEDS_NET5501)		+= leds-net5501.o
 obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o
-obj-$(CONFIG_LEDS_ALIX2)		+= leds-alix2.o
 obj-$(CONFIG_LEDS_COBALT_QUBE)		+= leds-cobalt-qube.o
 obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o
 obj-$(CONFIG_LEDS_SUNFIRE)		+= leds-sunfire.o

drivers/leds/leds-alix2.c deleted +0 ~~-239~~

239 lines not on this page · raw message