net5501: platform driver for Soekris Engineering net5501 single-board computer
Subsystems (3)
PATCH 1/1 net5501: platform driver for Soekris Engineering net5501 single-board computer
From: "Philip A. Prindeville" <[email protected]>
Trivial platform driver for Soekris Engineering net5501 single-board computer. Probes well-known locations in ROM for BIOS signature to confirm correct platform. Registers 1 LED and 1 GPIO-based button (typically used for soft reset).
--- arch/x86/Kconfig | 6 ++ arch/x86/platform/geode/Makefile | 1 + arch/x86/platform/geode/net5501.c | 147 +++++++++++++++++++++++++++++++++++++ drivers/leds/leds-net5501.c | 97 ------------------------ 4 files changed, 154 insertions(+), 97 deletions(-) create mode 100644 arch/x86/platform/geode/net5501.c delete mode 100644 drivers/leds/leds-net5501.c
arch/x86/Kconfig +6 -0
@@ -2164,6 +2164,12 @@ config ALIX 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. + endif # X86_32 config AMD_NB
arch/x86/platform/geode/Makefile +1 -0
@@ -1 +1,2 @@ obj-$(CONFIG_ALIX) += alix.o +obj-$(CONFIG_NET5501) += net5501.o
arch/x86/platform/geode/net5501.c new file +147 -0
147 lines not on this page · raw message
drivers/leds/leds-net5501.c deleted +0 -97
97 lines not on this page · raw message
Signature · 1 line
1.7.7.4
Quoted 10 lines · On Sat, 31 Dec 2011 02:28:42 -0700 Philip Prindeville…
From: "Philip A. Prindeville" <[email protected]>
Trivial platform driver for Soekris Engineering net5501 single-board computer. Probes well-known locations in ROM for BIOS signature to confirm correct platform. Registers 1 LED and 1 GPIO-based button (typically used for soft reset).
...
arch/x86/platform/geode/net5501.c line 109
Quoted 8 lines
arch/x86/platform/geode/net5501.c new file +8
-0+static int __init net5501_present (void ) +{ +int i; +unsigned char *rombase, *bios; + + rombase =ioremap (BIOS_REGION_BASE ,BIOS_REGION_SIZE -1 ); +if (!rombase) +printk (KERN_INFO "Soekris net5501 LED driver failed to get rombase" );
It seems wrong to continue if ioremap() failed. It should return -ENOMEM here. And perhaps boost the KERN_INFO to KERN_ERR?
Quoted 18 lines
arch/x86/platform/geode/net5501.c new file +18
-0+ bios = rombase +0x20 ;/* null terminated */ + +if (memcmp (bios,"comBIOS" ,7 )) + goto unmap; + +for (i =0 ; i <ARRAY_SIZE (boards); i++) { +unsigned char *model = rombase + boards[i].offset; + +if (memcmp (model, boards[i].sig, boards[i].len) ==0 ) { +printk (KERN_INFO "Soekris %s: %s\n" , model, bios); + +register_net5501 (); +break ; + } + } + +unmap: +iounmap (rombase);
arch/x86/platform/geode/net5501.c line 138
Quoted 10 lines
arch/x86/platform/geode/net5501.c new file +10
-0+return 0 ; +} + +static int __init net5501_init (void ) +{ +if (!is_geode ()) +return 0 ; + +if (net5501_present ()) +register_net5501 ();
This makes no sense. net5501_present() always returns zero so register_net5501() is never called. net5501_present() itself calls register_net5501(), so perhaps this is just dead code.
It seems cleaner to me to do the register_net5501() call from net5501_init(). A function called "foo_present()" should test for the presence of foo (and return a bool!) - we don't expect it to run off and register things.
I assume this code is all runtime tested?
Quoted 3 lines
...
PATCH v2 1/1 net5501: platform driver for Soekris Engineering net5501 single-board computer
In reply to Philip PrindevilleFrom: "Philip A. Prindeville" <[email protected]>
Andrew: this is from the console when booting 3.2.1:
[ 0.308194] platform rtc_cmos: registered platform RTC device (no PNP device found) [ 0.325158] net5501: system is recognized as "net5501" [ 0.375991] squashfs: version 4.0 (2009/01/31) Phillip Lougher [ 0.390948] JFFS2 version 2.2 (NAND) (SUMMARY) (LZMA) (RTIME) (CMODE_PRIORITY ) (c) 2001-2006 Red Hat, Inc. [ 0.400301] msgmni has been set to 500 [ 0.412818] io scheduler noop registered [ 0.416325] io scheduler deadline registered (default)
so the driver seems to be working as expected.
---
Trivial platform driver for Soekris Engineering net5501 single-board computer. Probes well-known locations in ROM for BIOS signature to confirm correct platform. Registers 1 LED and 1 GPIO-based button (typically used for soft reset).
Changes in v2 per Andrew:
Bug out early if ioremap() fails.
Elevate warning message for ioremap() failure to KERN_ERR. Remove duplicated calls to is_geode() and net5501_register().
Other changes in v2:
Prefix printk() messages with KBUILD_MODNAME.
Add missing <linux/module.h> #include.
Add missing newline to ioremap() error message.
--- arch/x86/Kconfig | 6 ++ arch/x86/platform/geode/Makefile | 1 + arch/x86/platform/geode/net5501.c | 154 +++++++++++++++++++++++++++++++++++++ drivers/leds/leds-net5501.c | 97 ----------------------- 4 files changed, 161 insertions(+), 97 deletions(-) create mode 100644 arch/x86/platform/geode/net5501.c delete mode 100644 drivers/leds/leds-net5501.c
arch/x86/Kconfig +6 -0
@@ -2174,6 +2174,12 @@ config GEOS ---help--- This option enables system support for the Traverse Technologies GEOS. +config NET5501 + bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)" + select GPIOLIB + ---help--- + This option enables system support for the Soekris Engineering net5501. + endif # X86_32 config AMD_NB
arch/x86/platform/geode/Makefile +1 -0
@@ -1,2 +1,3 @@ obj-$(CONFIG_ALIX) += alix.o +obj-$(CONFIG_NET5501) += net5501.o obj-$(CONFIG_GEOS) += geos.o
arch/x86/platform/geode/net5501.c new file +154 -0
154 lines not on this page · raw message
drivers/leds/leds-net5501.c deleted +0 -97
97 lines not on this page · raw message
Signature · 1 line
1.7.7.5
Quoted 6 lines · On Fri, 27 Jan 2012 22:02:19 -0700 Philip Prindeville…
---
Trivial platform driver for Soekris Engineering net5501 single-board computer. Probes well-known locations in ROM for BIOS signature to confirm correct platform. Registers 1 LED and 1 GPIO-based button (typically used for soft reset).
Quoted 6 lines
...
arch/x86/Kconfig | 6 ++ arch/x86/platform/geode/Makefile | 1 + arch/x86/platform/geode/net5501.c | 154 +++++++++++++++++++++++++++++++++++++ drivers/leds/leds-net5501.c | 97 -----------------------
Forgot to clean up the leftovers:
make[2]: *** No rule to make target drivers/leds/leds-net5501.c', needed by drivers/leds/leds-net5501.o'. Stop.
Also, are you sure that the new Kconfig entry is sufficient? The old driver had more dependencies (GPIO_CS5535 and LEDS_TRIGGERS) and selects LEDS_TRIGGER_DEFAULT_ON. Should the new driver be doing such things?
drivers/leds/Kconfig renamed from drivers/leds/Kconfig~net5501-platform-driver-for-soekris-engineering-net5501-single-board-computer-fix +0 -10
@@ -89,16 +89,6 @@ config LEDS_NET48XX This option enables support for the Soekris net4801 and net4826 error LED. -config LEDS_NET5501 - tristate "LED Support for Soekris net5501 series Error LED" - depends on LEDS_TRIGGERS - depends on X86 && GPIO_CS5535 - select LEDS_TRIGGER_DEFAULT_ON - default n - help - Add support for the Soekris net5501 board (detection, error led - and GPIO). - config LEDS_FSG tristate "LED Support for the Freecom FSG-3" depends on LEDS_CLASS
drivers/leds/Makefile renamed from drivers/leds/Makefile~net5501-platform-driver-for-soekris-engineering-net5501-single-board-computer-fix +0 -1
@@ -14,7 +14,6 @@ obj-$(CONFIG_LEDS_MIKROTIK_RB532) += led obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o 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_COBALT_QUBE) += leds-cobalt-qube.o obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
_
Quoted 16 lines · Andrew Morton
Quoted 6 lines · On Fri, 27 Jan 2012 22:02:19 -0700 Philip Prindeville…
---
Trivial platform driver for Soekris Engineering net5501 single-board computer. Probes well-known locations in ROM for BIOS signature to confirm correct platform. Registers 1 LED and 1 GPIO-based button (typically used for soft reset).Quoted 6 lines
...
arch/x86/Kconfig | 6 ++ arch/x86/platform/geode/Makefile | 1 + arch/x86/platform/geode/net5501.c | 154 +++++++++++++++++++++++++++++++++++++ drivers/leds/leds-net5501.c | 97 -----------------------
Quoted 8 lines
Forgot to clean up the leftovers:
make[2]: *** No rule to make target
drivers/leds/leds-net5501.c', needed bydrivers/leds/leds-net5501.o'. Stop.Also, are you sure that the new
Kconfigentry is sufficient? The old driver had more dependencies (GPIO_CS5535andLEDS_TRIGGERS) and selectsLEDS_TRIGGER_DEFAULT_ON. Should the new driver be doing such things?
Thanks for getting that. Overlooked it.
The thing about the way the platform driver is now is it can wait until the subordinate modules get loaded and it will register the relevant devices then...
It's conceivable that one might want LEDs but not the reset button, or vice versa.
It might make sense to have the GPIO_CS5535 driver be selected, but also I'm good with the platform driver being statically linked in, and the LED or GPIO drivers being insmod'd.
I figure best to KISS and allow people to have as small a static kernel as they want, and then build up functionality with modules.
-Philip
Quoted 35 lines
drivers/leds/Kconfig renamed from drivers/leds/Kconfig~net5501-platform-driver-for-soekris-engineering-net5501-single-board-computer-fix +0
-10@@ -89,16 +89,6 @@ config LEDS_NET48XX This option enables support for the Soekris net4801 and net4826 error LED. -config LEDS_NET5501 - tristate "LED Support for Soekris net5501 series Error LED" - depends on LEDS_TRIGGERS - depends on X86 && GPIO_CS5535 - select LEDS_TRIGGER_DEFAULT_ON - default n - help - Add support for the Soekris net5501 board (detection, error led - and GPIO). - config LEDS_FSG tristate "LED Support for the Freecom FSG-3" depends on LEDS_CLASSdrivers/leds/Makefile renamed from drivers/leds/Makefile~net5501-platform-driver-for-soekris-engineering-net5501-single-board-computer-fix +0
-1@@ -14,7 +14,6 @@ obj-$(CONFIG_LEDS_MIKROTIK_RB532) += led obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o 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_COBALT_QUBE) += leds-cobalt-qube.o obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o_