diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 12:00:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 12:00:23 -0700 |
commit | 1a2217a9516b134e0a0e54cb4629e1e075d97b17 (patch) | |
tree | 044db08962769ede5a6a40d331c19edd43bdbac4 /arch/avr32/boards/atngw100/setup.c | |
parent | 46b5e34029fef7a042f3ff16e319e737257e5c7b (diff) | |
parent | 6eb3ebe04da4c8f31d776217b0b76ca3d00f20b1 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Fix build failures in board code
avr32: Allow selecting multiple pins at once
avr32: Minor pm_power_off cleanup
avr32: Implement {read,write}[bwl]_be
avr32: Replace static clock list with dynamic linked list
avr32: Use platform_driver_probe for pdc platform driver
avr32: Use platform_driver_probe for pio platform driver
avr32: Provide a way to deselect pins in the portmux
ngw100: export J15 through sysfs
avr32: Allow fine-grained control over LCDC pins
avr32: added mem kernel command line option support
Add kernel support for oprofile callgraphs on AVR32
avr32: use the new byteorder headers
Diffstat (limited to 'arch/avr32/boards/atngw100/setup.c')
-rw-r--r-- | arch/avr32/boards/atngw100/setup.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c index f3085208959..6c54580a66d 100644 --- a/arch/avr32/boards/atngw100/setup.c +++ b/arch/avr32/boards/atngw100/setup.c @@ -9,6 +9,7 @@ */ #include <linux/clk.h> #include <linux/etherdevice.h> +#include <linux/gpio.h> #include <linux/irq.h> #include <linux/i2c.h> #include <linux/i2c-gpio.h> @@ -193,7 +194,7 @@ static int __init atngw100_init(void) * PB28/EXTINT3 doesn't; it should be SMBALERT# (for PMBus), * but it's not available off-board. */ - at32_select_periph(GPIO_PIN_PB(28), 0, AT32_GPIOF_PULLUP); + at32_select_periph(GPIO_PIOB_BASE, 1 << 28, 0, AT32_GPIOF_PULLUP); at32_select_gpio(i2c_gpio_data.sda_pin, AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH); at32_select_gpio(i2c_gpio_data.scl_pin, @@ -207,6 +208,15 @@ postcore_initcall(atngw100_init); static int __init atngw100_arch_init(void) { + /* PB30 is the otherwise unused jumper on the mainboard, with an + * external pullup; the jumper grounds it. Use it however you + * like, including letting U-Boot or Linux tweak boot sequences. + */ + at32_select_gpio(GPIO_PIN_PB(30), 0); + gpio_request(GPIO_PIN_PB(30), "j15"); + gpio_direction_input(GPIO_PIN_PB(30)); + gpio_export(GPIO_PIN_PB(30), false); + /* set_irq_type() after the arch_initcall for EIC has run, and * before the I2C subsystem could try using this IRQ. */ |