mvebu: refresh patches

Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35210 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/mvebu/patches-3.8/004-net_mvneta_fix_driver_operations_smp.patch b/target/linux/mvebu/patches-3.8/004-net_mvneta_fix_driver_operations_smp.patch
index c7e992f..d1a8e42 100644 (file)
--- a/target/linux/mvebu/patches-3.8/004-net_mvneta_fix_driver_operations_smp.patch
+++ b/target/linux/mvebu/patches-3.8/004-net_mvneta_fix_driver_operations_smp.patch
@@ -22,11 +22,9 @@ This is 3.8-rc material.
  drivers/net/ethernet/marvell/mvneta.c |   17 +++++++++++++++--
  1 file changed, 15 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
-index b6025c3..af2c421 100644
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -1310,6 +1310,17 @@ static u32 mvneta_skb_tx_csum(struct mvneta_port *pp, struct sk_buff *skb)
+@@ -1310,6 +1310,17 @@ static u32 mvneta_skb_tx_csum(struct mvn
        return MVNETA_TX_L4_CSUM_NOT;
  }
  
@@ -54,7 +52,7 @@ index b6025c3..af2c421 100644
        struct mvneta_tx_desc *tx_desc;
        struct netdev_queue *nq;
        int frags = 0;
-@@ -1486,7 +1498,7 @@ static int mvneta_tx(struct sk_buff *skb, struct net_device *dev)
+@@ -1486,7 +1498,7 @@ static int mvneta_tx(struct sk_buff *skb
                goto out;
  
        frags = skb_shinfo(skb)->nr_frags + 1;
@@ -63,7 +61,7 @@ index b6025c3..af2c421 100644
  
        /* Get a descriptor for the first part of the packet */
        tx_desc = mvneta_txq_next_desc_get(txq);
-@@ -2550,6 +2562,7 @@ static const struct net_device_ops mvneta_netdev_ops = {
+@@ -2550,6 +2562,7 @@ static const struct net_device_ops mvnet
        .ndo_change_mtu      = mvneta_change_mtu,
        .ndo_tx_timeout      = mvneta_tx_timeout,
        .ndo_get_stats64     = mvneta_get_stats64,
@@ -71,5 +69,3 @@ index b6025c3..af2c421 100644
  };
  
  const struct ethtool_ops mvneta_eth_tool_ops = {
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/005-arm_mvebu_use_global_interrupts_for_gpio.patch b/target/linux/mvebu/patches-3.8/005-arm_mvebu_use_global_interrupts_for_gpio.patch
index 726e252..e190a33 100644 (file)
--- a/target/linux/mvebu/patches-3.8/005-arm_mvebu_use_global_interrupts_for_gpio.patch
+++ b/target/linux/mvebu/patches-3.8/005-arm_mvebu_use_global_interrupts_for_gpio.patch
@@ -26,8 +26,6 @@ This is 3.8-rc material.
  arch/arm/boot/dts/armada-xp-mv78460.dtsi |   21 +++++++++------------
  3 files changed, 24 insertions(+), 32 deletions(-)
 
-diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
-index 271855a..e041f42 100644
 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
 +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
 @@ -50,27 +50,25 @@
@@ -64,8 +62,6 @@ index 271855a..e041f42 100644
                };
        };
  };
-diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
-index 1c1937d..9e23bd8 100644
 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
 +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
 @@ -51,39 +51,36 @@
@@ -117,8 +113,6 @@ index 1c1937d..9e23bd8 100644
                };
  
                ethernet@d0034000 {
-diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
-index 4905cf3..9659661 100644
 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
 @@ -66,39 +66,36 @@
@@ -170,5 +164,3 @@ index 4905cf3..9659661 100644
                };
  
                ethernet@d0034000 {
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch b/target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch
index 8a77de3..35a2d8e 100644 (file)
--- a/target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch
+++ b/target/linux/mvebu/patches-3.8/006-mmc_mvsdio_use_slot_gpio.patch
@@ -10,8 +10,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  drivers/mmc/host/mvsdio.c |   34 +++++-----------------------------
  1 file changed, 5 insertions(+), 29 deletions(-)
 
-diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index de4c20b..a24a22f 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
 @@ -22,6 +22,7 @@
@@ -30,7 +28,7 @@ index de4c20b..a24a22f 100644
  };
  
  #define mvsd_write(offs, val) writel(val, iobase + (offs))
-@@ -566,20 +566,6 @@ static void mvsd_enable_sdio_irq(struct mmc_host *mmc, int enable)
+@@ -566,20 +566,6 @@ static void mvsd_enable_sdio_irq(struct
        spin_unlock_irqrestore(&host->lock, flags);
  }
  
@@ -51,7 +49,7 @@ index de4c20b..a24a22f 100644
  static void mvsd_power_up(struct mvsd_host *host)
  {
        void __iomem *iobase = host->base;
-@@ -676,7 +662,7 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+@@ -676,7 +662,7 @@ static void mvsd_set_ios(struct mmc_host
  
  static const struct mmc_host_ops mvsd_ops = {
        .request                = mvsd_request,
@@ -60,7 +58,7 @@ index de4c20b..a24a22f 100644
        .set_ios                = mvsd_set_ios,
        .enable_sdio_irq        = mvsd_enable_sdio_irq,
  };
-@@ -798,15 +784,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -798,15 +784,7 @@ static int __init mvsd_probe(struct plat
        if (!host->gpio_card_detect)
                mmc->caps |= MMC_CAP_NEEDS_POLL;
  
@@ -87,7 +85,7 @@ index de4c20b..a24a22f 100644
                if (host->base)
                        iounmap(host->base);
        }
-@@ -861,8 +838,7 @@ static int __exit mvsd_remove(struct platform_device *pdev)
+@@ -861,8 +838,7 @@ static int __exit mvsd_remove(struct pla
                }
                mmc_remove_host(mmc);
                free_irq(host->irq, host);
@@ -97,5 +95,3 @@ index de4c20b..a24a22f 100644
                del_timer_sync(&host->timer);
                mvsd_power_down(host);
                iounmap(host->base);
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch b/target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch
index 287dedf..bede3bf 100644 (file)
--- a/target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch
+++ b/target/linux/mvebu/patches-3.8/007-mmc_mvsdio_use_slot_gpio_for_cd.patch
@@ -10,8 +10,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  drivers/mmc/host/mvsdio.c |   44 +++++++++-----------------------------------
  1 file changed, 9 insertions(+), 35 deletions(-)
 
-diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index a24a22f..baf19fc 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
 @@ -54,7 +54,6 @@ struct mvsd_host {
@@ -22,7 +20,7 @@ index a24a22f..baf19fc 100644
  };
  
  #define mvsd_write(offs, val) writel(val, iobase + (offs))
-@@ -540,13 +539,6 @@ static void mvsd_timeout_timer(unsigned long data)
+@@ -540,13 +539,6 @@ static void mvsd_timeout_timer(unsigned
                mmc_request_done(host->mmc, mrq);
  }
  
@@ -36,7 +34,7 @@ index a24a22f..baf19fc 100644
  static void mvsd_enable_sdio_irq(struct mmc_host *mmc, int enable)
  {
        struct mvsd_host *host = mmc_priv(mmc);
-@@ -765,23 +757,11 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -765,23 +757,11 @@ static int __init mvsd_probe(struct plat
                clk_prepare_enable(host->clk);
        }
  
@@ -65,7 +63,7 @@ index a24a22f..baf19fc 100644
                mmc->caps |= MMC_CAP_NEEDS_POLL;
  
        mmc_gpio_request_ro(mmc, mvsd_data->gpio_write_protect);
-@@ -794,9 +774,9 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -794,9 +774,9 @@ static int __init mvsd_probe(struct plat
  
        pr_notice("%s: %s driver initialized, ",
                           mmc_hostname(mmc), DRIVER_NAME);
@@ -89,7 +87,7 @@ index a24a22f..baf19fc 100644
                mmc_gpio_free_ro(mmc);
                if (host->base)
                        iounmap(host->base);
-@@ -832,10 +809,7 @@ static int __exit mvsd_remove(struct platform_device *pdev)
+@@ -832,10 +809,7 @@ static int __exit mvsd_remove(struct pla
        if (mmc) {
                struct mvsd_host *host = mmc_priv(mmc);
  
@@ -101,5 +99,3 @@ index a24a22f..baf19fc 100644
                mmc_remove_host(mmc);
                free_irq(host->irq, host);
                mmc_gpio_free_ro(mmc);
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/008-mmc_mvsdio_implement_a_device_tree_binding.patch b/target/linux/mvebu/patches-3.8/008-mmc_mvsdio_implement_a_device_tree_binding.patch
index 4f8cc20..7aa7856 100644 (file)
--- a/target/linux/mvebu/patches-3.8/008-mmc_mvsdio_implement_a_device_tree_binding.patch
+++ b/target/linux/mvebu/patches-3.8/008-mmc_mvsdio_implement_a_device_tree_binding.patch
@@ -17,9 +17,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  2 files changed, 62 insertions(+), 15 deletions(-)
  create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
 
-diff --git a/Documentation/devicetree/bindings/mmc/orion-sdio.txt b/Documentation/devicetree/bindings/mmc/orion-sdio.txt
-new file mode 100644
-index 0000000..84f0ebd
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/mmc/orion-sdio.txt
 @@ -0,0 +1,17 @@
@@ -40,8 +37,6 @@ index 0000000..84f0ebd
 +              clocks = <&gateclk 17>;
 +              status = "disabled";
 +      };
-diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index baf19fc..56954bc 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
 @@ -21,6 +21,8 @@
@@ -53,7 +48,7 @@ index baf19fc..56954bc 100644
  #include <linux/mmc/host.h>
  #include <linux/mmc/slot-gpio.h>
  
-@@ -683,17 +685,17 @@ mv_conf_mbus_windows(struct mvsd_host *host,
+@@ -683,17 +685,17 @@ mv_conf_mbus_windows(struct mvsd_host *h
  
  static int __init mvsd_probe(struct platform_device *pdev)
  {
@@ -74,7 +69,7 @@ index baf19fc..56954bc 100644
                return -ENXIO;
  
        r = request_mem_region(r->start, SZ_1K, DRIVER_NAME);
-@@ -710,7 +712,35 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -710,7 +712,35 @@ static int __init mvsd_probe(struct plat
        host->mmc = mmc;
        host->dev = &pdev->dev;
        host->res = r;
@@ -111,7 +106,7 @@ index baf19fc..56954bc 100644
  
        mmc->ops = &mvsd_ops;
  
-@@ -750,21 +780,14 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -750,21 +780,14 @@ static int __init mvsd_probe(struct plat
        } else
                host->irq = irq;
  
@@ -136,7 +131,7 @@ index baf19fc..56954bc 100644
  
        setup_timer(&host->timer, mvsd_timeout_timer, (unsigned long)host);
        platform_set_drvdata(pdev, mmc);
-@@ -776,7 +799,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -776,7 +799,7 @@ static int __init mvsd_probe(struct plat
                           mmc_hostname(mmc), DRIVER_NAME);
        if (!(mmc->caps & MMC_CAP_NEEDS_POLL))
                printk("using GPIO %d for card detection\n",
@@ -145,7 +140,7 @@ index baf19fc..56954bc 100644
        else
                printk("lacking card detect (fall back to polling)\n");
        return 0;
-@@ -855,12 +878,19 @@ static int mvsd_resume(struct platform_device *dev)
+@@ -855,12 +878,19 @@ static int mvsd_resume(struct platform_d
  #define mvsd_resume   NULL
  #endif
  
@@ -165,5 +160,3 @@ index baf19fc..56954bc 100644
        },
  };
  
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch b/target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch
index 394fc4c..9f98bda 100644 (file)
--- a/target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch
+++ b/target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch
@@ -13,8 +13,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  drivers/mmc/host/mvsdio.c |    6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index 56954bc..feb16bd 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
 @@ -25,6 +25,7 @@
@@ -25,7 +23,7 @@ index 56954bc..feb16bd 100644
  
  #include <asm/sizes.h>
  #include <asm/unaligned.h>
-@@ -692,6 +693,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -692,6 +693,7 @@ static int __init mvsd_probe(struct plat
        struct resource *r;
        int ret, irq;
        int gpio_card_detect, gpio_write_protect;
@@ -33,7 +31,7 @@ index 56954bc..feb16bd 100644
  
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        irq = platform_get_irq(pdev, 0);
-@@ -713,6 +715,10 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -713,6 +715,10 @@ static int __init mvsd_probe(struct plat
        host->dev = &pdev->dev;
        host->res = r;
  
@@ -44,5 +42,3 @@ index 56954bc..feb16bd 100644
        /* Some non-DT platforms do not pass a clock, and the clock
           frequency is passed through platform_data. On DT platforms,
           a clock must always be passed, even if there is no gatable
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/010-arm_mvebu_add_dt_info_a370.patch b/target/linux/mvebu/patches-3.8/010-arm_mvebu_add_dt_info_a370.patch
index 36e5ea2..bf4d9d4 100644 (file)
--- a/target/linux/mvebu/patches-3.8/010-arm_mvebu_add_dt_info_a370.patch
+++ b/target/linux/mvebu/patches-3.8/010-arm_mvebu_add_dt_info_a370.patch
@@ -7,11 +7,9 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  arch/arm/boot/dts/armada-370-xp.dtsi |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
-index cf6c48a..41a5b11 100644
 --- a/arch/arm/boot/dts/armada-370-xp.dtsi
 +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
-@@ -129,6 +129,14 @@
+@@ -131,6 +131,14 @@
                        clocks = <&coreclk 0>;
                        status = "disabled";
                };
@@ -26,5 +24,3 @@ index cf6c48a..41a5b11 100644
        };
  };
  
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/011-arm_mvebu_add_pin_mux_options_a370.patch b/target/linux/mvebu/patches-3.8/011-arm_mvebu_add_pin_mux_options_a370.patch
index 6b245a0..4072ae5 100644 (file)
--- a/target/linux/mvebu/patches-3.8/011-arm_mvebu_add_pin_mux_options_a370.patch
+++ b/target/linux/mvebu/patches-3.8/011-arm_mvebu_add_pin_mux_options_a370.patch
@@ -11,8 +11,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  arch/arm/boot/dts/armada-370.dtsi |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
-index 636cf7d..88f9bab 100644
 --- a/arch/arm/boot/dts/armada-370.dtsi
 +++ b/arch/arm/boot/dts/armada-370.dtsi
 @@ -47,6 +47,18 @@
@@ -34,5 +32,3 @@ index 636cf7d..88f9bab 100644
                };
  
                gpio0: gpio@d0018100 {
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/012-arm_mvebu_add_pin_mux_options_axp.patch b/target/linux/mvebu/patches-3.8/012-arm_mvebu_add_pin_mux_options_axp.patch
index f4d9a96..716971d 100644 (file)
--- a/target/linux/mvebu/patches-3.8/012-arm_mvebu_add_pin_mux_options_axp.patch
+++ b/target/linux/mvebu/patches-3.8/012-arm_mvebu_add_pin_mux_options_axp.patch
@@ -14,11 +14,9 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  arch/arm/boot/dts/armada-xp-mv78460.dtsi |    6 ++++++
  3 files changed, 18 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
-index c45c7b4..3fa9c84 100644
 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
 +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
-@@ -40,6 +40,12 @@
+@@ -47,6 +47,12 @@
                pinctrl {
                        compatible = "marvell,mv78230-pinctrl";
                        reg = <0xd0018000 0x38>;
@@ -31,8 +29,6 @@ index c45c7b4..3fa9c84 100644
                };
  
                gpio0: gpio@d0018100 {
-diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
-index a2aee57..5a907b3 100644
 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
 +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
 @@ -48,6 +48,12 @@
@@ -48,8 +44,6 @@ index a2aee57..5a907b3 100644
                };
  
                gpio0: gpio@d0018100 {
-diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
-index da03a12..6dcdc50d 100644
 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
 @@ -63,6 +63,12 @@
@@ -65,5 +59,3 @@ index da03a12..6dcdc50d 100644
                };
  
                gpio0: gpio@d0018100 {
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/013-arm_mvebu_enable_sd_cart_slot_axp_db.patch b/target/linux/mvebu/patches-3.8/013-arm_mvebu_enable_sd_cart_slot_axp_db.patch
index f013ec0..5a6faf9 100644 (file)
--- a/target/linux/mvebu/patches-3.8/013-arm_mvebu_enable_sd_cart_slot_axp_db.patch
+++ b/target/linux/mvebu/patches-3.8/013-arm_mvebu_enable_sd_cart_slot_axp_db.patch
@@ -8,8 +8,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  arch/arm/boot/dts/armada-xp-db.dts |    7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
-index 8e53b25..c7035c5 100644
 --- a/arch/arm/boot/dts/armada-xp-db.dts
 +++ b/arch/arm/boot/dts/armada-xp-db.dts
 @@ -90,5 +90,12 @@
@@ -25,5 +23,3 @@ index 8e53b25..c7035c5 100644
 +              };
        };
  };
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/014-arm_mvebu_enable_sd_card_slot_a370_db.patch b/target/linux/mvebu/patches-3.8/014-arm_mvebu_enable_sd_card_slot_a370_db.patch
index 456c281..d921416 100644 (file)
--- a/target/linux/mvebu/patches-3.8/014-arm_mvebu_enable_sd_card_slot_a370_db.patch
+++ b/target/linux/mvebu/patches-3.8/014-arm_mvebu_enable_sd_card_slot_a370_db.patch
@@ -16,8 +16,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  arch/arm/boot/dts/armada-370-db.dts |   15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
-index 0004402..43ff156 100644
 --- a/arch/arm/boot/dts/armada-370-db.dts
 +++ b/arch/arm/boot/dts/armada-370-db.dts
 @@ -59,5 +59,20 @@
@@ -41,5 +39,3 @@ index 0004402..43ff156 100644
 +              };
        };
  };
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/015-arm_mvebu_enable_sd_card_slot_mirabox.patch b/target/linux/mvebu/patches-3.8/015-arm_mvebu_enable_sd_card_slot_mirabox.patch
index 3868d46..0cf6ee4 100644 (file)
--- a/target/linux/mvebu/patches-3.8/015-arm_mvebu_enable_sd_card_slot_mirabox.patch
+++ b/target/linux/mvebu/patches-3.8/015-arm_mvebu_enable_sd_card_slot_mirabox.patch
@@ -7,8 +7,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  arch/arm/boot/dts/armada-370-mirabox.dts |   10 ++++++++++
  1 file changed, 10 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
-index 3b40713..1864820 100644
 --- a/arch/arm/boot/dts/armada-370-mirabox.dts
 +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
 @@ -52,5 +52,15 @@
@@ -27,5 +25,3 @@ index 3b40713..1864820 100644
 +              };
        };
  };
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/019-rtc_add_support_for_rtc_mv_for_mvebu.patch b/target/linux/mvebu/patches-3.8/019-rtc_add_support_for_rtc_mv_for_mvebu.patch
index 0142f25..373058a 100644 (file)
--- a/target/linux/mvebu/patches-3.8/019-rtc_add_support_for_rtc_mv_for_mvebu.patch
+++ b/target/linux/mvebu/patches-3.8/019-rtc_add_support_for_rtc_mv_for_mvebu.patch
@@ -8,11 +8,9 @@ Acked-by: Andrew Lunn <andrew@lunn.ch>
  drivers/rtc/Kconfig |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
-index 19c03ab..9356f75 100644
 --- a/drivers/rtc/Kconfig
 +++ b/drivers/rtc/Kconfig
-@@ -994,7 +994,7 @@ config RTC_DRV_TX4939
+@@ -1041,7 +1041,7 @@ config RTC_DRV_TX4939
  
  config RTC_DRV_MV
        tristate "Marvell SoC RTC"
@@ -21,5 +19,3 @@ index 19c03ab..9356f75 100644
        help
          If you say yes here you will get support for the in-chip RTC
          that can be found in some of Marvell's SoC devices, such as
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/020-arm_mvebu_add_rtc_support_for_a370_and_axp.patch b/target/linux/mvebu/patches-3.8/020-arm_mvebu_add_rtc_support_for_a370_and_axp.patch
index c517b42..307e815 100644 (file)
--- a/target/linux/mvebu/patches-3.8/020-arm_mvebu_add_rtc_support_for_a370_and_axp.patch
+++ b/target/linux/mvebu/patches-3.8/020-arm_mvebu_add_rtc_support_for_a370_and_axp.patch
@@ -8,12 +8,10 @@ Acked-by: Andrew Lunn <andrew@lunn.ch>
  arch/arm/boot/dts/armada-370-xp.dtsi |    6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
-index cf6c48a..86dccfa 100644
 --- a/arch/arm/boot/dts/armada-370-xp.dtsi
 +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
-@@ -129,6 +129,12 @@
-                       clocks = <&coreclk 0>;
+@@ -139,6 +139,12 @@
+                       clocks = <&gateclk 17>;
                        status = "disabled";
                };
 +
@@ -25,5 +23,3 @@ index cf6c48a..86dccfa 100644
        };
  };
  
--- 
-1.7.9.5

diff --git a/target/linux/mvebu/patches-3.8/021-arm_mvebu_add_rd_a370_a1_dts.patch b/target/linux/mvebu/patches-3.8/021-arm_mvebu_add_rd_a370_a1_dts.patch
index 3303352..6f52500 100644 (file)
--- a/target/linux/mvebu/patches-3.8/021-arm_mvebu_add_rd_a370_a1_dts.patch
+++ b/target/linux/mvebu/patches-3.8/021-arm_mvebu_add_rd_a370_a1_dts.patch
@@ -15,11 +15,9 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
  2 files changed, 62 insertions(+)
  create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index b7246d6..7a75171 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
+@@ -77,6 +77,7 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.d
        msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
        armada-370-mirabox.dtb \
@@ -27,9 +25,6 @@ index b7246d6..7a75171 100644
        armada-xp-db.dtb \
        armada-xp-openblocks-ax3-4.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
-diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
-new file mode 100644
-index 0000000..d62dfac
 --- /dev/null
 +++ b/arch/arm/boot/dts/armada-370-rd.dts
 @@ -0,0 +1,61 @@
@@ -94,6 +89,3 @@ index 0000000..d62dfac
 +              };
 +      };
 +};
--- 
-1.7.10.4
-

diff --git a/target/linux/mvebu/patches-3.8/022-arm_mvebu_enable_sd_card_slot_a370_rd.patch b/target/linux/mvebu/patches-3.8/022-arm_mvebu_enable_sd_card_slot_a370_rd.patch
index 0f7f808..439711a 100644 (file)
--- a/target/linux/mvebu/patches-3.8/022-arm_mvebu_enable_sd_card_slot_a370_rd.patch
+++ b/target/linux/mvebu/patches-3.8/022-arm_mvebu_enable_sd_card_slot_a370_rd.patch
@@ -11,8 +11,6 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
  arch/arm/boot/dts/armada-370-rd.dts |    6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
-index d62dfac..43f68c2 100644
 --- a/arch/arm/boot/dts/armada-370-rd.dts
 +++ b/arch/arm/boot/dts/armada-370-rd.dts
 @@ -57,5 +57,11 @@
@@ -27,6 +25,3 @@ index d62dfac..43f68c2 100644
 +              };
        };
  };
--- 
-1.7.10.4
-

diff --git a/target/linux/mvebu/patches-3.8/023-arm_mvebu_add_support_for_usb_host.patch b/target/linux/mvebu/patches-3.8/023-arm_mvebu_add_support_for_usb_host.patch
index 63aff01..1484c08 100644 (file)
--- a/target/linux/mvebu/patches-3.8/023-arm_mvebu_add_support_for_usb_host.patch
+++ b/target/linux/mvebu/patches-3.8/023-arm_mvebu_add_support_for_usb_host.patch
@@ -13,13 +13,11 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  arch/arm/mach-mvebu/Kconfig          |    1 +
  4 files changed, 42 insertions(+), 0 deletions(-)
 
-diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
-index 28276fe..fa025c4 100644
 --- a/arch/arm/boot/dts/armada-370-xp.dtsi
 +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
 @@ -145,6 +145,21 @@
-                       clocks = <&gateclk 17>;
-                       status = "disabled";
+                       reg = <0xd0010300 0x20>;
+                       interrupts = <50>;
                };
 +
 +              usb@d0050000 {
@@ -39,8 +37,6 @@ index 28276fe..fa025c4 100644
        };
  };
  
-diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
-index 88f9bab..8188d13 100644
 --- a/arch/arm/boot/dts/armada-370.dtsi
 +++ b/arch/arm/boot/dts/armada-370.dtsi
 @@ -144,5 +144,14 @@
@@ -58,8 +54,6 @@ index 88f9bab..8188d13 100644
 +
        };
  };
-diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
-index 390ba98..1443949 100644
 --- a/arch/arm/boot/dts/armada-xp.dtsi
 +++ b/arch/arm/boot/dts/armada-xp.dtsi
 @@ -134,5 +134,22 @@
@@ -85,8 +79,6 @@ index 390ba98..1443949 100644
 +
        };
  };
-diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
-index 440b13e..5e4fcde 100644
 --- a/arch/arm/mach-mvebu/Kconfig
 +++ b/arch/arm/mach-mvebu/Kconfig
 @@ -24,6 +24,7 @@ config MACH_ARMADA_370_XP
@@ -97,5 +89,3 @@ index 440b13e..5e4fcde 100644
  
  config MACH_ARMADA_370
        bool "Marvell Armada 370 boards"
--- 
-1.7.8.6

diff --git a/target/linux/mvebu/patches-3.8/024-arm_mvebu_enable_usb_a370.patch b/target/linux/mvebu/patches-3.8/024-arm_mvebu_enable_usb_a370.patch
index 46b554b..1a20a14 100644 (file)
--- a/target/linux/mvebu/patches-3.8/024-arm_mvebu_enable_usb_a370.patch
+++ b/target/linux/mvebu/patches-3.8/024-arm_mvebu_enable_usb_a370.patch
@@ -6,8 +6,6 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  arch/arm/boot/dts/armada-370-db.dts |    8 ++++++++
  1 files changed, 8 insertions(+), 0 deletions(-)
 
-diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
-index 8e66a7c..3d93902 100644
 --- a/arch/arm/boot/dts/armada-370-db.dts
 +++ b/arch/arm/boot/dts/armada-370-db.dts
 @@ -74,5 +74,13 @@
@@ -24,7 +22,3 @@ index 8e66a7c..3d93902 100644
 +              };
        };
  };
--- 
-1.7.8.6
-
-

diff --git a/target/linux/mvebu/patches-3.8/025-arm_mvebu_enable_usb_a370_mirabox.patch b/target/linux/mvebu/patches-3.8/025-arm_mvebu_enable_usb_a370_mirabox.patch
index 88b20c3..82d059e 100644 (file)
--- a/target/linux/mvebu/patches-3.8/025-arm_mvebu_enable_usb_a370_mirabox.patch
+++ b/target/linux/mvebu/patches-3.8/025-arm_mvebu_enable_usb_a370_mirabox.patch
@@ -6,8 +6,6 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  arch/arm/boot/dts/armada-370-mirabox.dts |    8 ++++++++
  1 files changed, 8 insertions(+), 0 deletions(-)
 
-diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
-index 1864820..dd0c57d 100644
 --- a/arch/arm/boot/dts/armada-370-mirabox.dts
 +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
 @@ -62,5 +62,13 @@
@@ -24,5 +22,3 @@ index 1864820..dd0c57d 100644
 +              };
        };
  };
--- 
-1.7.8.6

diff --git a/target/linux/mvebu/patches-3.8/026-arm_mvebu_enale_usb_axp.patch b/target/linux/mvebu/patches-3.8/026-arm_mvebu_enale_usb_axp.patch
index 8f44072..f3851b0 100644 (file)
--- a/target/linux/mvebu/patches-3.8/026-arm_mvebu_enale_usb_axp.patch
+++ b/target/linux/mvebu/patches-3.8/026-arm_mvebu_enale_usb_axp.patch
@@ -6,8 +6,6 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  arch/arm/boot/dts/armada-xp-db.dts |   12 ++++++++++++
  1 files changed, 12 insertions(+), 0 deletions(-)
 
-diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
-index c7035c5..c84e1fe 100644
 --- a/arch/arm/boot/dts/armada-xp-db.dts
 +++ b/arch/arm/boot/dts/armada-xp-db.dts
 @@ -97,5 +97,17 @@
@@ -28,5 +26,3 @@ index c7035c5..c84e1fe 100644
 +              };
        };
  };
--- 
-1.7.8.6

diff --git a/target/linux/mvebu/patches-3.8/027-arm_mvebu_enable_axp_openblocks.patch b/target/linux/mvebu/patches-3.8/027-arm_mvebu_enable_axp_openblocks.patch
index d9f6448..2078260 100644 (file)
--- a/target/linux/mvebu/patches-3.8/027-arm_mvebu_enable_axp_openblocks.patch
+++ b/target/linux/mvebu/patches-3.8/027-arm_mvebu_enable_axp_openblocks.patch
@@ -6,11 +6,9 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts |    9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)
 
-diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
-index b24644f..55f5b6f 100644
 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
 +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
-@@ -127,5 +127,14 @@
+@@ -121,5 +121,14 @@
                        nr-ports = <2>;
                        status = "okay";
                };
@@ -25,7 +23,3 @@ index b24644f..55f5b6f 100644
 +              };
        };
  };
--- 
-1.7.8.6
-
-