From 4652104d5c5949f81a89194b1035bc239e04b101 Mon Sep 17 00:00:00 2001 From: Bart Van Der Meerssche Date: Sun, 19 Dec 2010 20:58:01 +0100 Subject: [PATCH] openwrt: flush outdated patches in flukso v2 --- .../patches/100.spi_gpio_support.patch | 82 ------------------- .../patches/110.spi_gpio_enable_cs_line.patch | 19 ----- .../120.hotplug_button_jiffies_calc.patch | 27 ------ 3 files changed, 128 deletions(-) delete mode 100644 mote/v2/openwrt/patches/100.spi_gpio_support.patch delete mode 100644 mote/v2/openwrt/patches/110.spi_gpio_enable_cs_line.patch delete mode 100644 mote/v2/openwrt/patches/120.hotplug_button_jiffies_calc.patch diff --git a/mote/v2/openwrt/patches/100.spi_gpio_support.patch b/mote/v2/openwrt/patches/100.spi_gpio_support.patch deleted file mode 100644 index 8ac1bf9..0000000 --- a/mote/v2/openwrt/patches/100.spi_gpio_support.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- a/arch/mips/ar231x/ar2315.c 2010-08-07 10:15:11.696355750 +0200 -+++ b/arch/mips/ar231x/ar2315.c 2010-08-07 10:33:47.588393782 +0200 -@@ -36,6 +36,11 @@ - #include "devices.h" - #include "ar2315.h" - -+/* BVDM 04/06/2010 */ -+#include -+#include -+#include -+ - static u32 gpiointmask = 0, gpiointval = 0; - - static inline void ar2315_gpio_irq(void) -@@ -398,6 +403,37 @@ - .name = "ar2315_wdt", - }; - -+/* BVDM 04/06/2010 */ -+#define SPI_GPIO_SCK 3 -+#define SPI_GPIO_MOSI 1 -+#define SPI_GPIO_MISO 2 -+ -+static struct spi_gpio_platform_data ar2315_spi_gpio_platform_data = { -+ .sck = SPI_GPIO_SCK, -+ .mosi = SPI_GPIO_MOSI, -+ .miso = SPI_GPIO_MISO, -+ .num_chipselect = 1, -+}; -+ -+static struct platform_device ar2315_spi_gpio = { -+ .name = "spi_gpio", -+ .id = 0, -+ .dev = { -+ .platform_data = &ar2315_spi_gpio_platform_data, -+ }, -+}; -+ -+static struct spi_board_info ar2315_spi_gpio_board_info[] __initdata = { -+{ -+ .modalias = "spidev", -+ .controller_data = (void *) SPI_GPIO_NO_CHIPSELECT, -+ .mode = SPI_MODE_0, -+ .max_speed_hz = 16000000, /* 16kHz */ -+ .bus_num = 0, -+}, -+}; -+ -+ - #define SPI_FLASH_CTL 0x00 - #define SPI_FLASH_OPCODE 0x04 - #define SPI_FLASH_DATA 0x08 -@@ -520,6 +556,7 @@ - } - ar2315_led_data.num_leds = led; - platform_device_register(&ar2315_gpio_leds); -+ platform_device_register(&ar2315_spi_gpio); - } - #else - static inline void ar2315_init_gpio(void) -@@ -530,6 +567,8 @@ - int __init - ar2315_init_devices(void) - { -+ int ret; -+ - if (!is_2315()) - return 0; - -@@ -544,6 +583,12 @@ - &ar2315_eth_data); - ar231x_add_wmac(0, AR2315_WLAN0, AR2315_IRQ_WLAN0_INTRS); - -+ /* BVDM 04/06/2010 */ -+ platform_device_register(&ar2315_spi_gpio); -+ ret = spi_register_board_info(ar2315_spi_gpio_board_info, ARRAY_SIZE(ar2315_spi_gpio_board_info)); -+ /* debugging */ -+ printk(KERN_DEBUG "spi_register_board_info return value: %x\n", ret); -+ - return 0; - } - diff --git a/mote/v2/openwrt/patches/110.spi_gpio_enable_cs_line.patch b/mote/v2/openwrt/patches/110.spi_gpio_enable_cs_line.patch deleted file mode 100644 index 5d961bf..0000000 --- a/mote/v2/openwrt/patches/110.spi_gpio_enable_cs_line.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/arch/mips/ar231x/ar2315.c 2010-08-08 15:52:43.005477443 +0200 -+++ b/arch/mips/ar231x/ar2315.c 2010-08-08 15:56:06.009475860 +0200 -@@ -407,6 +407,7 @@ - #define SPI_GPIO_SCK 3 - #define SPI_GPIO_MOSI 2 - #define SPI_GPIO_MISO 1 -+#define SPI_GPIO_CS 4 - - static struct spi_gpio_platform_data ar2315_spi_gpio_platform_data = { - .sck = SPI_GPIO_SCK, -@@ -426,7 +427,7 @@ - static struct spi_board_info ar2315_spi_gpio_board_info[] __initdata = { - { - .modalias = "spidev", -- .controller_data = (void *) SPI_GPIO_NO_CHIPSELECT, -+ .controller_data = (void *) SPI_GPIO_CS, - .mode = SPI_MODE_0, - .max_speed_hz = 10000000, /* 10kHz */ - .bus_num = 0, diff --git a/mote/v2/openwrt/patches/120.hotplug_button_jiffies_calc.patch b/mote/v2/openwrt/patches/120.hotplug_button_jiffies_calc.patch deleted file mode 100644 index 65a96da..0000000 --- a/mote/v2/openwrt/patches/120.hotplug_button_jiffies_calc.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- /tmp/build_dir/linux-atheros/linux-2.6.30.10/arch/mips/ar231x/reset.c 2010-08-29 22:43:02.508208080 +0200 -+++ build_dir/linux-atheros/linux-2.6.30.10/arch/mips/ar231x/reset.c 2010-08-30 10:02:11.682269327 +0200 -@@ -19,6 +19,7 @@ - struct work_struct wq; - int set; - unsigned long jiffies; -+ unsigned long jiffies_prev; - }; - - static struct timer_list rst_button_timer; -@@ -68,7 +69,7 @@ - add_msg(skb, "SUBSYSTEM=button"); - add_msg(skb, "BUTTON=reset"); - add_msg(skb, (event->set ? "ACTION=pressed" : "ACTION=released")); -- sprintf(buf, "SEEN=%ld", (event->jiffies - seen)/HZ); -+ sprintf(buf, "SEEN=%lu", (event->jiffies - event->jiffies_prev)/HZ); - add_msg(skb, buf); - snprintf(buf, 128, "SEQNUM=%llu", uevent_next_seqnum()); - add_msg(skb, buf); -@@ -127,6 +128,7 @@ - no_release_workaround = 0; - - event->jiffies = jiffies; -+ event->jiffies_prev = seen; - - INIT_WORK(&event->wq, hotplug_button); - schedule_work(&event->wq);