general cleanup
SVN-Revision: 22352
This commit is contained in:
Claudio Mignanti
parent
4a82997327
commit
d4d6fefdf2
11 changed files with 0 additions and 14249 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1,229 +0,0 @@
|
|||
--- a/arch/arm/mach-at91/Kconfig
|
||||
+++ b/arch/arm/mach-at91/Kconfig
|
||||
@@ -151,6 +151,12 @@ config MACH_TT9200
|
||||
help
|
||||
Select this if you are using Toptech's TT9200 board.
|
||||
|
||||
+config MACH_VLINK
|
||||
+ bool "Figment Design Labs VersaLink"
|
||||
+ depends on ARCH_AT91RM9200
|
||||
+ help
|
||||
+ Select this if you are using FDL's VersaLink board
|
||||
+
|
||||
endif
|
||||
|
||||
# ----------------------------------------------------------
|
||||
--- a/arch/arm/mach-at91/Makefile
|
||||
+++ b/arch/arm/mach-at91/Makefile
|
||||
@@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200) += board-kb920
|
||||
obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o
|
||||
obj-$(CONFIG_MACH_KAFA) += board-kafa.o
|
||||
obj-$(CONFIG_MACH_CHUB) += board-chub.o
|
||||
+obj-$(CONFIG_MACH_VLINK) += board-vlink.o
|
||||
obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o
|
||||
obj-$(CONFIG_MACH_HOMEMATIC) += board-homematic.o
|
||||
obj-$(CONFIG_MACH_ECBAT91) += board-ecbat91.o
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-at91/board-vlink.c
|
||||
@@ -0,0 +1,201 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/mach-at91/board-vlink.c
|
||||
+ *
|
||||
+ * Copyright (C) 2005 SAN People
|
||||
+ * Copyright (C) 2006,2007 Guthrie Consulting
|
||||
+ *
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation; either version 2 of the License, or
|
||||
+ * (at your option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+ */
|
||||
+
|
||||
+#include <linux/types.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/mm.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/spi/spi.h>
|
||||
+#include <linux/mtd/physmap.h>
|
||||
+
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/setup.h>
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/irq.h>
|
||||
+
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/map.h>
|
||||
+#include <asm/mach/irq.h>
|
||||
+
|
||||
+#include <asm/arch/board.h>
|
||||
+#include <asm/arch/gpio.h>
|
||||
+#include <asm/arch/at91rm9200_mc.h>
|
||||
+
|
||||
+#include "generic.h"
|
||||
+
|
||||
+
|
||||
+static void __init vlink_map_io(void)
|
||||
+{
|
||||
+ /* Initialize processor: 18.432 MHz crystal */
|
||||
+ at91rm9200_initialize(18432000, AT91RM9200_PQFP);
|
||||
+
|
||||
+ /* Setup the LEDs */
|
||||
+ at91_init_leds(AT91_PIN_PC14, AT91_PIN_PC15);
|
||||
+
|
||||
+ /* Setup serial ports */
|
||||
+
|
||||
+ /* DBGU on ttyS0. (RX and TX only) */
|
||||
+ at91_register_uart(0, 0, 0);
|
||||
+
|
||||
+ /* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DSR, DTR, DCD, RI) */
|
||||
+ at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS
|
||||
+ | ATMEL_UART_RTS | ATMEL_UART_DSR | ATMEL_UART_DTR
|
||||
+ | ATMEL_UART_DCD | ATMEL_UART_RI);
|
||||
+
|
||||
+ /* USART0 on ttys2. (Rx, Tx, CTS, RTS, DTR, DCD, RI) */
|
||||
+ at91_register_uart(AT91RM9200_ID_US0, 2, ATMEL_UART_CTS
|
||||
+ | ATMEL_UART_RTS | ATMEL_UART_DTR | ATMEL_UART_DCD | ATMEL_UART_RI);
|
||||
+
|
||||
+ /* USART3 on ttyS3. (Rx, Tx, CTS, RTS, DTR, DCD, RI) */
|
||||
+ at91_register_uart(AT91RM9200_ID_US3, 3, ATMEL_UART_CTS
|
||||
+ | ATMEL_UART_RTS | ATMEL_UART_DTR | ATMEL_UART_DCD | ATMEL_UART_RI);
|
||||
+
|
||||
+ /* USART2 on ttyS4. (Rx and Tx only) */
|
||||
+ at91_register_uart(AT91RM9200_ID_US2, 4, 0);
|
||||
+
|
||||
+ /* Console on ttyS0 (ie DBGU) */
|
||||
+ at91_set_serial_console(0);
|
||||
+}
|
||||
+
|
||||
+static void __init vlink_init_irq(void)
|
||||
+{
|
||||
+ at91rm9200_init_interrupts(NULL);
|
||||
+}
|
||||
+
|
||||
+static struct at91_eth_data __initdata vlink_eth_data = {
|
||||
+ .phy_irq_pin = AT91_PIN_PC4,
|
||||
+ .is_rmii = 1,
|
||||
+};
|
||||
+
|
||||
+static struct at91_usbh_data __initdata vlink_usbh_data = {
|
||||
+ .ports = 1,
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+static struct at91_udc_data __initdata vlink_udc_data = {
|
||||
+ .vbus_pin = AT91_PIN_PD4,
|
||||
+ .pullup_pin = AT91_PIN_PD5,
|
||||
+};
|
||||
+*/
|
||||
+
|
||||
+static struct at91_mmc_data __initdata vlink_mmc_data = {
|
||||
+// .det_pin = AT91_PIN_PB27,
|
||||
+ .slot_b = 0,
|
||||
+ .wire4 = 1,
|
||||
+// .wp_pin = AT91_PIN_PA17,
|
||||
+};
|
||||
+
|
||||
+static struct spi_board_info vlink_spi_devices[] = {
|
||||
+ { /* DataFlash chip */
|
||||
+ .modalias = "mtd_dataflash",
|
||||
+ .chip_select = 0,
|
||||
+ .max_speed_hz = 15 * 1000 * 1000,
|
||||
+ },
|
||||
+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
|
||||
+ { /* DataFlash card */
|
||||
+ .modalias = "mtd_dataflash",
|
||||
+ .chip_select = 3,
|
||||
+ .max_speed_hz = 15 * 1000 * 1000,
|
||||
+ },
|
||||
+#endif
|
||||
+};
|
||||
+
|
||||
+/*static struct at91_gpio_led vlink_leds[] = {
|
||||
+ {
|
||||
+ .name = "led0",
|
||||
+ .gpio = AT91_PIN_PC14,
|
||||
+ .trigger = "heartbeat",
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "led1",
|
||||
+ .gpio = AT91_PIN_PC15,
|
||||
+ .trigger = "timer",
|
||||
+ }
|
||||
+};
|
||||
+*/
|
||||
+
|
||||
+static void __init vlink_board_init(void)
|
||||
+{
|
||||
+ /* Serial */
|
||||
+ at91_add_device_serial();
|
||||
+ /* Ethernet */
|
||||
+ at91_add_device_eth(&vlink_eth_data);
|
||||
+ /* USB Host */
|
||||
+ at91_add_device_usbh(&vlink_usbh_data);
|
||||
+ /* USB Device */
|
||||
+// at91_add_device_udc(&vlink_udc_data);
|
||||
+// at91_set_multi_drive(vlink_udc_data.pullup_pin, 1); /* pullup_pin is connected to reset */
|
||||
+ /* I2C */
|
||||
+// at91_add_device_i2c();
|
||||
+ /* SPI */
|
||||
+ at91_add_device_spi(vlink_spi_devices, ARRAY_SIZE(vlink_spi_devices));
|
||||
+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
|
||||
+ /* DataFlash card */
|
||||
+// at91_set_gpio_output(AT91_PIN_PB22, 0);
|
||||
+#else
|
||||
+ /* MMC */
|
||||
+// at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */
|
||||
+ at91_add_device_mmc(0, &vlink_mmc_data);
|
||||
+#endif
|
||||
+ /* LEDs */
|
||||
+// at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
|
||||
+
|
||||
+/* Other LED's */
|
||||
+ at91_set_gpio_output(AT91_PIN_PC7, 1); // LED FRONT AP1
|
||||
+ at91_set_gpio_output(AT91_PIN_PC8, 1); // LED FRONT BP1
|
||||
+ at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
|
||||
+ at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
|
||||
+ at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
|
||||
+ at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
|
||||
+
|
||||
+/* SIM Cards */
|
||||
+ at91_set_gpio_output(AT91_PIN_PB9, 1); // ENBSC3
|
||||
+ at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
|
||||
+ at91_set_gpio_output(AT91_PIN_PB11, 1); // ENBSC1
|
||||
+
|
||||
+/* GSM Module Control */
|
||||
+ at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
|
||||
+
|
||||
+/* Test jig presence detection */
|
||||
+ at91_set_gpio_input(AT91_PIN_PB8, 1); // JIGPRESENT
|
||||
+
|
||||
+/* Power indicator */
|
||||
+ at91_set_gpio_input(AT91_PIN_PB22, 1); // PWR_IND
|
||||
+
|
||||
+/* USB Device control */
|
||||
+ at91_set_gpio_input(AT91_PIN_PB27, 1); // UDB_CNX
|
||||
+ at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
|
||||
+ at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
|
||||
+
|
||||
+}
|
||||
+
|
||||
+MACHINE_START(VLINK, "FDL VersaLink")
|
||||
+ /* Maintainer: Guthrie Consulting */
|
||||
+ .phys_io = AT91_BASE_SYS,
|
||||
+ .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
|
||||
+ .boot_params = AT91_SDRAM_BASE + 0x100,
|
||||
+ .timer = &at91rm9200_timer,
|
||||
+ .map_io = vlink_map_io,
|
||||
+ .init_irq = vlink_init_irq,
|
||||
+ .init_machine = vlink_board_init,
|
||||
+MACHINE_END
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
--- a/arch/arm/mach-at91/at91rm9200_devices.c
|
||||
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
|
||||
@@ -717,6 +717,26 @@ static void __init at91_add_device_watch
|
||||
static void __init at91_add_device_watchdog(void) {}
|
||||
#endif
|
||||
|
||||
+/* --------------------------------------------------------------------
|
||||
+ * LEDs
|
||||
+ * -------------------------------------------------------------------- */
|
||||
+
|
||||
+#if defined(CONFIG_LEDS)
|
||||
+u8 at91_leds_cpu;
|
||||
+u8 at91_leds_timer;
|
||||
+
|
||||
+void __init at91_init_leds(u8 cpu_led, u8 timer_led)
|
||||
+{
|
||||
+ /* Enable GPIO to access the LEDs */
|
||||
+ at91_set_gpio_output(cpu_led, 1);
|
||||
+ at91_set_gpio_output(timer_led, 1);
|
||||
+
|
||||
+ at91_leds_cpu = cpu_led;
|
||||
+ at91_leds_timer = timer_led;
|
||||
+}
|
||||
+#else
|
||||
+void __init at91_init_leds(u8 cpu_led, u8 timer_led) {}
|
||||
+#endif
|
||||
|
||||
/* --------------------------------------------------------------------
|
||||
* SSC -- Synchronous Serial Controller
|
||||
--- a/arch/arm/mach-at91/Makefile
|
||||
+++ b/arch/arm/mach-at91/Makefile
|
||||
@@ -60,7 +60,12 @@ obj-$(CONFIG_MACH_AT91CAP9ADK) += board-
|
||||
obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
|
||||
|
||||
# Drivers
|
||||
-obj-y += leds.o
|
||||
+ifeq ($(CONFIG_MACH_VLINK),y)
|
||||
+led-$(CONFIG_MACH_VLINK) += vlink_leds.o
|
||||
+else
|
||||
+led-y += leds.o
|
||||
+endif
|
||||
+obj-y += $(led-y)
|
||||
obj-$(CONFIG_FB_S1D13XXX) += ics1523.o
|
||||
|
||||
# Power Management
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-at91/vlink_leds.c
|
||||
@@ -0,0 +1,105 @@
|
||||
+/*
|
||||
+ * LED driver for Atmel AT91-based boards.
|
||||
+ *
|
||||
+ * Copyright (C) SAN People (Pty) Ltd
|
||||
+ * Modified for FDL VersaLink Copyright (C) Guthrie Consulting
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License
|
||||
+ * as published by the Free Software Foundation; either version
|
||||
+ * 2 of the License, or (at your option) any later version.
|
||||
+*/
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
+
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/leds.h>
|
||||
+#include <asm/arch/board.h>
|
||||
+#include <asm/arch/gpio.h>
|
||||
+
|
||||
+
|
||||
+static inline void at91_led_on(unsigned int led)
|
||||
+{
|
||||
+ at91_set_gpio_value(led, 0);
|
||||
+}
|
||||
+
|
||||
+static inline void at91_led_off(unsigned int led)
|
||||
+{
|
||||
+ at91_set_gpio_value(led, 1);
|
||||
+}
|
||||
+
|
||||
+static inline void at91_led_toggle(unsigned int led)
|
||||
+{
|
||||
+ unsigned long is_off = at91_get_gpio_value(led);
|
||||
+ if (is_off) {
|
||||
+ at91_led_on(led);
|
||||
+ at91_led_off(at91_leds_cpu);
|
||||
+ }
|
||||
+ else {
|
||||
+ at91_led_on(at91_leds_cpu);
|
||||
+ at91_led_off(led);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * Handle LED events.
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * VersaLink has a single bi-coloured LED which changes colour when the
|
||||
+ * polarity is reversed
|
||||
+ */
|
||||
+static void at91_leds_event(led_event_t evt)
|
||||
+{
|
||||
+ unsigned long flags;
|
||||
+
|
||||
+ local_irq_save(flags);
|
||||
+
|
||||
+ switch(evt) {
|
||||
+ case led_start: /* System startup */
|
||||
+ at91_led_toggle(at91_leds_timer);
|
||||
+ break;
|
||||
+
|
||||
+ case led_stop: /* System stop / suspend */
|
||||
+ at91_led_toggle(at91_leds_timer);
|
||||
+ break;
|
||||
+
|
||||
+#ifdef CONFIG_LEDS_TIMER
|
||||
+ case led_timer: /* Every 50 timer ticks */
|
||||
+ at91_led_toggle(at91_leds_timer);
|
||||
+ break;
|
||||
+#endif
|
||||
+
|
||||
+#ifdef CONFIG_LEDS_CPU
|
||||
+ case led_idle_start: /* Entering idle state */
|
||||
+ at91_led_toggle(at91_leds_timer);
|
||||
+ break;
|
||||
+
|
||||
+ case led_idle_end: /* Exit idle state */
|
||||
+ at91_led_toggle(at91_leds_timer);
|
||||
+ break;
|
||||
+#endif
|
||||
+
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ local_irq_restore(flags);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static int __init leds_init(void)
|
||||
+{
|
||||
+ if (!at91_leds_timer || !at91_leds_cpu)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ leds_event = at91_leds_event;
|
||||
+
|
||||
+ leds_event(led_start);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+__initcall(leds_init);
|
||||
--- a/include/asm-arm/arch-at91/board.h
|
||||
+++ b/include/asm-arm/arch-at91/board.h
|
||||
@@ -162,6 +162,11 @@ extern void __init at91_add_device_ac97(
|
||||
/* ISI */
|
||||
extern void __init at91_add_device_isi(void);
|
||||
|
||||
+ /* LEDs */
|
||||
+extern u8 at91_leds_cpu;
|
||||
+extern u8 at91_leds_timer;
|
||||
+extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);
|
||||
+
|
||||
/* Touchscreen Controller */
|
||||
extern void __init at91_add_device_tsadcc(void);
|
||||
|
||||
|
|
@ -1,546 +0,0 @@
|
|||
--- a/arch/arm/mach-at91/board-vlink.c
|
||||
+++ b/arch/arm/mach-at91/board-vlink.c
|
||||
@@ -99,7 +99,7 @@ static struct at91_udc_data __initdata v
|
||||
*/
|
||||
|
||||
static struct at91_mmc_data __initdata vlink_mmc_data = {
|
||||
-// .det_pin = AT91_PIN_PB27,
|
||||
+// .det_pin = AT91_PIN_PC10,
|
||||
.slot_b = 0,
|
||||
.wire4 = 1,
|
||||
// .wp_pin = AT91_PIN_PA17,
|
||||
@@ -136,6 +136,7 @@ static struct spi_board_info vlink_spi_d
|
||||
|
||||
static void __init vlink_board_init(void)
|
||||
{
|
||||
+ int v100;
|
||||
/* Serial */
|
||||
at91_add_device_serial();
|
||||
/* Ethernet */
|
||||
@@ -157,36 +158,66 @@ static void __init vlink_board_init(void
|
||||
// at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */
|
||||
at91_add_device_mmc(0, &vlink_mmc_data);
|
||||
#endif
|
||||
+
|
||||
+// Set VLink version PIN as an input with pull-up (V1.5 = GND)
|
||||
+ at91_set_gpio_input(AT91_PIN_PC2, 1);
|
||||
+ v100 = at91_get_gpio_value(AT91_PIN_PC2);
|
||||
+
|
||||
/* LEDs */
|
||||
// at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
|
||||
|
||||
/* Other LED's */
|
||||
- at91_set_gpio_output(AT91_PIN_PC7, 1); // LED FRONT AP1
|
||||
- at91_set_gpio_output(AT91_PIN_PC8, 1); // LED FRONT BP1
|
||||
- at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
|
||||
- at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
|
||||
- at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
|
||||
- at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
|
||||
+ at91_set_gpio_output(AT91_PIN_PC7, 1); // LED FRONT AP1
|
||||
+ at91_set_gpio_output(AT91_PIN_PC8, 1); // LED FRONT BP1
|
||||
+ at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
|
||||
+ at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
|
||||
+ at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
|
||||
+ at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
|
||||
+
|
||||
+/* Test jig presence detection */
|
||||
+ at91_set_gpio_input(AT91_PIN_PB8, 1); // JIGPRESENT
|
||||
|
||||
/* SIM Cards */
|
||||
- at91_set_gpio_output(AT91_PIN_PB9, 1); // ENBSC3
|
||||
- at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
|
||||
- at91_set_gpio_output(AT91_PIN_PB11, 1); // ENBSC1
|
||||
+ if (at91_get_gpio_value(AT91_PIN_PB8)) {
|
||||
+ at91_set_gpio_output(AT91_PIN_PB11, 0);
|
||||
+ if (v100)
|
||||
+ at91_set_gpio_output(AT91_PIN_PB9, 1);
|
||||
+ else
|
||||
+ at91_set_gpio_output(AT91_PIN_PC13, 1);
|
||||
+ } else {
|
||||
+ at91_set_gpio_output(AT91_PIN_PB11, 1);
|
||||
+ if (v100)
|
||||
+ at91_set_gpio_output(AT91_PIN_PB9, 0);
|
||||
+ else
|
||||
+ at91_set_gpio_output(AT91_PIN_PC13, 0);
|
||||
+ }
|
||||
|
||||
-/* GSM Module Control */
|
||||
- at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
|
||||
+ at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
|
||||
|
||||
-/* Test jig presence detection */
|
||||
- at91_set_gpio_input(AT91_PIN_PB8, 1); // JIGPRESENT
|
||||
+/* GSM Module Control */
|
||||
+ at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
|
||||
|
||||
/* Power indicator */
|
||||
- at91_set_gpio_input(AT91_PIN_PB22, 1); // PWR_IND
|
||||
+ at91_set_gpio_input(AT91_PIN_PB22, 1); // PWR_IND
|
||||
|
||||
/* USB Device control */
|
||||
- at91_set_gpio_input(AT91_PIN_PB27, 1); // UDB_CNX
|
||||
- at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
|
||||
- at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
|
||||
-
|
||||
+ at91_set_gpio_input(AT91_PIN_PB27, 1); // UDB_CNX
|
||||
+ at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
|
||||
+ at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
|
||||
+
|
||||
+/* USB Power controls */
|
||||
+
|
||||
+ if (v100)
|
||||
+ { // V100
|
||||
+ at91_set_gpio_input (AT91_PIN_PC12, 1); // SD Card present
|
||||
+ }
|
||||
+ else
|
||||
+ { // DO special things for V1.5
|
||||
+ at91_set_gpio_output(AT91_PIN_PB9 , 0); // USB suspend
|
||||
+ at91_set_gpio_input (AT91_PIN_PC10, 1); // SD Card present
|
||||
+ at91_set_gpio_output(AT91_PIN_PC11, 0); // USB Vin CTRL for modules onboard
|
||||
+ at91_set_gpio_output(AT91_PIN_PC12, 0); // SIM control
|
||||
+ }
|
||||
}
|
||||
|
||||
MACHINE_START(VLINK, "FDL VersaLink")
|
||||
--- a/arch/arm/mach-at91/gpio.c
|
||||
+++ b/arch/arm/mach-at91/gpio.c
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
static struct at91_gpio_bank *gpio;
|
||||
static int gpio_banks;
|
||||
+static u32 pio_gpio_pin[4] = { 0, 0, 0, 0 };
|
||||
|
||||
|
||||
static inline void __iomem *pin_to_controller(unsigned pin)
|
||||
@@ -71,9 +72,13 @@ int __init_or_module at91_set_GPIO_perip
|
||||
{
|
||||
void __iomem *pio = pin_to_controller(pin);
|
||||
unsigned mask = pin_to_mask(pin);
|
||||
+ int bank = (pin - PIN_BASE) / 32;
|
||||
|
||||
if (!pio)
|
||||
return -EINVAL;
|
||||
+
|
||||
+ pio_gpio_pin[bank] |= mask;
|
||||
+
|
||||
__raw_writel(mask, pio + PIO_IDR);
|
||||
__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
|
||||
__raw_writel(mask, pio + PIO_PER);
|
||||
@@ -130,10 +135,13 @@ int __init_or_module at91_set_gpio_input
|
||||
{
|
||||
void __iomem *pio = pin_to_controller(pin);
|
||||
unsigned mask = pin_to_mask(pin);
|
||||
+ int bank = (pin - PIN_BASE) / 32;
|
||||
|
||||
if (!pio)
|
||||
return -EINVAL;
|
||||
|
||||
+ pio_gpio_pin[bank] |= mask;
|
||||
+
|
||||
__raw_writel(mask, pio + PIO_IDR);
|
||||
__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
|
||||
__raw_writel(mask, pio + PIO_ODR);
|
||||
@@ -151,10 +159,13 @@ int __init_or_module at91_set_gpio_outpu
|
||||
{
|
||||
void __iomem *pio = pin_to_controller(pin);
|
||||
unsigned mask = pin_to_mask(pin);
|
||||
+ int bank = (pin - PIN_BASE) / 32;
|
||||
|
||||
if (!pio)
|
||||
return -EINVAL;
|
||||
|
||||
+ pio_gpio_pin[bank] |= mask;
|
||||
+
|
||||
__raw_writel(mask, pio + PIO_IDR);
|
||||
__raw_writel(mask, pio + PIO_PUDR);
|
||||
__raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
|
||||
@@ -262,6 +273,18 @@ int at91_get_gpio_value(unsigned pin)
|
||||
}
|
||||
EXPORT_SYMBOL(at91_get_gpio_value);
|
||||
|
||||
+int at91_is_pin_gpio(unsigned pin)
|
||||
+{
|
||||
+ void __iomem *pio = pin_to_controller(pin);
|
||||
+ unsigned mask = pin_to_mask(pin);
|
||||
+ int bank = (pin - PIN_BASE) / 32;
|
||||
+
|
||||
+ if (!pio)
|
||||
+ return -EINVAL;
|
||||
+ return (pio_gpio_pin[bank] & mask) != 0;
|
||||
+}
|
||||
+EXPORT_SYMBOL(at91_is_pin_gpio);
|
||||
+
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
--- a/drivers/char/Kconfig
|
||||
+++ b/drivers/char/Kconfig
|
||||
@@ -1072,5 +1072,12 @@ config AT91_SPIDEV
|
||||
The SPI driver gives user mode access to this serial
|
||||
bus on the AT91RM9200 processor.
|
||||
|
||||
+config AT91_VLIO
|
||||
+ tristate "Versalink LED and GPIO interface"
|
||||
+ depends on ARCH_AT91RM9200 && MACH_VLINK
|
||||
+ default n
|
||||
+ help
|
||||
+ Provides a handler GPIO's in userspace
|
||||
+
|
||||
endmenu
|
||||
|
||||
--- a/drivers/char/Makefile
|
||||
+++ b/drivers/char/Makefile
|
||||
@@ -100,6 +100,7 @@ obj-$(CONFIG_GPIO_TB0219) += tb0219.o
|
||||
obj-$(CONFIG_TELCLOCK) += tlclk.o
|
||||
obj-$(CONFIG_AT91_SPI) += at91_spi.o
|
||||
obj-$(CONFIG_AT91_SPIDEV) += at91_spidev.o
|
||||
+obj-$(CONFIG_AT91_VLIO) += vlink_giu.o
|
||||
|
||||
obj-$(CONFIG_MWAVE) += mwave/
|
||||
obj-$(CONFIG_AGP) += agp/
|
||||
--- /dev/null
|
||||
+++ b/drivers/char/vlink_giu.c
|
||||
@@ -0,0 +1,333 @@
|
||||
+/*
|
||||
+ * Driver for FDL Versalink GPIO
|
||||
+ *
|
||||
+ * Copyright (C) 2005 Guthrie Consulting
|
||||
+ * Author: Hamish Guthrie <hamish@prodigi.ch>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation; either version 2 of the License, or
|
||||
+ * (at your option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+ */
|
||||
+
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/moduleparam.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/slab.h>
|
||||
+#include <linux/fs.h>
|
||||
+#include <linux/errno.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/types.h>
|
||||
+#include <linux/proc_fs.h>
|
||||
+#include <linux/fcntl.h>
|
||||
+#include <linux/seq_file.h>
|
||||
+#include <linux/cdev.h>
|
||||
+#include <asm/arch/gpio.h>
|
||||
+#include <asm/uaccess.h>
|
||||
+
|
||||
+static int major; /* default is dynamic major device number */
|
||||
+module_param(major, int, 0);
|
||||
+MODULE_PARM_DESC(major, "Major device number");
|
||||
+
|
||||
+#define VIO_NR_DEVS 96
|
||||
+
|
||||
+struct vio_dev {
|
||||
+ struct cdev cdev;
|
||||
+};
|
||||
+
|
||||
+struct vio_dev *vio_devices;
|
||||
+static struct class *vio_class;
|
||||
+
|
||||
+#define MAX_VIO_NAMES 24
|
||||
+typedef struct
|
||||
+{
|
||||
+ char port;
|
||||
+ char pin;
|
||||
+ char name100[10];
|
||||
+ char name150[10];
|
||||
+} VIO_NAMES;
|
||||
+
|
||||
+VIO_NAMES VioName[MAX_VIO_NAMES] =
|
||||
+{ // Port, Pin, V100, V150
|
||||
+ {'A',19,"port1DTR" ,"port1DTR"},
|
||||
+ {'A',24,"port2DTR" ,"port2DTR"},
|
||||
+ {'B',8, "jigOn" ,"jigOn"} ,
|
||||
+ {'B',9, "enbSC3" ,"usbSUSPND"},
|
||||
+ {'B',10,"enbSC2" ,"enbSC2"},
|
||||
+ {'B',11,"enbSC1" ,"enbSC1"},
|
||||
+ {'B',12,"gsmONOFF" ,"gsmONOFF"},
|
||||
+ {'B',14,"ledBAP1" ,"ledBAP1"},
|
||||
+ {'B',15,"ledBBP1" ,"ledBBP1"},
|
||||
+ {'B',16,"ledBAP2" ,"ledBAP2"},
|
||||
+ {'B',17,"ledBBP2" ,"ledBBP2"},
|
||||
+ {'B',27,"udpCNX" ,"udpCNX"},
|
||||
+ {'B',28,"udpPUP" ,"udpPUP"},
|
||||
+ {'B',29,"port2DCD" ,"port2DCD"},
|
||||
+ {'C',2, "vlVer100" ,"vlVer150"},
|
||||
+ {'C',7, "ledFAP1" ,"ledFAP1"},
|
||||
+ {'C',8, "ledFBP1" ,"ledFBP1"},
|
||||
+ {'C',10,"vioC10" ,"sdCardON"},
|
||||
+ {'C',11,"vioC11" ,"vusbCTRL"},
|
||||
+ {'C',12,"sdCardON" ,"simCTRL"},
|
||||
+ {'C',13,"vioC13" ,"enbSC3"},
|
||||
+ {'C',14,"ledFBP2" ,"ledFBP2"},
|
||||
+ {'C',15,"ledFAP2" ,"ledFAP2"},
|
||||
+ {0,0,"",""}
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+{'B',18,"gsmRIO" ,"gsmRIO"},
|
||||
+{'B',20,"gsmTX" ,"gsmTX"},
|
||||
+{'B',21,"gsmRX" ,"gsmRX"},
|
||||
+{'B',22,"gsmPIND" ,"gsmPIND"},
|
||||
+{'B',23,"gsmDCD" ,"gsmDCD"},
|
||||
+{'B',24,"gsmCTS" ,"gsmCTS"},
|
||||
+{'B',25,"gsmDSR" ,"gsmDSR"},
|
||||
+{'B',26,"gsmRTS" ,"gsmRTS"},
|
||||
+*/
|
||||
+static void lookupPINName(char version100, char *devName, char port, char pin);
|
||||
+// EOF KWJ + AJE
|
||||
+
|
||||
+static ssize_t gpio_read(struct file *file, char __user *buf, size_t len,
|
||||
+ loff_t *ppos)
|
||||
+{
|
||||
+ unsigned int pin;
|
||||
+ int retval;
|
||||
+ char value = '0';
|
||||
+
|
||||
+ pin = iminor(file->f_dentry->d_inode);
|
||||
+
|
||||
+ retval = at91_get_gpio_value(PIN_BASE + pin);
|
||||
+ if (retval < 0)
|
||||
+ return -EFAULT;
|
||||
+
|
||||
+ value = retval + 0x30;
|
||||
+ if (put_user(value, buf))
|
||||
+ return -EFAULT;
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+static ssize_t gpio_write(struct file *file, const char __user *data,
|
||||
+ size_t len, loff_t *ppos)
|
||||
+{
|
||||
+ unsigned int pin;
|
||||
+ size_t i;
|
||||
+ char c;
|
||||
+ int retval = 0;
|
||||
+
|
||||
+ pin = iminor(file->f_dentry->d_inode);
|
||||
+
|
||||
+ for (i = 0; i < len; i++) {
|
||||
+ if (get_user(c, data + i))
|
||||
+ return -EFAULT;
|
||||
+
|
||||
+ switch (c) {
|
||||
+ case '0':
|
||||
+ case '1':
|
||||
+ retval = at91_set_gpio_value(PIN_BASE + pin, (int)c - 0x30);
|
||||
+ if (retval < 0)
|
||||
+ return -EFAULT;
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ if (retval < 0)
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return i;
|
||||
+}
|
||||
+
|
||||
+static int gpio_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return nonseekable_open(inode, file);
|
||||
+}
|
||||
+
|
||||
+static int gpio_release(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static struct file_operations vio_fops = {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .read = gpio_read,
|
||||
+ .write = gpio_write,
|
||||
+ .open = gpio_open,
|
||||
+ .release = gpio_release,
|
||||
+};
|
||||
+
|
||||
+static void vio_setup_cdev(struct vio_dev *dev, int index)
|
||||
+{
|
||||
+ int err, devno = MKDEV(major, index);
|
||||
+
|
||||
+ cdev_init(&dev->cdev, &vio_fops);
|
||||
+ dev->cdev.owner = THIS_MODULE;
|
||||
+ dev->cdev.ops = &vio_fops;
|
||||
+ err = cdev_add (&dev->cdev, devno, 1);
|
||||
+ if (err)
|
||||
+ printk(KERN_NOTICE "vio: Error %d adding vio%d", err, index);
|
||||
+}
|
||||
+
|
||||
+static int vio_remove(struct platform_device *dev)
|
||||
+{
|
||||
+ int i;
|
||||
+ dev_t devno = MKDEV(major, 0);
|
||||
+
|
||||
+ if (vio_devices) {
|
||||
+ for(i=0; i<VIO_NR_DEVS; i++) {
|
||||
+ int iodev = at91_is_pin_gpio(PIN_BASE + i);
|
||||
+ if (iodev) {
|
||||
+ cdev_del(&vio_devices[i].cdev);
|
||||
+ class_device_destroy(vio_class, MKDEV(major, i));
|
||||
+ }
|
||||
+ }
|
||||
+ kfree(vio_devices);
|
||||
+ }
|
||||
+
|
||||
+ class_destroy(vio_class);
|
||||
+ unregister_chrdev_region(devno, VIO_NR_DEVS);
|
||||
+
|
||||
+ platform_set_drvdata(dev, NULL);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int vio_probe(struct platform_device *dev)
|
||||
+{
|
||||
+ int retval, i, j;
|
||||
+ dev_t vdev = 0;
|
||||
+ char devName[30];
|
||||
+ int vlinkV100;
|
||||
+
|
||||
+ if (major) {
|
||||
+ vdev = MKDEV(major, 0);
|
||||
+ retval = register_chrdev_region(vdev, VIO_NR_DEVS, "vio");
|
||||
+ } else {
|
||||
+ retval = alloc_chrdev_region(&vdev, 0, VIO_NR_DEVS, "vio");
|
||||
+ major = MAJOR(vdev);
|
||||
+ }
|
||||
+ if (retval < 0) {
|
||||
+ printk(KERN_WARNING "vio: can't get major %d\n", major);
|
||||
+ return retval;
|
||||
+ }
|
||||
+
|
||||
+ if (major == 0) {
|
||||
+ major = retval;
|
||||
+ printk(KERN_INFO "vio: major number %d\n", major);
|
||||
+ }
|
||||
+
|
||||
+ vio_class = class_create(THIS_MODULE, "vio");
|
||||
+
|
||||
+ if (IS_ERR(vio_class)) {
|
||||
+ printk(KERN_ERR "vio: Error creating vio class\n");
|
||||
+ vio_remove(dev);
|
||||
+ return PTR_ERR(vio_class);
|
||||
+ }
|
||||
+
|
||||
+ vlinkV100 = at91_get_gpio_value(AT91_PIN_PC2); // Denotes V1.5 if GND
|
||||
+
|
||||
+ vio_devices = kmalloc(VIO_NR_DEVS * sizeof(struct vio_dev), GFP_KERNEL);
|
||||
+ if (!vio_devices) {
|
||||
+ retval = -ENOMEM;
|
||||
+ goto fail;
|
||||
+ }
|
||||
+ memset(vio_devices, 0, VIO_NR_DEVS * sizeof(struct vio_dev));
|
||||
+
|
||||
+ for (i=0; i<VIO_NR_DEVS/32; i++)
|
||||
+ for(j=0; j<32; j++) {
|
||||
+ int iodev = at91_is_pin_gpio(PIN_BASE + i*32 + j);
|
||||
+ if (iodev) {
|
||||
+ vio_setup_cdev(&vio_devices[i*32 + j], i*32 + j);
|
||||
+ // Lookup name of vio to create
|
||||
+ lookupPINName(vlinkV100, devName, i, j);
|
||||
+ class_device_create(vio_class, NULL, MKDEV(major, i*32 + j), NULL, devName);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ platform_set_drvdata(dev, vio_devices);
|
||||
+
|
||||
+ return 0;
|
||||
+
|
||||
+fail:
|
||||
+ vio_remove(dev);
|
||||
+ return retval;
|
||||
+}
|
||||
+
|
||||
+static void lookupPINName(char version100, char *devName, char port, char pin)
|
||||
+{
|
||||
+ int i = -1;
|
||||
+ char found = 0;
|
||||
+ while (!found)
|
||||
+ {
|
||||
+ i++;
|
||||
+ if (i >= MAX_VIO_NAMES)
|
||||
+ break;
|
||||
+ if (VioName[i].port == port+'A' && VioName[i].pin == pin)
|
||||
+ {
|
||||
+ printk(KERN_ERR "vio++: %c%d=%s\n",VioName[i].port,VioName[i].pin,VioName[i].name150);
|
||||
+ if (version100)
|
||||
+ strcpy(devName, VioName[i].name100);
|
||||
+ else
|
||||
+ strcpy(devName, VioName[i].name150);
|
||||
+ found = 1;
|
||||
+ }
|
||||
+ }
|
||||
+ if (!found)
|
||||
+ sprintf(devName, "vio%c%d", port + 'A', pin);
|
||||
+}
|
||||
+
|
||||
+static struct platform_device *vio_platform_device;
|
||||
+
|
||||
+static struct platform_driver vio_driver = {
|
||||
+ .probe = vio_probe,
|
||||
+ .remove = vio_remove,
|
||||
+ .driver = {
|
||||
+ .name = "vio",
|
||||
+ .owner = THIS_MODULE,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static int __init vio_init(void)
|
||||
+{
|
||||
+ int retval;
|
||||
+
|
||||
+ vio_platform_device = platform_device_register_simple("vio", -1, NULL, 0);
|
||||
+ if (IS_ERR(vio_platform_device)) {
|
||||
+ printk(KERN_WARNING "vio: device registration failed\n");
|
||||
+ return PTR_ERR(vio_platform_device);
|
||||
+ }
|
||||
+
|
||||
+ retval = platform_driver_register(&vio_driver);
|
||||
+ if (retval < 0) {
|
||||
+ printk(KERN_WARNING "vio: driver registration failed\n");
|
||||
+ platform_device_unregister(vio_platform_device);
|
||||
+ }
|
||||
+
|
||||
+ return retval;
|
||||
+}
|
||||
+
|
||||
+static void __exit vio_exit(void)
|
||||
+{
|
||||
+ platform_driver_unregister(&vio_driver);
|
||||
+ platform_device_unregister(vio_platform_device);
|
||||
+}
|
||||
+
|
||||
+module_init(vio_init);
|
||||
+module_exit(vio_exit);
|
||||
+
|
||||
+MODULE_AUTHOR("Hamish Guthrie <hamish@prodigi.ch>");
|
||||
+MODULE_DESCRIPTION("FDL Versalink GPIO Driver");
|
||||
--- a/include/asm-arm/arch-at91/gpio.h
|
||||
+++ b/include/asm-arm/arch-at91/gpio.h
|
||||
@@ -199,6 +199,7 @@ extern int __init_or_module at91_set_mul
|
||||
/* callable at any time */
|
||||
extern int at91_set_gpio_value(unsigned pin, int value);
|
||||
extern int at91_get_gpio_value(unsigned pin);
|
||||
+extern int at91_is_pin_gpio(unsigned pin);
|
||||
|
||||
/* callable only from core power-management code */
|
||||
extern void at91_gpio_suspend(void);
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
--- a/drivers/mtd/devices/at91_dataflash.c
|
||||
+++ b/drivers/mtd/devices/at91_dataflash.c
|
||||
@@ -175,7 +175,7 @@ static struct mtd_partition static_parti
|
||||
};
|
||||
#endif
|
||||
|
||||
-static const char *part_probes[] = { "cmdlinepart", NULL, };
|
||||
+static const char *part_probes[] = { "cmdlinepart", "at91part", NULL, };
|
||||
|
||||
#endif
|
||||
|
||||
--- a/drivers/mtd/Kconfig
|
||||
+++ b/drivers/mtd/Kconfig
|
||||
@@ -168,6 +168,12 @@ config MTD_OF_PARTS
|
||||
the partition map from the children of the flash node,
|
||||
as described in Documentation/powerpc/booting-without-of.txt.
|
||||
|
||||
+config MTD_AT91_PARTS
|
||||
+ tristate "Atmel AT91 partitioning support"
|
||||
+ depends on MTD_PARTITIONS && ARCH_AT91RM9200 && AT91_SPI
|
||||
+ ---help---
|
||||
+ Atmel AT91 partitioning support
|
||||
+
|
||||
comment "User Modules And Translation Layers"
|
||||
|
||||
config MTD_CHAR
|
||||
--- a/drivers/mtd/Makefile
|
||||
+++ b/drivers/mtd/Makefile
|
||||
@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
|
||||
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
|
||||
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
|
||||
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
|
||||
+obj-$(CONFIG_MTD_AT91_PARTS) += at91part.o
|
||||
|
||||
# 'Users' - code which presents functionality to userspace.
|
||||
obj-$(CONFIG_MTD_CHAR) += mtdchar.o
|
||||
|
|
@ -1,161 +0,0 @@
|
|||
--- a/drivers/serial/atmel_serial.c
|
||||
+++ b/drivers/serial/atmel_serial.c
|
||||
@@ -214,6 +214,34 @@ static void atmel_set_mctrl(struct uart_
|
||||
at91_set_gpio_value(AT91_PIN_PA21, 0);
|
||||
else
|
||||
at91_set_gpio_value(AT91_PIN_PA21, 1);
|
||||
+
|
||||
+ /*
|
||||
+ * FDL VersaLink adds GPIOS to provide full modem
|
||||
+ * control on USART 0 - Drive DTR and RI pins manually
|
||||
+ */
|
||||
+ if (mctrl & TIOCM_DTR)
|
||||
+ at91_set_gpio_value(AT91_PIN_PB6, 0);
|
||||
+ else
|
||||
+ at91_set_gpio_value(AT91_PIN_PB6, 1);
|
||||
+ if (mctrl & TIOCM_RI)
|
||||
+ at91_set_gpio_value(AT91_PIN_PB7, 0);
|
||||
+ else
|
||||
+ at91_set_gpio_value(AT91_PIN_PB7, 1);
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * FDL VersaLink adds GPIOS to provide full modem control on
|
||||
+ * USART 3 - Drive DTR and RI pins manually
|
||||
+ */
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US3) {
|
||||
+ if (mctrl & TIOCM_DTR)
|
||||
+ at91_set_gpio_value(AT91_PIN_PB29, 0);
|
||||
+ else
|
||||
+ at91_set_gpio_value(AT91_PIN_PB29, 1);
|
||||
+ if (mctrl & TIOCM_RI)
|
||||
+ at91_set_gpio_value(AT91_PIN_PB2, 0);
|
||||
+ else
|
||||
+ at91_set_gpio_value(AT91_PIN_PB2, 1);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -251,8 +279,10 @@ static u_int atmel_get_mctrl(struct uart
|
||||
/*
|
||||
* The control signals are active low.
|
||||
*/
|
||||
- if (!(status & ATMEL_US_DCD))
|
||||
- ret |= TIOCM_CD;
|
||||
+
|
||||
+ if (!(port->mapbase == AT91RM9200_BASE_US0 || port->mapbase == AT91RM9200_BASE_US3))
|
||||
+ if (!(status & ATMEL_US_DCD))
|
||||
+ ret |= TIOCM_CD;
|
||||
if (!(status & ATMEL_US_CTS))
|
||||
ret |= TIOCM_CTS;
|
||||
if (!(status & ATMEL_US_DSR))
|
||||
@@ -260,6 +290,16 @@ static u_int atmel_get_mctrl(struct uart
|
||||
if (!(status & ATMEL_US_RI))
|
||||
ret |= TIOCM_RI;
|
||||
|
||||
+ /*
|
||||
+ * Read the GPIO's for the FDL VersaLink special case
|
||||
+ */
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US0)
|
||||
+ if (!(at91_get_gpio_value(AT91_PIN_PA19)))
|
||||
+ ret |= TIOCM_CD;
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US3)
|
||||
+ if (!(at91_get_gpio_value(AT91_PIN_PA24)))
|
||||
+ ret |= TIOCM_CD;
|
||||
+
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -453,6 +493,34 @@ static void atmel_tx_chars(struct uart_p
|
||||
}
|
||||
|
||||
/*
|
||||
+ * USART0 DCD Interrupt handler
|
||||
+ */
|
||||
+
|
||||
+static irqreturn_t atmel_u0_DCD_interrupt(int irq, void *dev_id)
|
||||
+{
|
||||
+ struct uart_port *port = dev_id;
|
||||
+ int status = at91_get_gpio_value(irq);
|
||||
+
|
||||
+ uart_handle_dcd_change(port, !(status));
|
||||
+
|
||||
+ return IRQ_HANDLED;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * USART3 DCD Interrupt handler
|
||||
+ */
|
||||
+
|
||||
+static irqreturn_t atmel_u3_DCD_interrupt(int irq, void *dev_id)
|
||||
+{
|
||||
+ struct uart_port *port = dev_id;
|
||||
+ int status = at91_get_gpio_value(irq);
|
||||
+
|
||||
+ uart_handle_dcd_change(port, !(status));
|
||||
+
|
||||
+ return IRQ_HANDLED;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
* receive interrupt handler.
|
||||
*/
|
||||
static void
|
||||
@@ -815,6 +883,23 @@ static int atmel_startup(struct uart_por
|
||||
return retval;
|
||||
}
|
||||
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US0) {
|
||||
+ retval = request_irq(AT91_PIN_PA19, atmel_u0_DCD_interrupt, 0, "atmel_serial", port);
|
||||
+ if (retval) {
|
||||
+ printk("atmel_serial: atmel_startup - Can't get u0DCD irq\n");
|
||||
+ free_irq(port->irq, port);
|
||||
+ return retval;
|
||||
+ }
|
||||
+ }
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US3) {
|
||||
+ retval = request_irq(AT91_PIN_PA24, atmel_u3_DCD_interrupt, 0, "atmel_serial", port);
|
||||
+ if (retval) {
|
||||
+ printk("atmel_serial: atmel_startup - Can't get u3DCD irq\n");
|
||||
+ free_irq(port->irq, port);
|
||||
+ return retval;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/*
|
||||
* Initialize DMA (if necessary)
|
||||
*/
|
||||
@@ -834,6 +919,10 @@ static int atmel_startup(struct uart_por
|
||||
kfree(atmel_port->pdc_rx[0].buf);
|
||||
}
|
||||
free_irq(port->irq, port);
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US0)
|
||||
+ free_irq(AT91_PIN_PA19, port);
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US3)
|
||||
+ free_irq(AT91_PIN_PA24, port);
|
||||
return -ENOMEM;
|
||||
}
|
||||
pdc->dma_addr = dma_map_single(port->dev,
|
||||
@@ -873,7 +962,11 @@ static int atmel_startup(struct uart_por
|
||||
retval = atmel_open_hook(port);
|
||||
if (retval) {
|
||||
free_irq(port->irq, port);
|
||||
- return retval;
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US0)
|
||||
+ free_irq(AT91_PIN_PA19, port);
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US3)
|
||||
+ free_irq(AT91_PIN_PA24, port);
|
||||
+ return retval;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -947,6 +1040,10 @@ static void atmel_shutdown(struct uart_p
|
||||
* Free the interrupt
|
||||
*/
|
||||
free_irq(port->irq, port);
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US0)
|
||||
+ free_irq(AT91_PIN_PA19, port);
|
||||
+ if (port->mapbase == AT91RM9200_BASE_US3)
|
||||
+ free_irq(AT91_PIN_PA24, port);
|
||||
|
||||
/*
|
||||
* If there is a specific "close" function (to unregister
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
--- a/arch/arm/mach-at91/at91rm9200_devices.c
|
||||
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
|
||||
@@ -1001,7 +1001,15 @@ static inline void configure_usart0_pins
|
||||
* We need to drive the pin manually. Default is off (RTS is active low).
|
||||
*/
|
||||
at91_set_gpio_output(AT91_PIN_PA21, 1);
|
||||
- }
|
||||
+ }
|
||||
+ if (pins & ATMEL_UART_DTR)
|
||||
+ at91_set_gpio_output(AT91_PIN_PB6, 1); /* DTR0 */
|
||||
+ if (pins & ATMEL_UART_RI)
|
||||
+ at91_set_gpio_output(AT91_PIN_PB7, 1); /* RI0 */
|
||||
+ if (pins & ATMEL_UART_DCD) {
|
||||
+ at91_set_gpio_input(AT91_PIN_PA19, 1); /* DCD0 */
|
||||
+ at91_set_deglitch(AT91_PIN_PA19, 1);
|
||||
+ }
|
||||
}
|
||||
|
||||
static struct resource uart1_resources[] = {
|
||||
@@ -1139,6 +1147,14 @@ static inline void configure_usart3_pins
|
||||
at91_set_B_periph(AT91_PIN_PB1, 0); /* CTS3 */
|
||||
if (pins & ATMEL_UART_RTS)
|
||||
at91_set_B_periph(AT91_PIN_PB0, 0); /* RTS3 */
|
||||
+ if (pins & ATMEL_UART_DTR)
|
||||
+ at91_set_gpio_output(AT91_PIN_PB29, 1); /* DTR0 */
|
||||
+ if (pins & ATMEL_UART_RI)
|
||||
+ at91_set_gpio_output(AT91_PIN_PB2, 1); /* RI0 */
|
||||
+ if (pins & ATMEL_UART_DCD) {
|
||||
+ at91_set_gpio_input(AT91_PIN_PA24, 1); /* DCD0 */
|
||||
+ at91_set_deglitch(AT91_PIN_PA24, 1);
|
||||
+ }
|
||||
}
|
||||
|
||||
static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
--- a/drivers/net/arm/at91_ether.c
|
||||
+++ b/drivers/net/arm/at91_ether.c
|
||||
@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
|
||||
struct at91_private *lp = netdev_priv(dev);
|
||||
unsigned int bmsr, bmcr, lpa, mac_cfg;
|
||||
unsigned int speed, duplex;
|
||||
+ unsigned long timeout = jiffies + HZ;
|
||||
|
||||
if (!mii_link_ok(&lp->mii)) { /* no link */
|
||||
netif_carrier_off(dev);
|
||||
@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
|
||||
read_phy(lp->phy_address, MII_BMSR, &bmsr);
|
||||
read_phy(lp->phy_address, MII_BMCR, &bmcr);
|
||||
if (bmcr & BMCR_ANENABLE) { /* AutoNegotiation is enabled */
|
||||
- if (!(bmsr & BMSR_ANEGCOMPLETE))
|
||||
- return; /* Do nothing - another interrupt generated when negotiation complete */
|
||||
+ while (!(bmsr & BMSR_ANEGCOMPLETE)) {
|
||||
+ if (time_after(jiffies, timeout)) {
|
||||
+ printk("at91_ether: Auto-negotiate timeout\n");
|
||||
+ return;
|
||||
+ }
|
||||
+ read_phy(lp->phy_address, MII_BMSR, &bmsr);
|
||||
+ read_phy(lp->phy_address, MII_BMCR, &bmcr);
|
||||
+ cpu_relax();
|
||||
+ }
|
||||
|
||||
read_phy(lp->phy_address, MII_LPA, &lpa);
|
||||
if ((lpa & LPA_100FULL) || (lpa & LPA_100HALF)) speed = SPEED_100;
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
--- a/drivers/mtd/devices/at91_dataflash.c
|
||||
+++ b/drivers/mtd/devices/at91_dataflash.c
|
||||
@@ -163,12 +163,12 @@ static struct mtd_partition static_parti
|
||||
.mask_flags = MTD_WRITEABLE, /* read-only */
|
||||
},
|
||||
{
|
||||
- .name = "kernel",
|
||||
+ .name = "knlroot",
|
||||
.offset = MTDPART_OFS_NXTBLK,
|
||||
- .size = 5 * 32 * 8 * 1056, /* 5 sectors */
|
||||
+ .size = 0x320400,
|
||||
},
|
||||
{
|
||||
- .name = "filesystem",
|
||||
+ .name = "jffs2",
|
||||
.offset = MTDPART_OFS_NXTBLK,
|
||||
.size = MTDPART_SIZ_FULL, /* rest = 26 sectors */
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/drivers/usb/serial/usb-serial.c
|
||||
+++ b/drivers/usb/serial/usb-serial.c
|
||||
@@ -904,7 +904,7 @@ int usb_serial_probe(struct usb_interfac
|
||||
dev_err(&interface->dev, "No free urbs available\n");
|
||||
goto probe_error;
|
||||
}
|
||||
- buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
|
||||
+ buffer_size = 2048;
|
||||
port->bulk_in_size = buffer_size;
|
||||
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
|
||||
port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
|
||||
Loading…
Reference in a new issue