NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target/device/Atmel/arch-avr32: remove old unused kernel patches

Browse Source 
As discussed on the list:

22:08 < HcE> Jacmet: so yes, AVR32 wise you can delete anything older than
             2.6.27
This commit is contained in:
Peter Korsgaard 2009-01-26 21:10:11 +00:00
parent d141a6985a
commit 87c5abadfa
16 changed files with 0 additions and 58777 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
target/device/Atmel/arch-avr32/kernel-patches-2.6.20.4/.empty
View File

0
target/device/Atmel/arch-avr32/kernel-patches-2.6.21.5/.empty
View File

0
target/device/Atmel/arch-avr32/kernel-patches-2.6.22.1/.empty
View File

16955
target/device/Atmel/arch-avr32/kernel-patches-2.6.22.10/linux-2.6.22.10-100-avr32-atmel.4.patch
View File

File diff suppressed because it is too large Load Diff

130
target/device/Atmel/arch-avr32/kernel-patches-2.6.22.10/linux-2.6.22.10-500-gpio_mouse-setup-for-atstk1000-board.patch
View File

@ -1,130 +0,0 @@
>From 9c5fa914202d20756c56e0c4fd76035ed8f8ced8 Mon Sep 17 00:00:00 2001
From: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Date: Mon, 6 Aug 2007 08:31:14 +0200
Subject: [PATCH 1/1] Add gpio_mouse board setup to atstk1000 board
This patch adds a gpio_mouse_platform_data to the atstk1000 board code and
registers a gpio_mouse platform_device. This will enable a GPIO mouse on header
J1 on GPIO of the ATSTK1000 development kit. The board code is enabled/disabled
in menuconfig.
By connecting J1 (GPIO) to J25 (SWITCH) you can use the following keys to
simulate a mouse:
SW0: right
SW1: down
SW2: up
SW3: left
SW5: right button
SW6: middle button
SW7: left button
Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
---
arch/avr32/boards/atstk1000/Kconfig | 16 ++++++++++
arch/avr32/boards/atstk1000/atstk1002.c | 48 +++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/arch/avr32/boards/atstk1000/Kconfig b/arch/avr32/boards/atstk1000/Kconfig
index 718578f..d99d4bd 100644
--- a/arch/avr32/boards/atstk1000/Kconfig
+++ b/arch/avr32/boards/atstk1000/Kconfig
@@ -50,6 +50,22 @@ config BOARD_ATSTK1002_SPI1
GPIO lines and accessed through the J1 jumper block. Say "y"
here to configure that SPI controller.
+config BOARD_ATSTK1002_GPIO_MOUSE
+ bool "Configure gpio_mouse on GPIO J1 header"
+ depends on !BOARD_ATSTK1002_SW4_CUSTOM
+ help
+ Enable gpio_mouse board configuration on GPIO 0 to 7. Connecting a
+ 10-pin flat cable from J1 (GPIO) to J25 (SWITCH) will let a user give
+ mouse inputs using the the switches SW0 to SW7.
+
+ SW0: right
+ SW1: down
+ SW2: up
+ SW3: left
+ SW5: right button
+ SW6: middle button
+ SW7: left button
+
config BOARD_ATSTK1002_J2_LED
bool
default BOARD_ATSTK1002_J2_LED8 || BOARD_ATSTK1002_J2_RGB
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index c958fd4..c7560e5 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -17,6 +17,7 @@
#include <linux/types.h>
#include <linux/spi/spi.h>
#include <linux/spi/at73c213.h>
+#include <linux/gpio_mouse.h>
#include <video/atmel_lcdc.h>
@@ -91,6 +92,49 @@ static struct mci_platform_data __initdata mci0_data = {
.wp_pin = GPIO_PIN_NONE,
};
+#ifdef CONFIG_BOARD_ATSTK1002_GPIO_MOUSE
+static struct gpio_mouse_platform_data gpio_mouse0_data = {
+ .polarity = GPIO_MOUSE_POLARITY_ACT_LOW,
+ {
+ {
+ .up = GPIO_PIN_PB(2),
+ .down = GPIO_PIN_PB(1),
+ .left = GPIO_PIN_PB(3),
+ .right = GPIO_PIN_PB(0),
+ .bleft = GPIO_PIN_PB(7),
+ .bmiddle = GPIO_PIN_PB(6),
+ .bright = GPIO_PIN_PB(5),
+ },
+ },
+ .scan_ms = 10,
+};
+
+static struct platform_device gpio_mouse0_device = {
+ .name = "gpio_mouse",
+ .id = 0,
+ .dev = {
+ .platform_data = &gpio_mouse0_data,
+ },
+};
+
+static void __init add_device_gpio_mouse0(void)
+{
+ struct platform_device *pdev = &gpio_mouse0_device;
+ struct gpio_mouse_platform_data *data = pdev->dev.platform_data;
+
+ at32_select_gpio(data->up, 0);
+ at32_select_gpio(data->down, 0);
+ at32_select_gpio(data->left, 0);
+ at32_select_gpio(data->right, 0);
+
+ at32_select_gpio(data->bleft, 0);
+ at32_select_gpio(data->bmiddle, 0);
+ at32_select_gpio(data->bright, 0);
+
+ platform_device_register(pdev);
+}
+#endif
+
/*
* The next two functions should go away as the boot loader is
* supposed to initialize the macb address registers with a valid
@@ -321,6 +365,10 @@ static int __init atstk1002_init(void)
#endif
#endif
+#ifdef CONFIG_BOARD_ATSTK1002_GPIO_MOUSE
+ add_device_gpio_mouse0();
+#endif
+
return 0;
}
postcore_initcall(atstk1002_init);
--
1.5.2.3

290
target/device/Atmel/arch-avr32/kernel-patches-2.6.22.10/linux-2.6.22.10-501-atmel_mci-minor-fixes-and-cleanups.patch
View File

@ -1,290 +0,0 @@
From: Haavard Skinnemoen <hskinnemoen@atmel.com>
Subject: [PATCH 1/2] atmel_mci: Minor fixes and cleanups
* Use ios->clock to define when to enable the controller instead of
ios->power_mode.
* Send initialization command (74 idle clock cycles) when power_mode
is set to MMC_POWER_ON.
* Use dev_dbg() and friends instead of pr_debug() and printk().
* Don't print data- or probe errors when debugging is not enabled.
* Adjust ocr_avail range to 3.2V-3.4V using proper constants.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---
drivers/mmc/host/atmel-mci.c | 120 ++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 56 deletions(-)
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 74d343f..1dc91b4 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -464,9 +464,8 @@ static void atmci_set_timeout(struct atmel_mci *host,
dtocyc = 15;
}
- pr_debug("%s: setting timeout to %u cycles\n",
- mmc_hostname(host->mmc),
- dtocyc << dtomul_to_shift[dtomul]);
+ dev_dbg(&host->mmc->class_dev, "setting timeout to %u cycles\n",
+ dtocyc << dtomul_to_shift[dtomul]);
mci_writel(host, DTOR, (MCI_BF(DTOMUL, dtomul)
| MCI_BF(DTOCYC, dtocyc)));
}
@@ -508,9 +507,9 @@ static u32 atmci_prepare_command(struct mmc_host *mmc,
if (!(cmd->flags & MMC_RSP_CRC))
iflags &= ~MCI_BIT(RCRCE);
- pr_debug("%s: cmd: op %02x arg %08x flags %08x, cmdflags %08lx\n",
- mmc_hostname(mmc), cmd->opcode, cmd->arg, cmd->flags,
- (unsigned long)cmdr);
+ dev_dbg(&mmc->class_dev,
+ "cmd: op %02x arg %08x flags %08x, cmdflags %08lx\n",
+ cmd->opcode, cmd->arg, cmd->flags, (unsigned long)cmdr);
*cmd_flags = cmdr;
return iflags;
@@ -589,7 +588,8 @@ static void atmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
iflags = mci_readl(host, IMR);
if (iflags)
- printk("WARNING: IMR=0x%08x\n", mci_readl(host, IMR));
+ dev_warn(&mmc->class_dev, "WARNING: IMR=0x%08x\n",
+ mci_readl(host, IMR));
WARN_ON(host->mrq != NULL);
host->mrq = mrq;
@@ -623,16 +623,30 @@ static void atmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
{
struct atmel_mci *host = mmc_priv(mmc);
+ u32 mr;
if (ios->clock) {
u32 clkdiv;
+ /* Set clock rate */
clkdiv = host->bus_hz / (2 * ios->clock) - 1;
- if (clkdiv > 255)
+ if (clkdiv > 255) {
+ dev_warn(&mmc->class_dev,
+ "clock %u too slow; using %lu\n",
+ ios->clock, host->bus_hz / (2 * 256));
clkdiv = 255;
- mci_writel(host, MR, (clkdiv
- | MCI_BIT(WRPROOF)
- | MCI_BIT(RDPROOF)));
+ }
+
+ mr = mci_readl(host, MR);
+ mr = MCI_BFINS(CLKDIV, clkdiv, mr)
+ | MCI_BIT(WRPROOF) | MCI_BIT(RDPROOF);
+ mci_writel(host, MR, mr);
+
+ /* Enable the MCI controller */
+ mci_writel(host, CR, MCI_BIT(MCIEN));
+ } else {
+ /* Disable the MCI controller */
+ mci_writel(host, CR, MCI_BIT(MCIDIS));
}
switch (ios->bus_width) {
@@ -645,14 +659,19 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
}
switch (ios->power_mode) {
- case MMC_POWER_OFF:
- mci_writel(host, CR, MCI_BIT(MCIDIS));
- break;
- case MMC_POWER_UP:
- mci_writel(host, CR, MCI_BIT(SWRST));
- break;
case MMC_POWER_ON:
- mci_writel(host, CR, MCI_BIT(MCIEN));
+ /* Send init sequence (74 clock cycles) */
+ mci_writel(host, IDR, ~0UL);
+ mci_writel(host, CMDR, MCI_BF(SPCMD, MCI_SPCMD_INIT_CMD));
+ while (!(mci_readl(host, SR) & MCI_BIT(CMDRDY)))
+ cpu_relax();
+ break;
+ default:
+ /*
+ * TODO: None of the currently available AVR32-based
+ * boards allow MMC power to be turned off. Implement
+ * power control when this can be tested properly.
+ */
break;
}
}
@@ -664,11 +683,12 @@ static int atmci_get_ro(struct mmc_host *mmc)
if (host->wp_pin >= 0) {
read_only = gpio_get_value(host->wp_pin);
- pr_debug("%s: card is %s\n", mmc_hostname(mmc),
- read_only ? "read-only" : "read-write");
+ dev_dbg(&mmc->class_dev, "card is %s\n",
+ read_only ? "read-only" : "read-write");
} else {
- pr_debug("%s: no pin for checking read-only switch."
- " Assuming write-enable.\n", mmc_hostname(mmc));
+ dev_dbg(&mmc->class_dev,
+ "no pin for checking read-only switch."
+ " Assuming write-enable.\n");
}
return read_only;
@@ -719,8 +739,7 @@ static void atmci_command_error(struct mmc_host *mmc,
struct mmc_command *cmd,
u32 status)
{
- pr_debug("%s: command error: status=0x%08x\n",
- mmc_hostname(mmc), status);
+ dev_dbg(&mmc->class_dev, "command error: status=0x%08x\n", status);
if (status & MCI_BIT(RTOE))
cmd->error = MMC_ERR_TIMEOUT;
@@ -737,7 +756,8 @@ static void atmci_tasklet_func(unsigned long priv)
struct mmc_request *mrq = host->mrq;
struct mmc_data *data = host->data;
- pr_debug("atmci_tasklet: pending/completed/mask %lx/%lx/%x\n",
+ dev_dbg(&mmc->class_dev,
+ "tasklet: pending/completed/mask %lx/%lx/%x\n",
host->pending_events, host->completed_events,
mci_readl(host, IMR));
@@ -784,8 +804,8 @@ static void atmci_tasklet_func(unsigned long priv)
/* DMA controller got bus error => invalid address */
data->error = MMC_ERR_INVALID;
- printk(KERN_DEBUG "%s: dma error after %u bytes xfered\n",
- mmc_hostname(mmc), host->data->bytes_xfered);
+ dev_dbg(&mmc->class_dev, "dma error after %u bytes xfered\n",
+ host->data->bytes_xfered);
if (data->stop
&& !mci_set_stop_sent_is_completed(host))
@@ -803,24 +823,18 @@ static void atmci_tasklet_func(unsigned long priv)
dma_stop_request(host->dma.req.req.dmac,
host->dma.req.req.channel);
- printk(KERN_DEBUG "%s: data error: status=0x%08x\n",
- mmc_hostname(host->mmc), status);
-
if (status & MCI_BIT(DCRCE)) {
- printk(KERN_DEBUG "%s: Data CRC error\n",
- mmc_hostname(host->mmc));
+ dev_dbg(&mmc->class_dev, "data CRC error\n");
data->error = MMC_ERR_BADCRC;
} else if (status & MCI_BIT(DTOE)) {
- printk(KERN_DEBUG "%s: Data Timeout error\n",
- mmc_hostname(host->mmc));
+ dev_dbg(&mmc->class_dev, "data timeout error\n");
data->error = MMC_ERR_TIMEOUT;
} else {
- printk(KERN_DEBUG "%s: Data FIFO error\n",
- mmc_hostname(host->mmc));
+ dev_dbg(&mmc->class_dev, "data FIFO error\n");
data->error = MMC_ERR_FIFO;
}
- printk(KERN_DEBUG "%s: Bytes xfered: %u\n",
- mmc_hostname(host->mmc), data->bytes_xfered);
+ dev_dbg(&mmc->class_dev, "bytes xfered: %u\n",
+ data->bytes_xfered);
if (data->stop
&& !mci_set_stop_sent_is_completed(host))
@@ -998,8 +1012,8 @@ static irqreturn_t atmci_detect_change(int irq, void *dev_id)
int present = !gpio_get_value(irq_to_gpio(irq));
if (present != host->present) {
- pr_debug("%s: card %s\n", mmc_hostname(host->mmc),
- present ? "inserted" : "removed");
+ dev_dbg(&mmc->class_dev, "card %s\n",
+ present ? "inserted" : "removed");
host->present = present;
mci_set_card_detect_pending(host);
tasklet_schedule(&host->tasklet);
@@ -1058,7 +1072,7 @@ static int __devinit atmci_probe(struct platform_device *pdev)
mmc->ops = &atmci_ops;
mmc->f_min = (host->bus_hz + 511) / 512;
mmc->f_max = min((unsigned int)(host->bus_hz / 2), fmax);
- mmc->ocr_avail = 0x00100000;
+ mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
mmc->caps |= MMC_CAP_4_BIT_DATA;
tasklet_init(&host->tasklet, atmci_tasklet_func, (unsigned long)mmc);
@@ -1071,8 +1085,7 @@ static int __devinit atmci_probe(struct platform_device *pdev)
host->present = 1;
if (host->detect_pin >= 0) {
if (gpio_request(host->detect_pin, "mmc_detect")) {
- printk(KERN_WARNING "%s: no detect pin available\n",
- mmc_hostname(host->mmc));
+ dev_dbg(&mmc->class_dev, "no detect pin available\n");
host->detect_pin = -1;
} else {
host->present = !gpio_get_value(host->detect_pin);
@@ -1080,8 +1093,7 @@ static int __devinit atmci_probe(struct platform_device *pdev)
}
if (host->wp_pin >= 0) {
if (gpio_request(host->wp_pin, "mmc_wp")) {
- printk(KERN_WARNING "%s: no WP pin available\n",
- mmc_hostname(host->mmc));
+ dev_dbg(&mmc->class_dev, "no WP pin available\n");
host->wp_pin = -1;
}
}
@@ -1090,14 +1102,12 @@ static int __devinit atmci_probe(struct platform_device *pdev)
ret = -ENOMEM;
host->dma.req.req.dmac = find_dma_controller(0);
if (!host->dma.req.req.dmac) {
- printk(KERN_ERR
- "mmci: No DMA controller available, aborting\n");
+ dev_dbg(&mmc->class_dev, "no DMA controller available\n");
goto out_free_irq;
}
ret = dma_alloc_channel(host->dma.req.req.dmac);
if (ret < 0) {
- printk(KERN_ERR
- "mmci: Unable to allocate DMA channel, aborting\n");
+ dev_dbg(&mmc->class_dev, "unable to allocate DMA channel\n");
goto out_free_irq;
}
host->dma.req.req.channel = ret;
@@ -1110,7 +1120,6 @@ static int __devinit atmci_probe(struct platform_device *pdev)
mci_writel(host, CR, MCI_BIT(SWRST));
mci_writel(host, IDR, ~0UL);
- mci_writel(host, CR, MCI_BIT(MCIEN));
platform_set_drvdata(pdev, host);
@@ -1122,17 +1131,16 @@ static int __devinit atmci_probe(struct platform_device *pdev)
IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
DRIVER_NAME, mmc);
if (ret) {
- printk(KERN_ERR
- "%s: could not request IRQ %d for detect pin\n",
- mmc_hostname(mmc),
- gpio_to_irq(host->detect_pin));
+ dev_dbg(&mmc->class_dev,
+ "could not request IRQ %d for detect pin\n",
+ gpio_to_irq(host->detect_pin));
gpio_free(host->detect_pin);
host->detect_pin = -1;
}
}
- printk(KERN_INFO "%s: Atmel MCI controller at 0x%08lx irq %d\n",
- mmc_hostname(mmc), host->mapbase, irq);
+ dev_info(&mmc->class_dev, "Atmel MCI controller at 0x%08lx irq %d\n",
+ host->mapbase, irq);
atmci_init_debugfs(host);
--
1.5.3.2
_______________________________________________
Kernel mailing list
Kernel@avr32linux.org
http://duppen.flaskehals.net/cgi-bin/mailman/listinfo/kernel

438
target/device/Atmel/arch-avr32/kernel-patches-2.6.22.10/linux-2.6.22.10-502-atmel_mci-fix-two-subtle-but-deadly-races.patch
View File

@ -1,438 +0,0 @@
From: Haavard Skinnemoen <hskinnemoen@atmel.com>
Subject: [PATCH 2/2] atmel_mci: Fix two subtle but deadly races
This patch fixes two possible races in the atmel_mci driver, at least
one of which may cause card probing to fail.
The first one may happen if a command fails and the next command is
queued before the controller is ready to accept a new one. Fix this by
not enabling error interrupts for commands and instead do any error
handling when the CMDRDY bit has been set.
The second one may happen after a successful read data transfer where
then next command is queued after the DMA transfer is complete, but
before the whole data transfer from the card is complete (i.e. the
card is still sending CRC, for example.) Fix this by waiting for the
NOTBUSY bit to be set before considering the request to be done. This
will also ensure that we actually see any CRC failures before
completing the request.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---
drivers/mmc/host/atmel-mci.c | 172 +++++++++++++-----------------------------
1 files changed, 54 insertions(+), 118 deletions(-)
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 1dc91b4..45323c9 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -28,20 +28,15 @@
#define DRIVER_NAME "atmel_mci"
-#define MCI_CMD_ERROR_FLAGS (MCI_BIT(RINDE) | MCI_BIT(RDIRE) | \
- MCI_BIT(RCRCE) | MCI_BIT(RENDE) | \
- MCI_BIT(RTOE))
#define MCI_DATA_ERROR_FLAGS (MCI_BIT(DCRCE) | MCI_BIT(DTOE) | \
MCI_BIT(OVRE) | MCI_BIT(UNRE))
enum {
EVENT_CMD_COMPLETE = 0,
- EVENT_CMD_ERROR,
EVENT_DATA_COMPLETE,
EVENT_DATA_ERROR,
EVENT_STOP_SENT,
EVENT_STOP_COMPLETE,
- EVENT_STOP_ERROR,
EVENT_DMA_ERROR,
EVENT_CARD_DETECT,
};
@@ -61,13 +56,14 @@ struct atmel_mci {
struct mmc_command *cmd;
struct mmc_data *data;
+ u32 cmd_status;
+ u32 data_status;
+ u32 stop_status;
u32 stop_cmdr;
- u32 stop_iflags;
struct tasklet_struct tasklet;
unsigned long pending_events;
unsigned long completed_events;
- u32 error_status;
int present;
int detect_pin;
@@ -99,8 +95,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
/* Test bit macros for completed events */
#define mci_cmd_is_complete(host) \
test_bit(EVENT_CMD_COMPLETE, &host->completed_events)
-#define mci_cmd_error_is_complete(host) \
- test_bit(EVENT_CMD_ERROR, &host->completed_events)
#define mci_data_is_complete(host) \
test_bit(EVENT_DATA_COMPLETE, &host->completed_events)
#define mci_data_error_is_complete(host) \
@@ -109,8 +103,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
test_bit(EVENT_STOP_SENT, &host->completed_events)
#define mci_stop_is_complete(host) \
test_bit(EVENT_STOP_COMPLETE, &host->completed_events)
-#define mci_stop_error_is_complete(host) \
- test_bit(EVENT_STOP_ERROR, &host->completed_events)
#define mci_dma_error_is_complete(host) \
test_bit(EVENT_DMA_ERROR, &host->completed_events)
#define mci_card_detect_is_complete(host) \
@@ -119,8 +111,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
/* Test and clear bit macros for pending events */
#define mci_clear_cmd_is_pending(host) \
test_and_clear_bit(EVENT_CMD_COMPLETE, &host->pending_events)
-#define mci_clear_cmd_error_is_pending(host) \
- test_and_clear_bit(EVENT_CMD_ERROR, &host->pending_events)
#define mci_clear_data_is_pending(host) \
test_and_clear_bit(EVENT_DATA_COMPLETE, &host->pending_events)
#define mci_clear_data_error_is_pending(host) \
@@ -129,8 +119,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
test_and_clear_bit(EVENT_STOP_SENT, &host->pending_events)
#define mci_clear_stop_is_pending(host) \
test_and_clear_bit(EVENT_STOP_COMPLETE, &host->pending_events)
-#define mci_clear_stop_error_is_pending(host) \
- test_and_clear_bit(EVENT_STOP_ERROR, &host->pending_events)
#define mci_clear_dma_error_is_pending(host) \
test_and_clear_bit(EVENT_DMA_ERROR, &host->pending_events)
#define mci_clear_card_detect_is_pending(host) \
@@ -139,8 +127,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
/* Test and set bit macros for completed events */
#define mci_set_cmd_is_completed(host) \
test_and_set_bit(EVENT_CMD_COMPLETE, &host->completed_events)
-#define mci_set_cmd_error_is_completed(host) \
- test_and_set_bit(EVENT_CMD_ERROR, &host->completed_events)
#define mci_set_data_is_completed(host) \
test_and_set_bit(EVENT_DATA_COMPLETE, &host->completed_events)
#define mci_set_data_error_is_completed(host) \
@@ -149,8 +135,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
test_and_set_bit(EVENT_STOP_SENT, &host->completed_events)
#define mci_set_stop_is_completed(host) \
test_and_set_bit(EVENT_STOP_COMPLETE, &host->completed_events)
-#define mci_set_stop_error_is_completed(host) \
- test_and_set_bit(EVENT_STOP_ERROR, &host->completed_events)
#define mci_set_dma_error_is_completed(host) \
test_and_set_bit(EVENT_DMA_ERROR, &host->completed_events)
#define mci_set_card_detect_is_completed(host) \
@@ -159,8 +143,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
/* Set bit macros for completed events */
#define mci_set_cmd_complete(host) \
set_bit(EVENT_CMD_COMPLETE, &host->completed_events)
-#define mci_set_cmd_error_complete(host) \
- set_bit(EVENT_CMD_ERROR, &host->completed_events)
#define mci_set_data_complete(host) \
set_bit(EVENT_DATA_COMPLETE, &host->completed_events)
#define mci_set_data_error_complete(host) \
@@ -169,8 +151,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
set_bit(EVENT_STOP_SENT, &host->completed_events)
#define mci_set_stop_complete(host) \
set_bit(EVENT_STOP_COMPLETE, &host->completed_events)
-#define mci_set_stop_error_complete(host) \
- set_bit(EVENT_STOP_ERROR, &host->completed_events)
#define mci_set_dma_error_complete(host) \
set_bit(EVENT_DMA_ERROR, &host->completed_events)
#define mci_set_card_detect_complete(host) \
@@ -179,8 +159,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
/* Set bit macros for pending events */
#define mci_set_cmd_pending(host) \
set_bit(EVENT_CMD_COMPLETE, &host->pending_events)
-#define mci_set_cmd_error_pending(host) \
- set_bit(EVENT_CMD_ERROR, &host->pending_events)
#define mci_set_data_pending(host) \
set_bit(EVENT_DATA_COMPLETE, &host->pending_events)
#define mci_set_data_error_pending(host) \
@@ -189,8 +167,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
set_bit(EVENT_STOP_SENT, &host->pending_events)
#define mci_set_stop_pending(host) \
set_bit(EVENT_STOP_COMPLETE, &host->pending_events)
-#define mci_set_stop_error_pending(host) \
- set_bit(EVENT_STOP_ERROR, &host->pending_events)
#define mci_set_dma_error_pending(host) \
set_bit(EVENT_DMA_ERROR, &host->pending_events)
#define mci_set_card_detect_pending(host) \
@@ -199,8 +175,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
/* Clear bit macros for pending events */
#define mci_clear_cmd_pending(host) \
clear_bit(EVENT_CMD_COMPLETE, &host->pending_events)
-#define mci_clear_cmd_error_pending(host) \
- clear_bit(EVENT_CMD_ERROR, &host->pending_events)
#define mci_clear_data_pending(host) \
clear_bit(EVENT_DATA_COMPLETE, &host->pending_events)
#define mci_clear_data_error_pending(host) \
@@ -209,8 +183,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
clear_bit(EVENT_STOP_SENT, &host->pending_events)
#define mci_clear_stop_pending(host) \
clear_bit(EVENT_STOP_COMPLETE, &host->pending_events)
-#define mci_clear_stop_error_pending(host) \
- clear_bit(EVENT_STOP_ERROR, &host->pending_events)
#define mci_clear_dma_error_pending(host) \
clear_bit(EVENT_DMA_ERROR, &host->pending_events)
#define mci_clear_card_detect_pending(host) \
@@ -471,20 +443,16 @@ static void atmci_set_timeout(struct atmel_mci *host,
}
/*
- * Return mask with interrupt flags to be handled for this command.
+ * Return mask with command flags to be enabled for this command.
*/
static u32 atmci_prepare_command(struct mmc_host *mmc,
- struct mmc_command *cmd,
- u32 *cmd_flags)
+ struct mmc_command *cmd)
{
u32 cmdr;
- u32 iflags;
cmd->error = MMC_ERR_NONE;
- cmdr = 0;
- BUG_ON(MCI_BFEXT(CMDNB, cmdr) != 0);
- cmdr = MCI_BFINS(CMDNB, cmd->opcode, cmdr);
+ cmdr = MCI_BF(CMDNB, cmd->opcode);
if (cmd->flags & MMC_RSP_PRESENT) {
if (cmd->flags & MMC_RSP_136)
@@ -503,16 +471,11 @@ static u32 atmci_prepare_command(struct mmc_host *mmc,
if (mmc->ios.bus_mode == MMC_BUSMODE_OPENDRAIN)
cmdr |= MCI_BIT(OPDCMD);
- iflags = MCI_BIT(CMDRDY) | MCI_CMD_ERROR_FLAGS;
- if (!(cmd->flags & MMC_RSP_CRC))
- iflags &= ~MCI_BIT(RCRCE);
-
dev_dbg(&mmc->class_dev,
"cmd: op %02x arg %08x flags %08x, cmdflags %08lx\n",
cmd->opcode, cmd->arg, cmd->flags, (unsigned long)cmdr);
- *cmd_flags = cmdr;
- return iflags;
+ return cmdr;
}
static void atmci_start_command(struct atmel_mci *host,
@@ -596,13 +559,13 @@ static void atmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
host->pending_events = 0;
host->completed_events = 0;
- iflags = atmci_prepare_command(mmc, mrq->cmd, &cmdflags);
+ iflags = MCI_BIT(CMDRDY);
+ cmdflags = atmci_prepare_command(mmc, mrq->cmd);
if (mrq->stop) {
- BUG_ON(!data);
+ WARN_ON(!data);
- host->stop_iflags = atmci_prepare_command(mmc, mrq->stop,
- &host->stop_cmdr);
+ host->stop_cmdr = atmci_prepare_command(mmc, mrq->stop);
host->stop_cmdr |= MCI_BF(TRCMD, MCI_TRCMD_STOP_TRANS);
if (!(data->flags & MMC_DATA_WRITE))
host->stop_cmdr |= MCI_BIT(TRDIR);
@@ -716,7 +679,7 @@ static void send_stop_cmd(struct mmc_host *mmc, struct mmc_data *data,
struct atmel_mci *host = mmc_priv(mmc);
atmci_start_command(host, data->stop, host->stop_cmdr | flags);
- mci_writel(host, IER, host->stop_iflags);
+ mci_writel(host, IER, MCI_BIT(CMDRDY));
}
static void atmci_data_complete(struct atmel_mci *host, struct mmc_data *data)
@@ -735,18 +698,30 @@ static void atmci_data_complete(struct atmel_mci *host, struct mmc_data *data)
atmci_request_end(host->mmc, data->mrq);
}
-static void atmci_command_error(struct mmc_host *mmc,
- struct mmc_command *cmd,
- u32 status)
+static void atmci_command_complete(struct atmel_mci *host,
+ struct mmc_command *cmd, u32 status)
{
- dev_dbg(&mmc->class_dev, "command error: status=0x%08x\n", status);
-
if (status & MCI_BIT(RTOE))
cmd->error = MMC_ERR_TIMEOUT;
- else if (status & MCI_BIT(RCRCE))
+ else if ((cmd->flags & MMC_RSP_CRC)
+ && (status & MCI_BIT(RCRCE)))
cmd->error = MMC_ERR_BADCRC;
- else
+ else if (status & (MCI_BIT(RINDE) | MCI_BIT(RDIRE) | MCI_BIT(RENDE)))
cmd->error = MMC_ERR_FAILED;
+
+ if (cmd->error != MMC_ERR_NONE) {
+ dev_dbg(&host->mmc->class_dev,
+ "command error: op=0x%x status=0x%08x\n",
+ cmd->opcode, status);
+
+ if (cmd->data) {
+ dma_stop_request(host->dma.req.req.dmac,
+ host->dma.req.req.channel);
+ mci_writel(host, IDR, MCI_BIT(NOTBUSY)
+ | MCI_DATA_ERROR_FLAGS);
+ host->data = NULL;
+ }
+ }
}
static void atmci_tasklet_func(unsigned long priv)
@@ -761,38 +736,16 @@ static void atmci_tasklet_func(unsigned long priv)
host->pending_events, host->completed_events,
mci_readl(host, IMR));
- if (mci_clear_cmd_error_is_pending(host)) {
- struct mmc_command *cmd;
-
- mci_set_cmd_error_complete(host);
- mci_clear_cmd_pending(host);
- cmd = host->mrq->cmd;
-
- if (cmd->data) {
- dma_stop_request(host->dma.req.req.dmac,
- host->dma.req.req.channel);
- host->data = NULL;
- }
-
- atmci_command_error(mmc, cmd, host->error_status);
- atmci_request_end(mmc, cmd->mrq);
- }
- if (mci_clear_stop_error_is_pending(host)) {
- mci_set_stop_error_complete(host);
- mci_clear_stop_pending(host);
- atmci_command_error(mmc, host->mrq->stop,
- host->error_status);
- if (!host->data)
- atmci_request_end(mmc, host->mrq);
- }
if (mci_clear_cmd_is_pending(host)) {
mci_set_cmd_complete(host);
- if (!mrq->data || mci_data_is_complete(host)
+ atmci_command_complete(host, mrq->cmd, host->cmd_status);
+ if (!host->data || mci_data_is_complete(host)
|| mci_data_error_is_complete(host))
atmci_request_end(mmc, mrq);
}
if (mci_clear_stop_is_pending(host)) {
mci_set_stop_complete(host);
+ atmci_command_complete(host, mrq->stop, host->stop_status);
if (mci_data_is_complete(host)
|| mci_data_error_is_complete(host))
atmci_request_end(mmc, mrq);
@@ -815,7 +768,7 @@ static void atmci_tasklet_func(unsigned long priv)
atmci_data_complete(host, data);
}
if (mci_clear_data_error_is_pending(host)) {
- u32 status = host->error_status;
+ u32 status = host->data_status;
mci_set_data_error_complete(host);
mci_clear_data_pending(host);
@@ -858,10 +811,8 @@ static void atmci_tasklet_func(unsigned long priv)
/* Clean up queue if present */
if (mrq) {
- if (!mci_cmd_is_complete(host)
- && !mci_cmd_error_is_complete(host)) {
+ if (!mci_cmd_is_complete(host))
mrq->cmd->error = MMC_ERR_TIMEOUT;
- }
if (mrq->data && !mci_data_is_complete(host)
&& !mci_data_error_is_complete(host)) {
dma_stop_request(host->dma.req.req.dmac,
@@ -869,10 +820,8 @@ static void atmci_tasklet_func(unsigned long priv)
host->data->error = MMC_ERR_TIMEOUT;
atmci_data_complete(host, data);
}
- if (mrq->stop && !mci_stop_is_complete(host)
- && !mci_stop_error_is_complete(host)) {
+ if (mrq->stop && !mci_stop_is_complete(host))
mrq->stop->error = MMC_ERR_TIMEOUT;
- }
host->cmd = NULL;
atmci_request_end(mmc, mrq);
@@ -895,13 +844,16 @@ static void atmci_cmd_interrupt(struct mmc_host *mmc, u32 status)
cmd->resp[2] = mci_readl(host, RSPR);
cmd->resp[3] = mci_readl(host, RSPR);
- mci_writel(host, IDR, MCI_BIT(CMDRDY) | MCI_CMD_ERROR_FLAGS);
+ mci_writel(host, IDR, MCI_BIT(CMDRDY));
host->cmd = NULL;
- if (mci_stop_sent_is_complete(host))
+ if (mci_stop_sent_is_complete(host)) {
+ host->stop_status = status;
mci_set_stop_pending(host);
- else
+ } else {
+ host->cmd_status = status;
mci_set_cmd_pending(host);
+ }
tasklet_schedule(&host->tasklet);
}
@@ -920,18 +872,16 @@ static void atmci_xfer_complete(struct dma_request *_req)
if (data->stop && !mci_set_stop_sent_is_completed(host))
send_stop_cmd(host->mmc, data, 0);
- if (data->flags & MMC_DATA_READ) {
- mci_writel(host, IDR, MCI_DATA_ERROR_FLAGS);
- mci_set_data_pending(host);
- tasklet_schedule(&host->tasklet);
- } else {
- /*
- * For the WRITE case, wait for NOTBUSY. This function
- * is called when everything has been written to the
- * controller, not when the card is done programming.
- */
- mci_writel(host, IER, MCI_BIT(NOTBUSY));
- }
+ /*
+ * Regardless of what the documentation says, we have to wait
+ * for NOTBUSY even after block read operations.
+ *
+ * When the DMA transfer is complete, the controller may still
+ * be reading the CRC from the card, i.e. the data transfer is
+ * still in progress and we haven't seen all the potential
+ * error bits yet.
+ */
+ mci_writel(host, IER, MCI_BIT(NOTBUSY));
}
static void atmci_dma_error(struct dma_request *_req)
@@ -963,24 +913,10 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)
pending = status & mask;
do {
- if (pending & MCI_CMD_ERROR_FLAGS) {
- mci_writel(host, IDR, (MCI_BIT(CMDRDY)
- | MCI_BIT(NOTBUSY)
- | MCI_CMD_ERROR_FLAGS
- | MCI_DATA_ERROR_FLAGS));
- host->error_status = status;
- host->cmd = NULL;
- if (mci_stop_sent_is_complete(host))
- mci_set_stop_error_pending(host);
- else
- mci_set_cmd_error_pending(host);
- tasklet_schedule(&host->tasklet);
- break;
- }
if (pending & MCI_DATA_ERROR_FLAGS) {
mci_writel(host, IDR, (MCI_BIT(NOTBUSY)
| MCI_DATA_ERROR_FLAGS));
- host->error_status = status;
+ host->data_status = status;
mci_set_data_error_pending(host);
tasklet_schedule(&host->tasklet);
break;
--
1.5.3.2
_______________________________________________
Kernel mailing list
Kernel@avr32linux.org
http://duppen.flaskehals.net/cgi-bin/mailman/listinfo/kernel

19857
target/device/Atmel/arch-avr32/kernel-patches-2.6.23/linux-2.6.23-100-avr32-atmel.2.patch
View File

File diff suppressed because it is too large Load Diff

11
target/device/Atmel/arch-avr32/kernel-patches-2.6.23/linux-2.6.23-200-fix-include-typo-for-atngw100-board.patch
View File

@ -1,11 +0,0 @@
--- a/arch/avr32/boards/atngw100/setup.c 2007-11-02 10:47:52.000000000 +0100
+++ b/arch/avr32/boards/atngw100/setup.c 2007-11-02 10:48:00.000000000 +0100
@@ -20,7 +20,7 @@
#include <asm/io.h>
#include <asm/setup.h>
-#include <asm/arch/at32ap7000.h>
+#include <asm/arch/at32ap700x.h>
#include <asm/arch/board.h>
#include <asm/arch/init.h>
#include <asm/arch/portmux.h>

16922
target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-100-avr32-git.1.patch
View File

File diff suppressed because it is too large Load Diff

2954
target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-500-v4l-avr32-isi.patch.cond
View File

File diff suppressed because it is too large Load Diff

255
target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-600-avr32-mmc.patch
View File

@ -1,255 +0,0 @@
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index eeac479..7913cd8 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -39,7 +39,6 @@ enum {
EVENT_STOP_COMPLETE,
EVENT_DMA_COMPLETE,
EVENT_DMA_ERROR,
- EVENT_CARD_DETECT,
};
struct atmel_mci_dma {
@@ -70,6 +69,9 @@ struct atmel_mci {
int detect_pin;
int wp_pin;
+ /* For detect pin debouncing */
+ struct timer_list detect_timer;
+
unsigned long bus_hz;
unsigned long mapbase;
struct clk *mck;
@@ -108,8 +110,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
test_bit(EVENT_DMA_COMPLETE, &host->completed_events)
#define mci_dma_error_is_complete(host) \
test_bit(EVENT_DMA_ERROR, &host->completed_events)
-#define mci_card_detect_is_complete(host) \
- test_bit(EVENT_CARD_DETECT, &host->completed_events)
/* Test and clear bit macros for pending events */
#define mci_clear_cmd_is_pending(host) \
@@ -124,8 +124,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
test_and_clear_bit(EVENT_STOP_COMPLETE, &host->pending_events)
#define mci_clear_dma_error_is_pending(host) \
test_and_clear_bit(EVENT_DMA_ERROR, &host->pending_events)
-#define mci_clear_card_detect_is_pending(host) \
- test_and_clear_bit(EVENT_CARD_DETECT, &host->pending_events)
/* Test and set bit macros for completed events */
#define mci_set_cmd_is_completed(host) \
@@ -140,8 +138,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
test_and_set_bit(EVENT_STOP_COMPLETE, &host->completed_events)
#define mci_set_dma_error_is_completed(host) \
test_and_set_bit(EVENT_DMA_ERROR, &host->completed_events)
-#define mci_set_card_detect_is_completed(host) \
- test_and_set_bit(EVENT_CARD_DETECT, &host->completed_events)
/* Set bit macros for completed events */
#define mci_set_cmd_complete(host) \
@@ -158,8 +154,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
set_bit(EVENT_DMA_COMPLETE, &host->completed_events)
#define mci_set_dma_error_complete(host) \
set_bit(EVENT_DMA_ERROR, &host->completed_events)
-#define mci_set_card_detect_complete(host) \
- set_bit(EVENT_CARD_DETECT, &host->completed_events)
/* Set bit macros for pending events */
#define mci_set_cmd_pending(host) \
@@ -174,8 +168,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
set_bit(EVENT_STOP_COMPLETE, &host->pending_events)
#define mci_set_dma_error_pending(host) \
set_bit(EVENT_DMA_ERROR, &host->pending_events)
-#define mci_set_card_detect_pending(host) \
- set_bit(EVENT_CARD_DETECT, &host->pending_events)
/* Clear bit macros for pending events */
#define mci_clear_cmd_pending(host) \
@@ -190,8 +182,6 @@ MODULE_PARM_DESC(fmax, "Max frequency in Hz of the MMC bus clock");
clear_bit(EVENT_STOP_COMPLETE, &host->pending_events)
#define mci_clear_dma_error_pending(host) \
clear_bit(EVENT_DMA_ERROR, &host->pending_events)
-#define mci_clear_card_detect_pending(host) \
- clear_bit(EVENT_CARD_DETECT, &host->pending_events)
#ifdef CONFIG_DEBUG_FS
@@ -560,6 +550,21 @@ static void atmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
mci_readl(host, IMR));
WARN_ON(host->mrq != NULL);
+
+ /*
+ * We may "know" the card is gone even though there's still an
+ * electrical connection. If so, we really need to communicate
+ * this to the MMC core since there won't be any more
+ * interrupts as the card is completely removed. Otherwise,
+ * the MMC core might believe the card is still there even
+ * though the card was just removed very slowly.
+ */
+ if (!host->present) {
+ mrq->cmd->error = -ENOMEDIUM;
+ mmc_request_done(mmc, mrq);
+ return;
+ }
+
host->mrq = mrq;
host->pending_events = 0;
host->completed_events = 0;
@@ -729,6 +734,61 @@ static void atmci_command_complete(struct atmel_mci *host,
}
}
+static void atmci_detect_change(unsigned long data)
+{
+ struct atmel_mci *host = (struct atmel_mci *)data;
+ struct mmc_request *mrq = host->mrq;
+ int present;
+
+ /*
+ * atmci_remove() sets detect_pin to -1 before freeing the
+ * interrupt. We must not re-enable the interrupt if it has
+ * been freed.
+ */
+ smp_rmb();
+ if (host->detect_pin < 0)
+ return;
+
+ enable_irq(gpio_to_irq(host->detect_pin));
+ present = !gpio_get_value(host->detect_pin);
+
+ dev_vdbg(&host->pdev->dev, "detect change: %d (was %d)\n",
+ present, host->present);
+
+ if (present != host->present) {
+ dev_dbg(&host->mmc->class_dev, "card %s\n",
+ present ? "inserted" : "removed");
+ host->present = present;
+
+ /* Reset controller if card is gone */
+ if (!present) {
+ mci_writel(host, CR, MCI_BIT(SWRST));
+ mci_writel(host, IDR, ~0UL);
+ mci_writel(host, CR, MCI_BIT(MCIEN));
+ }
+
+ /* Clean up queue if present */
+ if (mrq) {
+ if (!mci_cmd_is_complete(host))
+ mrq->cmd->error = -ENOMEDIUM;
+ if (mrq->data && !mci_data_is_complete(host)
+ && !mci_data_error_is_complete(host)) {
+ dma_stop_request(host->dma.req.req.dmac,
+ host->dma.req.req.channel);
+ host->data->error = -ENOMEDIUM;
+ atmci_data_complete(host, host->data);
+ }
+ if (mrq->stop && !mci_stop_is_complete(host))
+ mrq->stop->error = -ENOMEDIUM;
+
+ host->cmd = NULL;
+ atmci_request_end(host->mmc, mrq);
+ }
+
+ mmc_detect_change(host->mmc, 0);
+ }
+}
+
static void atmci_tasklet_func(unsigned long priv)
{
struct mmc_host *mmc = (struct mmc_host *)priv;
@@ -806,33 +866,6 @@ static void atmci_tasklet_func(unsigned long priv)
data->bytes_xfered = data->blocks * data->blksz;
atmci_data_complete(host, data);
}
- if (mci_clear_card_detect_is_pending(host)) {
- /* Reset controller if card is gone */
- if (!host->present) {
- mci_writel(host, CR, MCI_BIT(SWRST));
- mci_writel(host, IDR, ~0UL);
- mci_writel(host, CR, MCI_BIT(MCIEN));
- }
-
- /* Clean up queue if present */
- if (mrq) {
- if (!mci_cmd_is_complete(host))
- mrq->cmd->error = -ETIMEDOUT;
- if (mrq->data && !mci_data_is_complete(host)
- && !mci_data_error_is_complete(host)) {
- dma_stop_request(host->dma.req.req.dmac,
- host->dma.req.req.channel);
- host->data->error = -ETIMEDOUT;
- atmci_data_complete(host, data);
- }
- if (mrq->stop && !mci_stop_is_complete(host))
- mrq->stop->error = -ETIMEDOUT;
-
- host->cmd = NULL;
- atmci_request_end(mmc, mrq);
- }
- mmc_detect_change(host->mmc, msecs_to_jiffies(100));
- }
}
static void atmci_cmd_interrupt(struct mmc_host *mmc, u32 status)
@@ -957,20 +990,19 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static irqreturn_t atmci_detect_change(int irq, void *dev_id)
+static irqreturn_t atmci_detect_interrupt(int irq, void *dev_id)
{
struct mmc_host *mmc = dev_id;
struct atmel_mci *host = mmc_priv(mmc);
- int present = !gpio_get_value(irq_to_gpio(irq));
+ /*
+ * Disable interrupts until the pin has stabilized and check
+ * the state then. Use mod_timer() since we may be in the
+ * middle of the timer routine when this interrupt triggers.
+ */
+ disable_irq_nosync(irq);
+ mod_timer(&host->detect_timer, jiffies + msecs_to_jiffies(20));
- if (present != host->present) {
- dev_dbg(&mmc->class_dev, "card %s\n",
- present ? "inserted" : "removed");
- host->present = present;
- mci_set_card_detect_pending(host);
- tasklet_schedule(&host->tasklet);
- }
return IRQ_HANDLED;
}
@@ -1079,8 +1111,11 @@ static int __devinit atmci_probe(struct platform_device *pdev)
mmc_add_host(mmc);
if (host->detect_pin >= 0) {
+ setup_timer(&host->detect_timer, atmci_detect_change,
+ (unsigned long)host);
+
ret = request_irq(gpio_to_irq(host->detect_pin),
- atmci_detect_change,
+ atmci_detect_interrupt,
IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
DRIVER_NAME, mmc);
if (ret) {
@@ -1125,9 +1160,16 @@ static int __devexit atmci_remove(struct platform_device *pdev)
atmci_cleanup_debugfs(host);
if (host->detect_pin >= 0) {
- free_irq(gpio_to_irq(host->detect_pin), host->mmc);
+ int pin = host->detect_pin;
+
+ /* Make sure our timer doesn't enable the interrupt */
+ host->detect_pin = -1;
+ smp_wmb();
+
+ free_irq(gpio_to_irq(pin), host->mmc);
+ del_timer_sync(&host->detect_timer);
cancel_delayed_work(&host->mmc->detect);
- gpio_free(host->detect_pin);
+ gpio_free(pin);
}
mmc_remove_host(host->mmc);

289
target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-avr32-ac97-reset.patch.cond
View File

@ -1,289 +0,0 @@
diff --git a/sound/avr32/ac97c.c b/sound/avr32/ac97c.c
index 0ec0b1c..3a58375 100644
--- a/sound/avr32/ac97c.c
+++ b/sound/avr32/ac97c.c
@@ -25,6 +25,8 @@
#include <sound/ac97_codec.h>
#include <sound/memalloc.h>
+#include <asm/gpio.h>
+#include <asm/arch/board.h>
#include <asm/dma-controller.h>
#include "ac97c.h"
@@ -37,6 +39,7 @@ struct atmel_ac97_dma_info {
struct dma_request_cyclic req_rx;
unsigned short rx_periph_id;
unsigned short tx_periph_id;
+ unsigned short controller;
};
struct atmel_ac97 {
@@ -51,6 +54,7 @@ struct atmel_ac97 {
struct snd_ac97_bus *ac97_bus;
int opened;
int period;
+ int reset_pin;
u64 cur_format;
unsigned int cur_rate;
struct clk *mck;
@@ -692,6 +696,12 @@ timed_out:
static void snd_atmel_ac97_reset(struct atmel_ac97 *chip)
{
+ if (chip->reset_pin >= 0) {
+ gpio_set_value(chip->reset_pin, 0);
+ udelay(5);
+ gpio_set_value(chip->reset_pin, 1);
+ }
+
ac97c_writel(chip, MR, AC97C_MR_WRST);
mdelay(1);
ac97c_writel(chip, MR, AC97C_MR_ENA);
@@ -727,6 +737,7 @@ static int __devinit snd_atmel_ac97_create(struct snd_card *card,
.read = snd_atmel_ac97_read,
};
struct atmel_ac97 *chip = get_chip(card);
+ struct ac97c_platform_data *pdata;
struct resource *regs;
struct clk *mck;
int err;
@@ -735,6 +746,29 @@ static int __devinit snd_atmel_ac97_create(struct snd_card *card,
if (!regs)
return -ENXIO;
+ pdata = pdev->dev.platform_data;
+ if (pdata) {
+ chip->reset_pin = pdata->reset_pin;
+
+ if (chip->reset_pin >= 0) {
+ if (gpio_request(chip->reset_pin,
+ chip->card->shortname)) {
+ dev_dbg(&pdev->dev,
+ "ac97: reset pin "
+ "not available\n");
+ chip->reset_pin = -1;
+ } else {
+ gpio_direction_output(chip->reset_pin, 1);
+ }
+ }
+
+ chip->dma.rx_periph_id = pdata->dma_rx_periph_id;
+ chip->dma.tx_periph_id = pdata->dma_tx_periph_id;
+ chip->dma.controller = pdata->dma_controller_id;
+ } else {
+ return -ENXIO;
+ }
+
mck = clk_get(&pdev->dev, "pclk");
if (IS_ERR(mck))
return PTR_ERR(mck);
@@ -789,23 +823,19 @@ static int __devinit snd_atmel_ac97_probe(struct platform_device *pdev)
if (err)
goto out_free_card;
- /* TODO: Get this information from the platform device */
- chip->dma.req_tx.req.dmac = find_dma_controller(0);
+ chip->dma.req_tx.req.dmac = find_dma_controller(chip->dma.controller);
if (!chip->dma.req_tx.req.dmac) {
dev_dbg(&chip->pdev->dev, "DMA controller for TX missing\n");
err = -ENODEV;
goto out_free_card;
}
- chip->dma.req_rx.req.dmac = find_dma_controller(0);
+ chip->dma.req_rx.req.dmac = find_dma_controller(chip->dma.controller);
if (!chip->dma.req_rx.req.dmac) {
dev_dbg(&chip->pdev->dev, "DMA controller for RX missing\n");
err = -ENODEV;
goto out_free_card;
}
- chip->dma.rx_periph_id = 3;
- chip->dma.tx_periph_id = 4;
-
ch = dma_alloc_channel(chip->dma.req_tx.req.dmac);
if (ch < 0) {
dev_dbg(&chip->pdev->dev,
--
1.5.2.5
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 06795d0..58f3841 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1552,12 +1552,15 @@ static struct clk atmel_ac97c0_pclk = {
.index = 10,
};
-struct platform_device *__init at32_add_device_ac97c(unsigned int id)
+struct platform_device *__init
+at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data)
{
struct platform_device *pdev;
if (id != 0)
return NULL;
+ if (!data)
+ return NULL;
pdev = platform_device_alloc("atmel_ac97c", id);
if (!pdev)
@@ -1567,10 +1570,17 @@ struct platform_device *__init at32_add_device_ac97c(unsigned int id)
ARRAY_SIZE(atmel_ac97c0_resource)))
goto err_add_resources;
- select_peripheral(PB(20), PERIPH_B, 0); /* SYNC */
- select_peripheral(PB(21), PERIPH_B, 0); /* SDO */
- select_peripheral(PB(22), PERIPH_B, 0); /* SDI */
- select_peripheral(PB(23), PERIPH_B, 0); /* SCLK */
+ if (platform_device_add_data(pdev, data,
+ sizeof(struct ac97c_platform_data)))
+ goto err_add_resources;
+
+ select_peripheral(PB(20), PERIPH_B, 0); /* SDO */
+ select_peripheral(PB(21), PERIPH_B, 0); /* SYNC */
+ select_peripheral(PB(22), PERIPH_B, 0); /* SCLK */
+ select_peripheral(PB(23), PERIPH_B, 0); /* SDI */
+
+ if (data->reset_pin != GPIO_PIN_NONE)
+ at32_select_gpio(data->reset_pin, 0);
atmel_ac97c0_pclk.dev = &pdev->dev;
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h
index 8816b66..0386a0e 100644
--- a/include/asm-avr32/arch-at32ap/board.h
+++ b/include/asm-avr32/arch-at32ap/board.h
@@ -76,7 +76,16 @@ struct mci_platform_data {
};
struct platform_device *
at32_add_device_mci(unsigned int id, struct mci_platform_data *data);
-struct platform_device *at32_add_device_ac97c(unsigned int id);
+
+struct ac97c_platform_data {
+ unsigned short dma_rx_periph_id;
+ unsigned short dma_tx_periph_id;
+ unsigned short dma_controller_id;
+ int reset_pin;
+};
+struct platform_device *
+at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data);
+
struct platform_device *at32_add_device_abdac(unsigned int id);
struct cf_platform_data {
--
1.5.2.5
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 90436fa..eba6f89 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -151,6 +151,15 @@ static void __init set_hw_addr(struct platform_device *pdev)
clk_put(pclk);
}
+#ifdef CONFIG_BOARD_ATSTK100X_ENABLE_AC97
+static struct ac97c_platform_data __initdata ac97c0_data = {
+ .dma_rx_periph_id = 3,
+ .dma_tx_periph_id = 4,
+ .dma_controller_id = 0,
+ .reset_pin = GPIO_PIN_NONE,
+};
+#endif
+
#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
static void __init atstk1002_setup_extdac(void)
{
@@ -253,7 +262,7 @@ static int __init atstk1002_init(void)
#endif
at32_add_device_usba(0, NULL);
#ifdef CONFIG_BOARD_ATSTK100X_ENABLE_AC97
- at32_add_device_ac97c(0);
+ at32_add_device_ac97c(0, &ac97c0_data);
#else
at32_add_device_abdac(0);
#endif
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index 768d204..2564e3c 100644
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -72,6 +72,15 @@ static struct cf_platform_data __initdata cf0_data = {
.cs = 4,
};
+#ifdef CONFIG_BOARD_ATSTK100X_ENABLE_AC97
+static struct ac97c_platform_data __initdata ac97c0_data = {
+ .dma_rx_periph_id = 3,
+ .dma_tx_periph_id = 4,
+ .dma_controller_id = 0,
+ .reset_pin = GPIO_PIN_NONE,
+};
+#endif
+
#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
static void __init atstk1003_setup_extdac(void)
{
@@ -164,7 +173,7 @@ static int __init atstk1003_init(void)
#endif
at32_add_device_usba(0, NULL);
#ifdef CONFIG_BOARD_ATSTK100X_ENABLE_AC97
- at32_add_device_ac97c(0);
+ at32_add_device_ac97c(0, &ac97c0_data);
#else
at32_add_device_abdac(0);
#endif
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index 96015dd..3c25a6f 100644
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -64,6 +64,15 @@ static struct spi_board_info spi1_board_info[] __initdata = { {
} };
#endif
+#ifdef CONFIG_BOARD_ATSTK100X_ENABLE_AC97
+static struct ac97c_platform_data __initdata ac97c0_data = {
+ .dma_rx_periph_id = 3,
+ .dma_tx_periph_id = 4,
+ .dma_controller_id = 0,
+ .reset_pin = GPIO_PIN_NONE,
+};
+#endif
+
#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
static void __init atstk1004_setup_extdac(void)
{
@@ -136,7 +145,7 @@ static int __init atstk1004_init(void)
fbmem_start, fbmem_size);
at32_add_device_usba(0, NULL);
#ifdef CONFIG_BOARD_ATSTK100X_ENABLE_AC97
- at32_add_device_ac97c(0);
+ at32_add_device_ac97c(0, &ac97c0_data);
#else
at32_add_device_abdac(0);
#endif
--
1.5.2.5
--- a/arch/avr32/boards/atngw100/setup.c 2008-02-26 12:27:37.000000000 -0500
+++ b/arch/avr32/boards/atngw100/setup.c 2008-02-26 12:26:08.000000000 -0500
@@ -201,6 +201,13 @@ static struct platform_device i2c_gpio_d
};
#endif
+static struct ac97c_platform_data __initdata ac97c0_data = {
+ .dma_rx_periph_id = 3,
+ .dma_tx_periph_id = 4,
+ .dma_controller_id = 0,
+ .reset_pin = GPIO_PIN_NONE, // change to whatever pin you want, i.e. GPIO_PIN_PB(18)
+};
+
static int __init atngw100_init(void)
{
unsigned i;
@@ -222,7 +229,7 @@ static int __init atngw100_init(void)
at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
at32_add_device_mci(0, &mci0_data);
at32_add_device_usba(0, NULL);
- at32_add_device_ac97c(0);
+ at32_add_device_ac97c(0, &ac97c0_data);
for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {
at32_select_gpio(ngw_leds[i].gpio,

671
target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-avr32-psif-2.patch.cond
View File

@ -1,671 +0,0 @@
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index b88569e..2df47ed 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -88,6 +88,17 @@ config SERIO_RPCKBD
To compile this driver as a module, choose M here: the
module will be called rpckbd.
+config SERIO_AT32PSIF
+ tristate "AVR32 PSIF PS/2 keyboard and mouse controller"
+ depends on AVR32
+ default n
+ help
+ Say Y here if you want to use the PSIF peripheral on AVR32 devices
+ and connect a PS/2 keyboard and/or mouse to it.
+
+ To compile this driver as a module, choose M here: the module will
+ be called at32psif.
+
config SERIO_AMBAKMI
tristate "AMBA KMI keyboard controller"
depends on ARM_AMBA
diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile
index 4155197..38b8868 100644
--- a/drivers/input/serio/Makefile
+++ b/drivers/input/serio/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SERIO_CT82C710) += ct82c710.o
obj-$(CONFIG_SERIO_RPCKBD) += rpckbd.o
obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o
obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o
+obj-$(CONFIG_SERIO_AT32PSIF) += at32psif.o
obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o
obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o
obj-$(CONFIG_HP_SDC) += hp_sdc.o
diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c
new file mode 100644
index 0000000..228ab15
--- /dev/null
+++ b/drivers/input/serio/at32psif.c
@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2007 Atmel Corporation
+ *
+ * Driver for the AT32AP700X PS/2 controller (PSIF).
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/init.h>
+#include <linux/serio.h>
+#include <linux/interrupt.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+
+#include "at32psif.h"
+
+#define PSIF_BUF_SIZE 16
+
+#define ring_is_empty(_psif) (_psif->head == _psif->tail)
+#define ring_next_head(_psif) ((_psif->head + 1) & (PSIF_BUF_SIZE - 1))
+#define ring_next_tail(_psif) ((_psif->tail + 1) & (PSIF_BUF_SIZE - 1))
+
+struct psif {
+ struct platform_device *pdev;
+ struct clk *pclk;
+ struct serio *io;
+ void __iomem *regs;
+ unsigned int irq;
+ unsigned int open;
+ /* Prevent concurrent writes to circular buffer. */
+ spinlock_t lock;
+ unsigned int head;
+ unsigned int tail;
+ unsigned char buffer[PSIF_BUF_SIZE];
+};
+
+static irqreturn_t psif_interrupt(int irq, void *_ptr)
+{
+ struct psif *psif = _ptr;
+ int retval = IRQ_NONE;
+ unsigned int io_flags = 0;
+ unsigned long lock_flags;
+ unsigned long status;
+
+ status = psif_readl(psif, SR);
+
+ if (status & PSIF_BIT(RXRDY)) {
+ unsigned char val = (unsigned char) psif_readl(psif, RHR);
+
+ if (status & PSIF_BIT(PARITY))
+ io_flags |= SERIO_PARITY;
+ if (status & PSIF_BIT(OVRUN))
+ dev_err(&psif->pdev->dev, "overrun read error\n");
+
+ /* TODO: why do we have to wait? Are we too fast for serio? */
+ udelay(100);
+
+ serio_interrupt(psif->io, val, io_flags);
+
+ retval = IRQ_HANDLED;
+ }
+
+ spin_lock_irqsave(&psif->lock, lock_flags);
+
+ if (status & PSIF_BIT(TXEMPTY)) {
+ if (status & PSIF_BIT(NACK))
+ dev_err(&psif->pdev->dev, "NACK error\n");
+ if (ring_is_empty(psif)) {
+ psif_writel(psif, IDR, PSIF_BIT(TXEMPTY));
+ } else {
+ psif_writel(psif, THR, psif->buffer[psif->tail]);
+ psif->tail = ring_next_tail(psif);
+ }
+
+ retval = IRQ_HANDLED;
+ }
+
+ spin_unlock_irqrestore(&psif->lock, lock_flags);
+
+ return retval;
+}
+
+static int psif_write(struct serio *io, unsigned char val)
+{
+ struct psif *psif = io->port_data;
+ unsigned long flags;
+ unsigned int head;
+
+ spin_lock_irqsave(&psif->lock, flags);
+
+ /* Write directly if TX is ready. */
+ if (psif_readl(psif, SR) & PSIF_BIT(TXEMPTY)) {
+ psif_writel(psif, THR, val);
+ } else {
+ head = ring_next_head(psif);
+
+ if (head != psif->tail) {
+ psif->buffer[psif->head] = val;
+ psif->head = head;
+ } else {
+ dev_err(&psif->pdev->dev, "underrun write error\n");
+ }
+
+ /* Make sure TXEMPTY interrupt is enabled. */
+ psif_writel(psif, IER, PSIF_BIT(TXEMPTY));
+ }
+
+ spin_unlock_irqrestore(&psif->lock, flags);
+
+ return 0;
+}
+
+static int psif_open(struct serio *io)
+{
+ struct psif *psif = io->port_data;
+ int retval;
+
+ retval = clk_enable(psif->pclk);
+ if (retval)
+ goto out;
+
+ psif_writel(psif, CR, PSIF_BIT(CR_TXEN) | PSIF_BIT(CR_RXEN));
+ psif_writel(psif, IER, PSIF_BIT(RXRDY));
+
+ psif->open = 1;
+out:
+ return retval;
+}
+
+static void psif_close(struct serio *io)
+{
+ struct psif *psif = io->port_data;
+
+ psif->open = 0;
+
+ psif_writel(psif, IDR, ~0UL);
+ psif_writel(psif, CR, PSIF_BIT(CR_TXDIS) | PSIF_BIT(CR_RXDIS));
+
+ clk_disable(psif->pclk);
+}
+
+static void psif_set_prescaler(struct psif *psif)
+{
+ unsigned long prscv;
+ unsigned long rate = clk_get_rate(psif->pclk);
+
+ /* PRSCV = Pulse length (100 uS) * PSIF module frequency. */
+ prscv = 100 * (rate / 1000000);
+
+ if (prscv > ((1<<PSIF_PSR_PRSCV_SIZE) - 1)) {
+ prscv = (1<<PSIF_PSR_PRSCV_SIZE) - 1;
+ dev_dbg(&psif->pdev->dev, "pclk too fast, "
+ "prescaler set to max\n");
+ }
+
+ clk_enable(psif->pclk);
+ psif_writel(psif, PSR, prscv);
+ clk_disable(psif->pclk);
+}
+
+static int __init psif_probe(struct platform_device *pdev)
+{
+ struct resource *regs;
+ struct psif *psif;
+ struct serio *io;
+ struct clk *pclk;
+ int irq;
+ int ret;
+
+ psif = kzalloc(sizeof(struct psif), GFP_KERNEL);
+ if (!psif) {
+ dev_dbg(&pdev->dev, "out of memory\n");
+ ret = -ENOMEM;
+ goto out;
+ }
+ psif->pdev = pdev;
+
+ io = kzalloc(sizeof(struct serio), GFP_KERNEL);
+ if (!io) {
+ dev_dbg(&pdev->dev, "out of memory\n");
+ ret = -ENOMEM;
+ goto out_free_psif;
+ }
+ psif->io = io;
+
+ regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!regs) {
+ dev_dbg(&pdev->dev, "no mmio resources defined\n");
+ ret = -ENOMEM;
+ goto out_free_io;
+ }
+
+ psif->regs = ioremap(regs->start, regs->end - regs->start + 1);
+ if (!psif->regs) {
+ ret = -ENOMEM;
+ dev_dbg(&pdev->dev, "could not map I/O memory\n");
+ goto out_free_io;
+ }
+
+ pclk = clk_get(&pdev->dev, "pclk");
+ if (IS_ERR(pclk)) {
+ dev_dbg(&pdev->dev, "could not get peripheral clock\n");
+ ret = PTR_ERR(pclk);
+ goto out_iounmap;
+ }
+ psif->pclk = pclk;
+
+ /* Reset the PSIF to enter at a known state. */
+ ret = clk_enable(pclk);
+ if (ret) {
+ dev_dbg(&pdev->dev, "could not enable pclk\n");
+ goto out_put_clk;
+ }
+ psif_writel(psif, CR, PSIF_BIT(CR_SWRST));
+ clk_disable(pclk);
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+ dev_dbg(&pdev->dev, "could not get irq\n");
+ ret = -ENXIO;
+ goto out_put_clk;
+ }
+ ret = request_irq(irq, psif_interrupt, IRQF_SHARED, "at32psif", psif);
+ if (ret) {
+ dev_dbg(&pdev->dev, "could not request irq %d\n", irq);
+ goto out_put_clk;
+ }
+ psif->irq = irq;
+
+ io->id.type = SERIO_8042;
+ io->write = psif_write;
+ io->open = psif_open;
+ io->close = psif_close;
+ strlcpy(io->name, pdev->dev.bus_id, sizeof(io->name));
+ strlcpy(io->phys, pdev->dev.bus_id, sizeof(io->phys));
+ io->port_data = psif;
+ io->dev.parent = &pdev->dev;
+
+ psif_set_prescaler(psif);
+
+ spin_lock_init(&psif->lock);
+ serio_register_port(psif->io);
+ platform_set_drvdata(pdev, psif);
+
+ dev_info(&pdev->dev, "Atmel AVR32 PSIF PS/2 driver on 0x%08x irq %d\n",
+ (int)psif->regs, psif->irq);
+
+ return 0;
+
+out_put_clk:
+ clk_put(psif->pclk);
+out_iounmap:
+ iounmap(psif->regs);
+out_free_io:
+ kfree(io);
+out_free_psif:
+ kfree(psif);
+out:
+ return ret;
+}
+
+static int __exit psif_remove(struct platform_device *pdev)
+{
+ struct psif *psif = platform_get_drvdata(pdev);
+
+ psif_writel(psif, IDR, ~0UL);
+ psif_writel(psif, CR, PSIF_BIT(CR_TXDIS) | PSIF_BIT(CR_RXDIS));
+
+ serio_unregister_port(psif->io);
+ iounmap(psif->regs);
+ free_irq(psif->irq, psif);
+ clk_put(psif->pclk);
+ kfree(psif);
+
+ platform_set_drvdata(pdev, NULL);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int psif_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ struct psif *psif = platform_get_drvdata(pdev);
+
+ if (psif->open) {
+ psif_writel(psif, CR, PSIF_BIT(CR_RXDIS) | PSIF_BIT(CR_TXDIS));
+ clk_disable(psif->pclk);
+ }
+
+ return 0;
+}
+
+static int psif_resume(struct platform_device *pdev)
+{
+ struct psif *psif = platform_get_drvdata(pdev);
+
+ if (psif->open) {
+ clk_enable(psif->pclk);
+ psif_set_prescaler(psif);
+ psif_writel(psif, CR, PSIF_BIT(CR_RXEN) | PSIF_BIT(CR_TXEN));
+ }
+
+ return 0;
+}
+#else
+#define psif_suspend NULL
+#define psif_resume NULL
+#endif
+
+static struct platform_driver psif_driver = {
+ .remove = __exit_p(psif_remove),
+ .driver = {
+ .name = "atmel_psif",
+ },
+ .suspend = psif_suspend,
+ .resume = psif_resume,
+};
+
+static int __init psif_init(void)
+{
+ return platform_driver_probe(&psif_driver, psif_probe);
+}
+
+static void __exit psif_exit(void)
+{
+ platform_driver_unregister(&psif_driver);
+}
+
+module_init(psif_init);
+module_exit(psif_exit);
+
+MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
+MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/serio/at32psif.h b/drivers/input/serio/at32psif.h
new file mode 100644
index 0000000..b0cc5e4
--- /dev/null
+++ b/drivers/input/serio/at32psif.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2007 Atmel Corporation
+ *
+ * Driver for the AT32AP700X PS/2 controller (PSIF).
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef _AT32PSIF_H
+#define _AT32PSIF_H
+
+/* PSIF register offsets */
+#define PSIF_CR 0x00
+#define PSIF_RHR 0x04
+#define PSIF_THR 0x08
+#define PSIF_SR 0x10
+#define PSIF_IER 0x14
+#define PSIF_IDR 0x18
+#define PSIF_IMR 0x1c
+#define PSIF_PSR 0x20
+
+/* Bitfields in control register. */
+#define PSIF_CR_RXDIS_OFFSET 1
+#define PSIF_CR_RXDIS_SIZE 1
+#define PSIF_CR_RXEN_OFFSET 0
+#define PSIF_CR_RXEN_SIZE 1
+#define PSIF_CR_SWRST_OFFSET 15
+#define PSIF_CR_SWRST_SIZE 1
+#define PSIF_CR_TXDIS_OFFSET 9
+#define PSIF_CR_TXDIS_SIZE 1
+#define PSIF_CR_TXEN_OFFSET 8
+#define PSIF_CR_TXEN_SIZE 1
+
+/* Bitfields in interrupt disable, enable, mask and status register. */
+#define PSIF_NACK_OFFSET 8
+#define PSIF_NACK_SIZE 1
+#define PSIF_OVRUN_OFFSET 5
+#define PSIF_OVRUN_SIZE 1
+#define PSIF_PARITY_OFFSET 9
+#define PSIF_PARITY_SIZE 1
+#define PSIF_RXRDY_OFFSET 4
+#define PSIF_RXRDY_SIZE 1
+#define PSIF_TXEMPTY_OFFSET 1
+#define PSIF_TXEMPTY_SIZE 1
+#define PSIF_TXRDY_OFFSET 0
+#define PSIF_TXRDY_SIZE 1
+
+/* Bitfields in prescale register. */
+#define PSIF_PSR_PRSCV_OFFSET 0
+#define PSIF_PSR_PRSCV_SIZE 13
+
+/* Bitfields in receive hold register. */
+#define PSIF_RHR_RXDATA_OFFSET 0
+#define PSIF_RHR_RXDATA_SIZE 8
+
+/* Bitfields in transmit hold register. */
+#define PSIF_THR_TXDATA_OFFSET 0
+#define PSIF_THR_TXDATA_SIZE 8
+
+/* Bit manipulation macros */
+#define PSIF_BIT(name) \
+ (1 << PSIF_##name##_OFFSET)
+#define PSIF_BF(name, value) \
+ (((value) & ((1 << PSIF_##name##_SIZE) - 1)) \
+ << PSIF_##name##_OFFSET)
+#define PSIF_BFEXT(name, value)\
+ (((value) >> PSIF_##name##_OFFSET) \
+ & ((1 << PSIF_##name##_SIZE) - 1))
+#define PSIF_BFINS(name, value, old) \
+ (((old) & ~(((1 << PSIF_##name##_SIZE) - 1) \
+ << PSIF_##name##_OFFSET)) \
+ | PSIF_BF(name, value))
+
+/* Register access macros */
+#define psif_readl(port, reg) \
+ __raw_readl((port)->regs + PSIF_##reg)
+#define psif_writel(port, reg, value) \
+ __raw_writel((value), (port)->regs + PSIF_##reg)
+
+#endif /* _AT32PSIF_H */
diff --git a/arch/avr32/boards/atstk1000/Kconfig b/arch/avr32/boards/atstk1000/Kconfig
index 56a8d8e..e125205 100644
--- a/arch/avr32/boards/atstk1000/Kconfig
+++ b/arch/avr32/boards/atstk1000/Kconfig
@@ -145,4 +145,17 @@ config BOARD_ATSTK1000_CF_DETECT_PIN
The default is 0x3e, which is pin 30 on PIOB, aka GPIO15.
+config BOARD_ATSTK100X_ENABLE_PSIF
+ bool "Enable PSIF peripheral (PS/2 support)"
+ default n
+ help
+ Select this if you want to use the PSIF peripheral to hook up PS/2
+ devices to your STK1000. This will require a hardware modification to
+ work correctly, since PS/2 devices require 5 volt power and signals,
+ while the STK1000 only provides 3.3 volt.
+
+ Say N if you have not modified the hardware to boost the voltage, say
+ Y if you have level convertion hardware or a PS/2 device capable of
+ operating on 3.3 volt.
+
endif # stk 1000
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index f19f54d..2ba37d5 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -261,6 +261,10 @@ static int __init atstk1002_init(void)
at32_add_device_ssc(0, ATMEL_SSC_TX);
#endif
at32_add_device_cf(0, 2, &cf0_data);
+#ifdef CONFIG_BOARD_ATSTK100X_ENABLE_PSIF
+ at32_add_device_psif(0);
+ at32_add_device_psif(1);
+#endif
atstk1000_setup_j2_leds();
atstk1002_setup_extdac();
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index 768d204..2cc0bbc 100644
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -172,6 +172,10 @@ static int __init atstk1003_init(void)
at32_add_device_ssc(0, ATMEL_SSC_TX);
#endif
at32_add_device_cf(0, 2, &cf0_data);
+#ifdef CONFIG_BOARD_ATSTK100X_ENABLE_PSIF
+ at32_add_device_psif(0);
+ at32_add_device_psif(1);
+#endif
atstk1000_setup_j2_leds();
atstk1003_setup_extdac();
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index 96015dd..9e8c293 100644
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -143,6 +143,10 @@ static int __init atstk1004_init(void)
#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM
at32_add_device_ssc(0, ATMEL_SSC_TX);
#endif
+#ifdef CONFIG_BOARD_ATSTK100X_ENABLE_PSIF
+ at32_add_device_psif(0);
+ at32_add_device_psif(1);
+#endif
atstk1000_setup_j2_leds();
atstk1004_setup_extdac();
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 3300944..cfec920 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -679,6 +679,81 @@ void __init at32_add_system_devices(void)
}
/* --------------------------------------------------------------------
+ * PSIF
+ * -------------------------------------------------------------------- */
+static struct resource atmel_psif0_resource[] __initdata = {
+ {
+ .start = 0xffe03c00,
+ .end = 0xffe03cff,
+ .flags = IORESOURCE_MEM,
+ },
+ IRQ(18),
+};
+static struct clk atmel_psif0_pclk = {
+ .name = "pclk",
+ .parent = &pba_clk,
+ .mode = pba_clk_mode,
+ .get_rate = pba_clk_get_rate,
+ .index = 15,
+};
+
+static struct resource atmel_psif1_resource[] __initdata = {
+ {
+ .start = 0xffe03d00,
+ .end = 0xffe03dff,
+ .flags = IORESOURCE_MEM,
+ },
+ IRQ(18),
+};
+static struct clk atmel_psif1_pclk = {
+ .name = "pclk",
+ .parent = &pba_clk,
+ .mode = pba_clk_mode,
+ .get_rate = pba_clk_get_rate,
+ .index = 15,
+};
+
+struct platform_device *__init at32_add_device_psif(unsigned int id)
+{
+ struct platform_device *pdev;
+
+ if (!(id == 0 || id == 1))
+ return NULL;
+
+ pdev = platform_device_alloc("atmel_psif", id);
+ if (!pdev)
+ return NULL;
+
+ switch (id) {
+ case 0:
+ if (platform_device_add_resources(pdev, atmel_psif0_resource,
+ ARRAY_SIZE(atmel_psif0_resource)))
+ goto err_add_resources;
+ atmel_psif0_pclk.dev = &pdev->dev;
+ select_peripheral(PA(8), PERIPH_A, 0); /* CLOCK */
+ select_peripheral(PA(9), PERIPH_A, 0); /* DATA */
+ break;
+ case 1:
+ if (platform_device_add_resources(pdev, atmel_psif1_resource,
+ ARRAY_SIZE(atmel_psif1_resource)))
+ goto err_add_resources;
+ atmel_psif1_pclk.dev = &pdev->dev;
+ select_peripheral(PB(11), PERIPH_A, 0); /* CLOCK */
+ select_peripheral(PB(12), PERIPH_A, 0); /* DATA */
+ break;
+ default:
+ return NULL;
+ }
+
+ platform_device_add(pdev);
+ return pdev;
+
+err_add_resources:
+ platform_device_put(pdev);
+ return NULL;
+}
+
+/* --------------------------------------------------------------------
* USART
* -------------------------------------------------------------------- */
@@ -1712,6 +1787,8 @@ struct clk *at32_clock_list[] = {
&pio3_mck,
&pio4_mck,
&at32_systc0_pclk,
+ &atmel_psif0_pclk,
+ &atmel_psif1_pclk,
&atmel_usart0_usart,
&atmel_usart1_usart,
&atmel_usart2_usart,
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h
index 1a6e02c..19cfec7 100644
--- a/include/asm-avr32/arch-at32ap/board.h
+++ b/include/asm-avr32/arch-at32ap/board.h
@@ -93,4 +93,7 @@ struct platform_device *
at32_add_device_cf(unsigned int id, unsigned int extint,
struct cf_platform_data *data);
+struct platform_device *
+at32_add_device_psif(unsigned int id);
+
#endif /* __ASM_ARCH_BOARD_H */
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index d95f316..20a7193 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1000,7 +1000,8 @@ DECLARE_TASKLET_DISABLED(keyboard_tasklet, kbd_bh, 0);
#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\
defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\
defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\
- (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC))
+ (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC)) ||\
+ defined(CONFIG_AVR32)
#define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\
((dev)->id.bustype == BUS_I8042) && ((dev)->id.vendor == 0x0001) && ((dev)->id.product == 0x0001))
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
--- a/arch/avr32/boards/atngw100/setup.c 2008-01-31 13:38:32.000000000 -0500
+++ b/arch/avr32/boards/atngw100/setup.c 2008-01-31 13:44:09.000000000 -0500
@@ -224,6 +224,9 @@ static int __init atngw100_init(void)
at32_add_device_usba(0, NULL);
at32_add_device_ac97c(0);
+ at32_add_device_psif(0);
+ at32_add_device_psif(1);
+
for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {
at32_select_gpio(ngw_leds[i].gpio,
AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);

5
target/device/Atmel/arch-avr32/kernel-patches-2.6.25.10/linux-2.6.25.10-no-localversion.patch
View File

@ -1,5 +0,0 @@
diff -urN linux-2.6.25.10-0rig/localversion-atmel linux-2.6.25.10/localversion-atmel
--- linux-2.6.25.10-0rig/localversion-atmel 2008-07-10 16:57:33.000000000 +0200
+++ linux-2.6.25.10/localversion-atmel 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-.atmel.2

BIN
target/device/Atmel/arch-avr32/kernel-patches-2.6.25.10/linux-2.6.25.10.atmel.2.patch.bz2
View File

Binary file not shown.