From 562ba537fcd0b210f32a14a05f0cc08ca6b86d55 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 29 Jan 2013 18:29:45 +0000 Subject: kernel: update linux 3.7 to 3.7.5 Signed-off-by: Gabor Juhos SVN-Revision: 35390 --- ...PS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch | 2 +- ...PS-ath79-add-PCI-controller-registration-code-for-.patch | 2 +- .../patches-3.7/203-spi-ath79-use-gpio_request_one.patch | 13 +++++++------ ...i-ath79-avoid-multiple-initialization-of-the-SPI-c.patch | 2 +- .../206-spi-ath79-make-chipselect-logic-more-flexible.patch | 4 ++-- ...PS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch | 2 +- .../406-mtd-m25p80-allow-to-specify-max-read-size.patch | 2 +- ...m25p80-allow-to-pass-probe-types-via-platform-data.patch | 2 +- .../412-mtd-m25p80-zero-partition-parser-data.patch | 2 +- .../505-MIPS-ath79-add-ath79_gpio_function_select.patch | 2 +- .../521-MIPS-ath79-enable-UART-for-early_serial.patch | 2 +- .../ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch | 2 +- .../ar71xx/patches-3.7/902-unaligned_access_hacks.patch | 4 ++-- 13 files changed, 21 insertions(+), 20 deletions(-) (limited to 'target/linux/ar71xx/patches-3.7') diff --git a/target/linux/ar71xx/patches-3.7/169-MIPS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch b/target/linux/ar71xx/patches-3.7/169-MIPS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch index 89ab5ace69..bd95d718b2 100644 --- a/target/linux/ar71xx/patches-3.7/169-MIPS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch +++ b/target/linux/ar71xx/patches-3.7/169-MIPS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos --- a/arch/mips/ath79/pci.c +++ b/arch/mips/ath79/pci.c -@@ -75,7 +75,9 @@ int __init pcibios_map_irq(const struct +@@ -75,7 +75,9 @@ int __init pcibios_map_irq(const struct const struct ath79_pci_irq *entry; entry = &ath79_pci_irq_map[i]; diff --git a/target/linux/ar71xx/patches-3.7/170-MIPS-ath79-add-PCI-controller-registration-code-for-.patch b/target/linux/ar71xx/patches-3.7/170-MIPS-ath79-add-PCI-controller-registration-code-for-.patch index 5c6388c455..0c3889fdb9 100644 --- a/target/linux/ar71xx/patches-3.7/170-MIPS-ath79-add-PCI-controller-registration-code-for-.patch +++ b/target/linux/ar71xx/patches-3.7/170-MIPS-ath79-add-PCI-controller-registration-code-for-.patch @@ -44,7 +44,7 @@ Subject: [PATCH 26/34] MIPS: ath79: add PCI controller registration code for the int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin) { int irq = -1; -@@ -64,6 +79,9 @@ int __init pcibios_map_irq(const struct +@@ -64,6 +79,9 @@ int __init pcibios_map_irq(const struct soc_is_ar9344()) { ath79_pci_irq_map = ar724x_pci_irq_map; ath79_pci_nr_irqs = ARRAY_SIZE(ar724x_pci_irq_map); diff --git a/target/linux/ar71xx/patches-3.7/203-spi-ath79-use-gpio_request_one.patch b/target/linux/ar71xx/patches-3.7/203-spi-ath79-use-gpio_request_one.patch index a7329b2ab7..12559bcae1 100644 --- a/target/linux/ar71xx/patches-3.7/203-spi-ath79-use-gpio_request_one.patch +++ b/target/linux/ar71xx/patches-3.7/203-spi-ath79-use-gpio_request_one.patch @@ -32,18 +32,19 @@ Signed-off-by: Gabor Juhos - status = gpio_request(cdata->gpio, dev_name(&spi->dev)); - if (status) - return status; -+ flags = GPIOF_DIR_OUT; -+ if (spi->mode & SPI_CS_HIGH) -+ flags |= GPIOF_INIT_HIGH; -+ else -+ flags |= GPIOF_INIT_LOW; - +- - status = gpio_direction_output(cdata->gpio, - spi->mode & SPI_CS_HIGH); - if (status) { - gpio_free(cdata->gpio); - return status; - } ++ flags = GPIOF_DIR_OUT; ++ if (spi->mode & SPI_CS_HIGH) ++ flags |= GPIOF_INIT_HIGH; ++ else ++ flags |= GPIOF_INIT_LOW; ++ + status = gpio_request_one(cdata->gpio, flags, + dev_name(&spi->dev)); } diff --git a/target/linux/ar71xx/patches-3.7/204-spi-ath79-avoid-multiple-initialization-of-the-SPI-c.patch b/target/linux/ar71xx/patches-3.7/204-spi-ath79-avoid-multiple-initialization-of-the-SPI-c.patch index 976159c6f9..c6f4b2b959 100644 --- a/target/linux/ar71xx/patches-3.7/204-spi-ath79-avoid-multiple-initialization-of-the-SPI-c.patch +++ b/target/linux/ar71xx/patches-3.7/204-spi-ath79-avoid-multiple-initialization-of-the-SPI-c.patch @@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/spi/spi-ath79.c +++ b/drivers/spi/spi-ath79.c -@@ -96,16 +96,8 @@ static void ath79_spi_chipselect(struct +@@ -96,16 +96,8 @@ static void ath79_spi_chipselect(struct } diff --git a/target/linux/ar71xx/patches-3.7/206-spi-ath79-make-chipselect-logic-more-flexible.patch b/target/linux/ar71xx/patches-3.7/206-spi-ath79-make-chipselect-logic-more-flexible.patch index da83e2ebe8..34df1756bb 100644 --- a/target/linux/ar71xx/patches-3.7/206-spi-ath79-make-chipselect-logic-more-flexible.patch +++ b/target/linux/ar71xx/patches-3.7/206-spi-ath79-make-chipselect-logic-more-flexible.patch @@ -170,7 +170,7 @@ Signed-off-by: Gabor Juhos struct ath79_spi { struct spi_bitbang bitbang; u32 ioc_base; -@@ -69,6 +71,7 @@ static void ath79_spi_chipselect(struct +@@ -69,6 +71,7 @@ static void ath79_spi_chipselect(struct { struct ath79_spi *sp = ath79_spidev_to_sp(spi); int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active; @@ -178,7 +178,7 @@ Signed-off-by: Gabor Juhos if (is_active) { /* set initial clock polarity */ -@@ -80,20 +83,24 @@ static void ath79_spi_chipselect(struct +@@ -80,20 +83,24 @@ static void ath79_spi_chipselect(struct ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base); } diff --git a/target/linux/ar71xx/patches-3.7/212-MIPS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch b/target/linux/ar71xx/patches-3.7/212-MIPS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch index 3e41789bf8..a9845baba8 100644 --- a/target/linux/ar71xx/patches-3.7/212-MIPS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch +++ b/target/linux/ar71xx/patches-3.7/212-MIPS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch @@ -19,7 +19,7 @@ Signed-off-by: Gabor Juhos --- a/arch/mips/ath79/gpio.c +++ b/arch/mips/ath79/gpio.c -@@ -137,47 +137,61 @@ static struct gpio_chip ath79_gpio_chip +@@ -137,47 +137,61 @@ static struct gpio_chip ath79_gpio_chip .base = 0, }; diff --git a/target/linux/ar71xx/patches-3.7/406-mtd-m25p80-allow-to-specify-max-read-size.patch b/target/linux/ar71xx/patches-3.7/406-mtd-m25p80-allow-to-specify-max-read-size.patch index b80a32ac24..30d4fcd3ed 100644 --- a/target/linux/ar71xx/patches-3.7/406-mtd-m25p80-allow-to-specify-max-read-size.patch +++ b/target/linux/ar71xx/patches-3.7/406-mtd-m25p80-allow-to-specify-max-read-size.patch @@ -84,7 +84,7 @@ mutex_unlock(&flash->lock); -@@ -910,6 +936,12 @@ static int __devinit m25p_probe(struct s +@@ -914,6 +940,12 @@ static int __devinit m25p_probe(struct s flash->mtd._erase = m25p80_erase; flash->mtd._read = m25p80_read; diff --git a/target/linux/ar71xx/patches-3.7/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-3.7/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch index 707b49d585..7f35b23a60 100644 --- a/target/linux/ar71xx/patches-3.7/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch +++ b/target/linux/ar71xx/patches-3.7/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -1003,7 +1003,9 @@ static int __devinit m25p_probe(struct s +@@ -1007,7 +1007,9 @@ static int __devinit m25p_probe(struct s /* partitions should match sector boundaries; and it may be good to * use readonly partitions for writeprotected sectors (BP2..BP0). */ diff --git a/target/linux/ar71xx/patches-3.7/412-mtd-m25p80-zero-partition-parser-data.patch b/target/linux/ar71xx/patches-3.7/412-mtd-m25p80-zero-partition-parser-data.patch index a3c7ebc997..7d49362b7a 100644 --- a/target/linux/ar71xx/patches-3.7/412-mtd-m25p80-zero-partition-parser-data.patch +++ b/target/linux/ar71xx/patches-3.7/412-mtd-m25p80-zero-partition-parser-data.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -963,6 +963,7 @@ static int __devinit m25p_probe(struct s +@@ -967,6 +967,7 @@ static int __devinit m25p_probe(struct s if (info->flags & M25P_NO_ERASE) flash->mtd.flags |= MTD_NO_ERASE; diff --git a/target/linux/ar71xx/patches-3.7/505-MIPS-ath79-add-ath79_gpio_function_select.patch b/target/linux/ar71xx/patches-3.7/505-MIPS-ath79-add-ath79_gpio_function_select.patch index 08f4a1e95c..86e136f67e 100644 --- a/target/linux/ar71xx/patches-3.7/505-MIPS-ath79-add-ath79_gpio_function_select.patch +++ b/target/linux/ar71xx/patches-3.7/505-MIPS-ath79-add-ath79_gpio_function_select.patch @@ -10,7 +10,7 @@ #endif /* __ATH79_COMMON_H */ --- a/arch/mips/ath79/gpio.c +++ b/arch/mips/ath79/gpio.c -@@ -198,6 +198,34 @@ void ath79_gpio_function_setup(u32 set, +@@ -198,6 +198,34 @@ void ath79_gpio_function_setup(u32 set, spin_unlock_irqrestore(&ath79_gpio_lock, flags); } diff --git a/target/linux/ar71xx/patches-3.7/521-MIPS-ath79-enable-UART-for-early_serial.patch b/target/linux/ar71xx/patches-3.7/521-MIPS-ath79-enable-UART-for-early_serial.patch index 2ee025bbf2..489bc96738 100644 --- a/target/linux/ar71xx/patches-3.7/521-MIPS-ath79-enable-UART-for-early_serial.patch +++ b/target/linux/ar71xx/patches-3.7/521-MIPS-ath79-enable-UART-for-early_serial.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/early_printk.c +++ b/arch/mips/ath79/early_printk.c -@@ -56,6 +56,46 @@ static void prom_putchar_dummy(unsigned +@@ -56,6 +56,46 @@ static void prom_putchar_dummy(unsigned /* nothing to do */ } diff --git a/target/linux/ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch b/target/linux/ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch index b38b46121d..f9ec7753f1 100644 --- a/target/linux/ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch +++ b/target/linux/ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch @@ -50,7 +50,7 @@ #define PB44_GPIO_SW_RESET (PB44_GPIO_EXP_BASE + 6) #define PB44_GPIO_SW_JUMP (PB44_GPIO_EXP_BASE + 8) #define PB44_GPIO_LED_JUMP1 (PB44_GPIO_EXP_BASE + 9) -@@ -92,21 +117,66 @@ static struct ath79_spi_controller_data +@@ -92,21 +117,66 @@ static struct ath79_spi_controller_data .cs_line = 0, }; diff --git a/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch index fc05676b83..e7e1712b7e 100644 --- a/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch @@ -288,7 +288,7 @@ #include #include -@@ -851,10 +852,10 @@ static void tcp_v6_send_response(struct +@@ -851,10 +852,10 @@ static void tcp_v6_send_response(struct topt = (__be32 *)(t1 + 1); if (ts) { @@ -415,7 +415,7 @@ if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK) fl6.flowi6_mark = skb->mark; -@@ -1256,7 +1256,7 @@ static int ip6gre_header(struct sk_buff +@@ -1256,7 +1256,7 @@ static int ip6gre_header(struct sk_buff struct ipv6hdr *ipv6h = (struct ipv6hdr *)skb_push(skb, t->hlen); __be16 *p = (__be16 *)(ipv6h+1); -- cgit v1.2.3