From 4237b5c87f1dcc2d9589d1b1e8b3906236d54453 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 May 2009 20:11:38 +0200
Subject: target/device/Atmel: remove atngw100-expanded config

Doesn't make much sense without working xserver.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../linux-2.6.24.4-100-atngw100-add-ac97.patch     |  10 -
 .../linux-2.6.24.4-200-atngw100-video.patch        | 148 -----------
 .../linux-2.6.24.4-300-avr32-psif-2.patch          |  27 --
 ...-2.6.24.4-400-atngw100-unlock-uboot-flash.patch |  11 -
 .../linux-2.6.24.4-500-avr32-ac97-reset.patch      | 289 ---------------------
 ...linux-2.6.24.4-600-atngw100-disable-psif1.patch |  11 -
 6 files changed, 496 deletions(-)
 delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-100-atngw100-add-ac97.patch
 delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-200-atngw100-video.patch
 delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-300-avr32-psif-2.patch
 delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-400-atngw100-unlock-uboot-flash.patch
 delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-500-avr32-ac97-reset.patch
 delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-600-atngw100-disable-psif1.patch

(limited to 'target/device/Atmel/atngw100-expanded/kernel-patches')

diff --git a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-100-atngw100-add-ac97.patch b/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-100-atngw100-add-ac97.patch
deleted file mode 100644
index 984a4e995..000000000
--- a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-100-atngw100-add-ac97.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/avr32/boards/atngw100/setup.c	2008-03-14 08:31:39.000000000 -0400
-+++ b/arch/avr32/boards/atngw100/setup.c	2008-03-14 08:33:23.000000000 -0400
-@@ -166,6 +166,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);
- 
- 	for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {
- 		at32_select_gpio(ngw_leds[i].gpio,
diff --git a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-200-atngw100-video.patch b/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-200-atngw100-video.patch
deleted file mode 100644
index b2ef6600a..000000000
--- a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-200-atngw100-video.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Nrup linux-2.6.24/arch/avr32/boards/atngw100/setup.c linux-2.6.24-patched/arch/avr32/boards/atngw100/setup.c
---- a/arch/avr32/boards/atngw100/setup.c	2008-01-31 10:47:55.000000000 -0500
-+++ b/arch/avr32/boards/atngw100/setup.c	2008-01-31 10:28:00.000000000 -0500
-@@ -16,6 +16,8 @@
- #include <linux/types.h>
- #include <linux/leds.h>
- #include <linux/spi/spi.h>
-+#include <linux/fb.h>
-+#include <video/atmel_lcdc.h>
- 
- #include <asm/io.h>
- #include <asm/setup.h>
-@@ -28,9 +30,63 @@
- /* Initialized by bootloader-specific startup code. */
- struct tag *bootloader_tags __initdata;
- 
-+static struct fb_videomode __initdata video_modes[] = {
-+	{
-+		.name		= "640x480@60",
-+		.refresh	= 60,
-+		.xres		= 640,		.yres		= 480,
-+		.pixclock	= KHZ2PICOS(23856),
-+
-+		.left_margin	= 80,		.right_margin	= 16,
-+		.upper_margin	= 13,		.lower_margin	= 1,
-+		.hsync_len	= 64,		.vsync_len	= 3,
-+
-+		.sync		= 0,
-+		.vmode		= FB_VMODE_NONINTERLACED,
-+	},
-+	{
-+		.name		= "320x240@117",
-+		.refresh	= 117,
-+		.xres		= 320,		.yres		= 240,
-+		.pixclock	= KHZ2PICOS(12074),
-+
-+		.left_margin	= 40,		.right_margin	= 8,
-+		.upper_margin	= 14,		.lower_margin	= 1,
-+		.hsync_len	= 32,		.vsync_len	= 3,
-+
-+		.sync		= 0,
-+		.vmode		= FB_VMODE_NONINTERLACED,
-+	},
-+};
-+
-+static struct fb_monspecs __initdata atngw100_default_monspecs = {
-+	.manufacturer		= "ATM",
-+	.monitor		= "GENERIC",
-+	.modedb			= video_modes,
-+	.modedb_len		= ARRAY_SIZE(video_modes),
-+	.hfmin			= 14820,
-+	.hfmax			= 32000,
-+	.vfmin			= 30,
-+	.vfmax			= 200,
-+	.dclkmax		= 30000000,
-+};
-+
-+struct atmel_lcdfb_info __initdata atngw100_lcdc_data = {
-+	.default_bpp		= 16,
-+	.default_dmacon		= ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-+	.default_lcdcon2	= (ATMEL_LCDC_DISTYPE_TFT
-+				   | ATMEL_LCDC_INVCLK 
-+				   | ATMEL_LCDC_INVDVAL_NORMAL
-+				   | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-+				   | ATMEL_LCDC_MEMOR_BIG),
-+	.default_monspecs	= &atngw100_default_monspecs,
-+	.guard_time		= 2,
-+};
-+
- struct eth_addr {
- 	u8 addr[6];
- };
-+
- static struct eth_addr __initdata hw_addr[2];
- static struct eth_platform_data __initdata eth_data[2];
- 
-@@ -155,13 +211,14 @@ static int __init atngw100_init(void)
- 	 * ATNGW100 uses 16-bit SDRAM interface, so we don't need to
- 	 * reserve any pins for it.
- 	 */
-+	at32_add_device_lcdc(1, &atngw100_lcdc_data, fbmem_start, fbmem_size);
- 
- 	at32_add_system_devices();
- 
- 	at32_add_device_usart(0);
- 
- 	set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
--	set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
-+	//set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
- 
- 	at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
- 	at32_add_device_mci(0, &mci0_data);
-diff -Nrup linux-2.6.24/arch/avr32/mach-at32ap/at32ap700x.c linux-2.6.24-patched/arch/avr32/mach-at32ap/at32ap700x.c
---- a/arch/avr32/mach-at32ap/at32ap700x.c	2008-01-31 10:47:55.000000000 -0500
-+++ b/arch/avr32/mach-at32ap/at32ap700x.c	2008-01-31 10:29:22.000000000 -0500
-@@ -1133,7 +1142,7 @@ at32_add_device_lcdc(unsigned int id, st
- 	monspecs->modedb = modedb;
- 
- 	switch (id) {
--	case 0:
-+	case 0:		// STK1000 peripheral connections
- 		pdev = &atmel_lcdfb0_device;
- 		select_peripheral(PC(19), PERIPH_A, 0);	/* CC	  */
- 		select_peripheral(PC(20), PERIPH_A, 0);	/* HSYNC  */
-@@ -1170,6 +1179,43 @@ at32_add_device_lcdc(unsigned int id, st
- 		clk_set_parent(&atmel_lcdfb0_pixclk, &pll0);
- 		clk_set_rate(&atmel_lcdfb0_pixclk, clk_get_rate(&pll0));
- 		break;
-+	case 1:		// NGW100 peripheral connections
-+		pdev = &atmel_lcdfb0_device;
-+		//select_peripheral(PC(19), PERIPH_B, 0);	/* CC	  */
-+		select_peripheral(PC(20), PERIPH_A, 0);	/* HSYNC  */
-+		select_peripheral(PC(21), PERIPH_A, 0);	/* PCLK	  */
-+		select_peripheral(PC(22), PERIPH_A, 0);	/* VSYNC  */
-+		select_peripheral(PE(1), PERIPH_B, 0);	/* DVAL	  */
-+		select_peripheral(PE(2), PERIPH_B, 0);	/* MODE	  */
-+		//select_peripheral(PC(25), PERIPH_A, 0);	/* PWR	  */
-+		select_peripheral(PE(3), PERIPH_B, 0);	/* DATA0  */
-+		select_peripheral(PE(4), PERIPH_B, 0);	/* DATA1  */
-+		select_peripheral(PE(5), PERIPH_B, 0);	/* DATA2  */
-+		select_peripheral(PE(6), PERIPH_B, 0);	/* DATA3  */
-+		select_peripheral(PE(7), PERIPH_B, 0);	/* DATA4  */
-+		select_peripheral(PC(31), PERIPH_A, 0);	/* DATA5  */
-+		select_peripheral(PD(0),  PERIPH_A, 0);	/* DATA6  */
-+		select_peripheral(PD(1),  PERIPH_A, 0);	/* DATA7  */
-+		select_peripheral(PE(8),  PERIPH_B, 0);	/* DATA8  */
-+		select_peripheral(PE(9),  PERIPH_B, 0);	/* DATA9  */
-+		select_peripheral(PE(10),  PERIPH_B, 0);	/* DATA10 */
-+		select_peripheral(PE(11),  PERIPH_B, 0);	/* DATA11 */
-+		select_peripheral(PE(12),  PERIPH_B, 0);	/* DATA12 */
-+		select_peripheral(PD(7),  PERIPH_A, 0);	/* DATA13 */
-+		select_peripheral(PD(8),  PERIPH_A, 0);	/* DATA14 */
-+		select_peripheral(PD(9),  PERIPH_A, 0);	/* DATA15 */
-+		select_peripheral(PE(13), PERIPH_B, 0);	/* DATA16 */
-+		select_peripheral(PE(14), PERIPH_B, 0);	/* DATA17 */
-+		select_peripheral(PE(15), PERIPH_B, 0);	/* DATA18 */
-+		select_peripheral(PE(16), PERIPH_B, 0);	/* DATA19 */
-+		select_peripheral(PE(17), PERIPH_B, 0);	/* DATA20 */
-+		select_peripheral(PE(18), PERIPH_B, 0);	/* DATA21 */
-+		select_peripheral(PD(16), PERIPH_A, 0);	/* DATA22 */
-+		select_peripheral(PD(17), PERIPH_A, 0);	/* DATA23 */
-+
-+		clk_set_parent(&atmel_lcdfb0_pixclk, &pll0);
-+		clk_set_rate(&atmel_lcdfb0_pixclk, clk_get_rate(&pll0));
-+		break;
- 
- 	default:
- 		goto err_invalid_id;
diff --git a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-300-avr32-psif-2.patch b/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-300-avr32-psif-2.patch
deleted file mode 100644
index 5bcf5da6f..000000000
--- a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-300-avr32-psif-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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);
diff --git a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-400-atngw100-unlock-uboot-flash.patch b/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-400-atngw100-unlock-uboot-flash.patch
deleted file mode 100644
index 31053f74a..000000000
--- a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-400-atngw100-unlock-uboot-flash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nrup linux-2.6.24/arch/avr32/boards/atngw100/flash.c linux-2.6.24-patched/arch/avr32/boards/atngw100/flash.c
---- a/arch/avr32/boards/atngw100/flash.c	2008-01-31 10:47:55.000000000 -0500
-+++ b/arch/avr32/boards/atngw100/flash.c	2008-01-31 10:21:07.000000000 -0500
-@@ -42,7 +42,6 @@ static struct mtd_partition flash_parts[
- 		.name           = "u-boot",
- 		.offset         = 0x00000000,
- 		.size           = 0x00020000,           /* 128 KiB */
--		.mask_flags     = MTD_WRITEABLE,
- 	},
- 	{
- 		.name           = "root",
diff --git a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-500-avr32-ac97-reset.patch b/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-500-avr32-ac97-reset.patch
deleted file mode 100644
index 3f0b37178..000000000
--- a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-500-avr32-ac97-reset.patch
+++ /dev/null
@@ -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_PB(18), // 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,
diff --git a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-600-atngw100-disable-psif1.patch b/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-600-atngw100-disable-psif1.patch
deleted file mode 100644
index b66c7fc83..000000000
--- a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24.4-600-atngw100-disable-psif1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/avr32/boards/atngw100/setup.c	2008-03-14 09:19:27.000000000 -0400
-+++ b/arch/avr32/boards/atngw100/setup.c	2008-03-14 08:59:24.000000000 -0400
-@@ -233,7 +233,7 @@ static int __init atngw100_init(void)
- 	at32_add_device_ac97c(0, &ac97c0_data);
- 
- 	at32_add_device_psif(0);
--	at32_add_device_psif(1);
-+	//at32_add_device_psif(1);
- 
- 	for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {
- 		at32_select_gpio(ngw_leds[i].gpio,
-- 
cgit v1.2.3