projects
/
openwrt
/
staging
/
dedeckeh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
74dfd77
)
register gpiochip earlier, allowing gpio-based runtime detection to be performed...
author
Florian Fainelli
<florian@openwrt.org>
Thu, 4 Jun 2009 09:59:28 +0000
(09:59 +0000)
committer
Florian Fainelli
<florian@openwrt.org>
Thu, 4 Jun 2009 09:59:28 +0000
(09:59 +0000)
SVN-Revision: 16328
target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
patch
|
blob
|
history
target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c
patch
|
blob
|
history
target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
patch
|
blob
|
history
diff --git
a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
index b78d3fdafa1f5ec01e517e40d8f85e959355f1fc..997fcaa439ba3f14310b0b31db9e12acf32f6647 100644
(file)
--- a/
target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
+++ b/
target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
@@
-120,9
+120,8
@@
static struct gpio_chip bcm63xx_gpio_chip = {
.ngpio = BCM63XX_GPIO_COUNT,
};
.ngpio = BCM63XX_GPIO_COUNT,
};
-
static
int __init bcm63xx_gpio_init(void)
+int __init bcm63xx_gpio_init(void)
{
printk(KERN_INFO "registering %d GPIOs\n", BCM63XX_GPIO_COUNT);
return gpiochip_add(&bcm63xx_gpio_chip);
}
{
printk(KERN_INFO "registering %d GPIOs\n", BCM63XX_GPIO_COUNT);
return gpiochip_add(&bcm63xx_gpio_chip);
}
-arch_initcall(bcm63xx_gpio_init);
diff --git
a/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c
b/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c
index db0ef555a8ae2310e6bb0b354dddb5d7aca9ca4c..964a1479c6b6bcf61122cd1c7d1a7ac87efde6c9 100644
(file)
--- a/
target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c
+++ b/
target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c
@@
-13,6
+13,7
@@
#include <bcm63xx_cpu.h>
#include <bcm63xx_io.h>
#include <bcm63xx_regs.h>
#include <bcm63xx_cpu.h>
#include <bcm63xx_io.h>
#include <bcm63xx_regs.h>
+#include <bcm63xx_gpio.h>
void __init prom_init(void)
{
void __init prom_init(void)
{
@@
-42,6
+43,9
@@
void __init prom_init(void)
/* assign command line from kernel config */
strcpy(arcs_cmdline, CONFIG_CMDLINE);
/* assign command line from kernel config */
strcpy(arcs_cmdline, CONFIG_CMDLINE);
+ /* register gpiochip */
+ bcm63xx_gpio_init();
+
/* do low level board init */
board_prom_init();
}
/* do low level board init */
board_prom_init();
}
diff --git
a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
index 72cee75f0a43ae2a966eb2de293e3fead05bb071..7f5d8e87d0f4e35d51f79e78877d1ca99a4b6420 100644
(file)
--- a/
target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
+++ b/
target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
@@
-1,6
+1,10
@@
#ifndef BCM63XX_GPIO_H
#define BCM63XX_GPIO_H
#ifndef BCM63XX_GPIO_H
#define BCM63XX_GPIO_H
+#include <linux/init.h>
+
+int __init bcm63xx_gpio_init(void);
+
/* all helpers will BUG() if gpio count is >= 37. */
#define BCM63XX_GPIO_COUNT 37
/* all helpers will BUG() if gpio count is >= 37. */
#define BCM63XX_GPIO_COUNT 37