diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-23 13:33:49 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-23 13:33:49 -0800 |
commit | b723af40b8bd928ac908a260cb28252f1dba0106 (patch) | |
tree | ad2a884f06f25207c46e4517d2dbddf8051e746d | |
parent | 4de3209cc4955b089b2363f9bb102844198f9ded (diff) | |
download | ltsi-kernel-b723af40b8bd928ac908a260cb28252f1dba0106.tar.gz |
Update to 3.10.27
The xilinx network driver patch:
patches.zynq/0004-net-ethernet-xilinx-Merge-driver-from-Xilinx-reposit.patch
needed changes, as upstream removed the NETIF_F_FRAGLIST support for the
driver, which I had to propagate here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
8 files changed, 13 insertions, 133 deletions
diff --git a/KERNEL_VERSION b/KERNEL_VERSION index dce139be4e389..332d2c954cd11 100644 --- a/KERNEL_VERSION +++ b/KERNEL_VERSION @@ -1 +1 @@ -3.10.26 +3.10.27 diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch index d6a7cc11da5c6..30e986be8937b 100644 --- a/patches.ltsi/ltsi-makefile-addition.patch +++ b/patches.ltsi/ltsi-makefile-addition.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 10 - SUBLEVEL = 26 + SUBLEVEL = 27 -EXTRAVERSION = +EXTRAVERSION = -ltsi NAME = TOSSUG Baby Fish diff --git a/patches.renesas/0013-irqchip-renesas-irqc-Fix-irqc_probe-error-handling.patch b/patches.renesas/0013-irqchip-renesas-irqc-Fix-irqc_probe-error-handling.patch deleted file mode 100644 index 8387580e61799..0000000000000 --- a/patches.renesas/0013-irqchip-renesas-irqc-Fix-irqc_probe-error-handling.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d6528543cfb62fbe699f0efe83907563f9bd5984 Mon Sep 17 00:00:00 2001 -From: Axel Lin <axel.lin@ingics.com> -Date: Mon, 6 May 2013 17:03:32 +0800 -Subject: irqchip: renesas-irqc: Fix irqc_probe error handling - -The code in goto err3 path is wrong because it will call fee_irq() with k == 0, -which means it does free_irq(p->irq[-1].requested_irq, &p->irq[-1]); - -Signed-off-by: Axel Lin <axel.lin@ingics.com> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit dfaf820a13ec160f06556e08dab423818ba87f14) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/irqchip/irq-renesas-irqc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c -index 927bff37..2f404ba6 100644 ---- a/drivers/irqchip/irq-renesas-irqc.c -+++ b/drivers/irqchip/irq-renesas-irqc.c -@@ -248,8 +248,8 @@ static int irqc_probe(struct platform_device *pdev) - - return 0; - err3: -- for (; k >= 0; k--) -- free_irq(p->irq[k - 1].requested_irq, &p->irq[k - 1]); -+ while (--k >= 0) -+ free_irq(p->irq[k].requested_irq, &p->irq[k]); - - irq_domain_remove(p->irq_domain); - err2: --- -1.8.4.3.gca3854a - diff --git a/patches.renesas/0018-clocksource-em_sti-Set-cpu_possible_mask-to-fix-SMP-.patch b/patches.renesas/0018-clocksource-em_sti-Set-cpu_possible_mask-to-fix-SMP-.patch deleted file mode 100644 index 9d2ce97c56071..0000000000000 --- a/patches.renesas/0018-clocksource-em_sti-Set-cpu_possible_mask-to-fix-SMP-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 41af3dec1a96407c5c8e0dd746d9490889dec1a2 Mon Sep 17 00:00:00 2001 -From: Magnus Damm <damm@opensource.se> -Date: Wed, 18 Sep 2013 15:01:16 -0500 -Subject: clocksource: em_sti: Set cpu_possible_mask to fix SMP broadcast - -Update the STI driver by setting cpu_possible_mask to make EMEV2 -SMP work as expected together with the ARM broadcast timer. - -This breakage was introduced by: - -f7db706 ARM: 7674/1: smp: Avoid dummy clockevent being preferred over real hardware clock-event - -Without this fix SMP operation is broken on EMEV2 since no -broadcast timer interrupts trigger on the secondary CPU cores. - -Signed-off-by: Magnus Damm <damm@opensource.se> -Tested-by: Simon Horman <horms+renesas@verge.net.au> -Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> -(cherry picked from commit 2199a5574b6d94b9ca26c6345356f45ec60fef8b) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/clocksource/em_sti.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c -index b9c81b7c..3a5909c1 100644 ---- a/drivers/clocksource/em_sti.c -+++ b/drivers/clocksource/em_sti.c -@@ -301,7 +301,7 @@ static void em_sti_register_clockevent(struct em_sti_priv *p) - ced->name = dev_name(&p->pdev->dev); - ced->features = CLOCK_EVT_FEAT_ONESHOT; - ced->rating = 200; -- ced->cpumask = cpumask_of(0); -+ ced->cpumask = cpu_possible_mask; - ced->set_next_event = em_sti_clock_event_next; - ced->set_mode = em_sti_clock_event_mode; - --- -1.8.4.3.gca3854a - diff --git a/patches.renesas/0019-gpio-rcar-R-Car-GPIO-IRQ-share-interrupt.patch b/patches.renesas/0019-gpio-rcar-R-Car-GPIO-IRQ-share-interrupt.patch deleted file mode 100644 index b9c9b1eb1a1eb..0000000000000 --- a/patches.renesas/0019-gpio-rcar-R-Car-GPIO-IRQ-share-interrupt.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ef2267d538c37c8451bb7e2e8fe07ba2f442e400 Mon Sep 17 00:00:00 2001 -From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Date: Wed, 17 Apr 2013 23:40:57 -0700 -Subject: gpio-rcar: R-Car GPIO IRQ share interrupt - -R-Car H1 or Gen2 GPIO interrupts are assigned per each GPIO domain, -but, Gen1 E1/M1 GPIO interrupts are shared for all GPIO domain. -gpio-rcar driver needs IRQF_SHARED flags for these. -This patch was tested on Bock-W board - -Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit c234962b808f289237a40e4ce5fc1c8066d1c9d0) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/gpio/gpio-rcar.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c -index b4ca4509..0f3d6473 100644 ---- a/drivers/gpio/gpio-rcar.c -+++ b/drivers/gpio/gpio-rcar.c -@@ -333,7 +333,7 @@ static int gpio_rcar_probe(struct platform_device *pdev) - } - - if (devm_request_irq(&pdev->dev, irq->start, -- gpio_rcar_irq_handler, 0, name, p)) { -+ gpio_rcar_irq_handler, IRQF_SHARED, name, p)) { - dev_err(&pdev->dev, "failed to request IRQ\n"); - ret = -ENOENT; - goto err1; --- -1.8.4.3.gca3854a - diff --git a/patches.zynq/0004-net-ethernet-xilinx-Merge-driver-from-Xilinx-reposit.patch b/patches.zynq/0004-net-ethernet-xilinx-Merge-driver-from-Xilinx-reposit.patch index 8021561cca752..fad08ef0bd8e8 100644 --- a/patches.zynq/0004-net-ethernet-xilinx-Merge-driver-from-Xilinx-reposit.patch +++ b/patches.zynq/0004-net-ethernet-xilinx-Merge-driver-from-Xilinx-reposit.patch @@ -158,7 +158,7 @@ Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> + dev_set_drvdata(&op->dev, ndev); SET_NETDEV_DEV(ndev, &op->dev); ndev->flags &= ~IFF_MULTICAST; /* clear multicast */ - ndev->features = NETIF_F_SG | NETIF_F_FRAGLIST; + ndev->features = NETIF_F_SG; @@ -1052,12 +1042,14 @@ static int temac_of_probe(struct platfor /* Setup checksum offload, but default to off if not specified */ lp->temac_features = 0; @@ -915,8 +915,8 @@ Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> - SET_NETDEV_DEV(ndev, &op->dev); + SET_NETDEV_DEV(ndev, &pdev->dev); ndev->flags &= ~IFF_MULTICAST; /* clear multicast */ -- ndev->features = NETIF_F_SG | NETIF_F_FRAGLIST; -+ ndev->features = NETIF_F_FRAGLIST; +- ndev->features = NETIF_F_SG; ++ ndev->features = 0; ndev->netdev_ops = &axienet_netdev_ops; ndev->ethtool_ops = &axienet_ethtool_ops; diff --git a/patches.zynq/0074-net-ethernet-use-platform_-get-set-_drvdata.patch b/patches.zynq/0074-net-ethernet-use-platform_-get-set-_drvdata.patch index da8ec412d7723..b295671ab81c6 100644 --- a/patches.zynq/0074-net-ethernet-use-platform_-get-set-_drvdata.patch +++ b/patches.zynq/0074-net-ethernet-use-platform_-get-set-_drvdata.patch @@ -16,15 +16,13 @@ Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> --- - drivers/net/ethernet/xilinx/ll_temac_main.c | 5 ++--- - drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 ++---- + drivers/net/ethernet/xilinx/ll_temac_main.c | 5 ++--- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) -diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c -index 5444f2b87d01..96cb89795ee4 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c -@@ -1013,7 +1013,7 @@ static int temac_of_probe(struct platform_device *op) +@@ -1013,7 +1013,7 @@ static int temac_of_probe(struct platfor return -ENOMEM; ether_setup(ndev); @@ -32,8 +30,8 @@ index 5444f2b87d01..96cb89795ee4 100644 + platform_set_drvdata(op, ndev); SET_NETDEV_DEV(ndev, &op->dev); ndev->flags &= ~IFF_MULTICAST; /* clear multicast */ - ndev->features = NETIF_F_SG | NETIF_F_FRAGLIST; -@@ -1142,7 +1142,7 @@ static int temac_of_probe(struct platform_device *op) + ndev->features = NETIF_F_SG; +@@ -1142,7 +1142,7 @@ static int temac_of_probe(struct platfor static int temac_of_remove(struct platform_device *op) { @@ -42,7 +40,7 @@ index 5444f2b87d01..96cb89795ee4 100644 struct temac_local *lp = netdev_priv(ndev); temac_mdio_teardown(lp); -@@ -1151,7 +1151,6 @@ static int temac_of_remove(struct platform_device *op) +@@ -1151,7 +1151,6 @@ static int temac_of_remove(struct platfo if (lp->phy_node) of_node_put(lp->phy_node); lp->phy_node = NULL; @@ -50,11 +48,9 @@ index 5444f2b87d01..96cb89795ee4 100644 iounmap(lp->regs); if (lp->sdma_regs) iounmap(lp->sdma_regs); -diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c -index 24748e8367a1..fb7d1c28a2ea 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c -@@ -1484,7 +1484,7 @@ static int axienet_of_probe(struct platform_device *op) +@@ -1484,7 +1484,7 @@ static int axienet_of_probe(struct platf return -ENOMEM; ether_setup(ndev); @@ -72,7 +68,7 @@ index 24748e8367a1..fb7d1c28a2ea 100644 struct axienet_local *lp = netdev_priv(ndev); axienet_mdio_teardown(lp); -@@ -1632,8 +1632,6 @@ static int axienet_of_remove(struct platform_device *op) +@@ -1632,8 +1632,6 @@ static int axienet_of_remove(struct plat of_node_put(lp->phy_node); lp->phy_node = NULL; @@ -81,6 +77,3 @@ index 24748e8367a1..fb7d1c28a2ea 100644 iounmap(lp->regs); if (lp->dma_regs) iounmap(lp->dma_regs); --- -1.8.5.rc3 - @@ -60,12 +60,9 @@ patches.renesas/0009-drivers-ata-sata_rcar.c-simplify-use-of-devm_ioremap.patch patches.renesas/0010-drivers-irq-chip-irq-gic-introduce-gic_cpu_if_down.patch patches.renesas/0011-irqchip-renesas-intc-irqpin-DT-binding-for-sense-bit.patch patches.renesas/0012-ARM-shmobile-irqpin-add-a-DT-property-to-enable-mask.patch -patches.renesas/0013-irqchip-renesas-irqc-Fix-irqc_probe-error-handling.patch patches.renesas/0015-clocksource-arch_timer-Make-register-accessors-less-.patch patches.renesas/0016-clocksource-arch_timer-Push-the-read-write-wrappers-.patch patches.renesas/0017-clocksource-em_sti-Convert-to-devm_-managed-helpers.patch -patches.renesas/0018-clocksource-em_sti-Set-cpu_possible_mask-to-fix-SMP-.patch -patches.renesas/0019-gpio-rcar-R-Car-GPIO-IRQ-share-interrupt.patch patches.renesas/0020-gpio-rcar-Make-the-platform-data-gpio_base-field-sig.patch patches.renesas/0021-gpio-rcar-Add-support-for-IRQ_TYPE_EDGE_BOTH.patch patches.renesas/0022-gpio-rcar-Add-RCAR_GP_PIN-macro.patch |