Changeset 38295


Ignore:
Timestamp:
2013-10-03T04:50:00+02:00 (4 years ago)
Author:
luka
Message:

kirkwood: update patches and configuration (3.10)

Signed-off-by: Luka Perkov <luka@…>

Location:
trunk/target/linux/kirkwood
Files:
6 added
3 deleted
16 edited
9 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/kirkwood/config-3.10

    r38280 r38295  
    1212CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y 
    1313CONFIG_ARM=y 
    14 CONFIG_ARM_APPENDED_DTB=y 
    15 CONFIG_ARM_ATAG_DTB_COMPAT=y 
    16 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set 
    17 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y 
     14# CONFIG_ARM_APPENDED_DTB is not set 
    1815# CONFIG_ARM_CPU_SUSPEND is not set 
    1916CONFIG_ARM_L1_CACHE_SHIFT=5 
     
    8077CONFIG_HAS_IOPORT=y 
    8178# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set 
    82 CONFIG_HAVE_AOUT=y 
    8379CONFIG_HAVE_ARCH_JUMP_LABEL=y 
    8480CONFIG_HAVE_ARCH_KGDB=y 
     
    136132CONFIG_M25PXX_USE_FAST_READ=y 
    137133# CONFIG_MACH_D2NET_V2 is not set 
    138 # CONFIG_MACH_DLINK_KIRKWOOD_DT is not set 
     134CONFIG_MACH_DLINK_KIRKWOOD_DT=y 
    139135# CONFIG_MACH_DOCKSTAR is not set 
    140 CONFIG_MACH_ESATA_SHEEVAPLUG=y 
     136# CONFIG_MACH_ESATA_SHEEVAPLUG is not set 
    141137# CONFIG_MACH_GURUPLUG is not set 
    142138# CONFIG_MACH_INETSPACE_V2 is not set 
     
    146142# CONFIG_MACH_NETSPACE_MAX_V2 is not set 
    147143# CONFIG_MACH_NETSPACE_V2 is not set 
    148 CONFIG_MACH_OPENRD=y 
    149 CONFIG_MACH_OPENRD_BASE=y 
    150 CONFIG_MACH_OPENRD_CLIENT=y 
     144# CONFIG_MACH_OPENRD_BASE is not set 
     145# CONFIG_MACH_OPENRD_CLIENT is not set 
    151146# CONFIG_MACH_OPENRD_ULTIMATE is not set 
    152147# CONFIG_MACH_RD88F6192_NAS is not set 
    153148# CONFIG_MACH_RD88F6281 is not set 
    154 CONFIG_MACH_SHEEVAPLUG=y 
     149# CONFIG_MACH_SHEEVAPLUG is not set 
    155150# CONFIG_MACH_T5325 is not set 
    156151# CONFIG_MACH_TS219 is not set 
    157 # CONFIG_MACH_TS219_DT is not set 
    158152# CONFIG_MACH_TS41X is not set 
    159153CONFIG_MDIO_BOARDINFO=y 
     
    171165CONFIG_MTD_OF_PARTS=y 
    172166# CONFIG_MTD_SM_COMMON is not set 
    173 CONFIG_MTD_UIMAGE_SPLIT=y 
    174167CONFIG_MV643XX_ETH=y 
    175168CONFIG_MVEBU_CLK_CORE=y 
     
    178171CONFIG_MVMDIO=y 
    179172CONFIG_NEED_DMA_MAP_STATE=y 
     173CONFIG_NEED_KUSER_HELPERS=y 
    180174CONFIG_NEED_PER_CPU_KM=y 
    181175CONFIG_NET_DSA=y 
     
    186180CONFIG_NET_DSA_TAG_DSA=y 
    187181CONFIG_NET_DSA_TAG_EDSA=y 
    188 # CONFIG_NET_IP_TUNNEL is not set 
    189182CONFIG_NLS=y 
    190183CONFIG_OF=y 
     
    208201CONFIG_PCI=y 
    209202CONFIG_PCI_MVEBU=y 
    210 # CONFIG_PDA_POWER is not set 
    211203CONFIG_PERF_USE_VMALLOC=y 
    212204CONFIG_PHYLIB=y 
  • trunk/target/linux/kirkwood/patches-3.10/0001-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch

    r38280 r38295  
    1 From 6b5917890ada1dc078ee64af2500cd6289fcf9bc Mon Sep 17 00:00:00 2001 
     1From 3c72277cf2c10e3b7065541b3588f21138efeba2 Mon Sep 17 00:00:00 2001 
    22From: Andrew Murray <Andrew.Murray@arm.com> 
    3 Date: Tue, 7 May 2013 16:31:12 +0100 
     3Date: Thu, 16 May 2013 17:55:17 +0200 
    44Subject: [PATCH 01/29] of/pci: Provide support for parsing PCI DT ranges 
    55 property 
     
    4343Tested-by: Jingoo Han <jg1.han@samsung.com> 
    4444Acked-by: Grant Likely <grant.likely@secretlab.ca> 
     45Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    4546--- 
    4647 drivers/of/address.c       | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 
     
    4849 2 files changed, 115 insertions(+) 
    4950 
    50 diff --git a/drivers/of/address.c b/drivers/of/address.c 
    51 index 7c8221d..b55c218 100644 
    5251--- a/drivers/of/address.c 
    5352+++ b/drivers/of/address.c 
    54 @@ -231,6 +231,73 @@ int of_pci_address_to_resource(struct device_node *dev, int bar, 
     53@@ -231,6 +231,73 @@ int of_pci_address_to_resource(struct de 
    5554        return __of_address_to_resource(dev, addrp, size, flags, NULL, r); 
    5655 } 
     
    126125  
    127126 /* 
    128 diff --git a/include/linux/of_address.h b/include/linux/of_address.h 
    129 index 0506eb5..4c2e6f2 100644 
    130127--- a/include/linux/of_address.h 
    131128+++ b/include/linux/of_address.h 
     
    167164 extern u64 of_translate_address(struct device_node *np, const __be32 *addr); 
    168165 extern bool of_can_translate_address(struct device_node *dev); 
    169 @@ -27,6 +57,11 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; } 
     166@@ -27,6 +57,11 @@ static inline unsigned long pci_address_ 
    170167 #define pci_address_to_pio pci_address_to_pio 
    171168 #endif 
     
    179176 #ifndef of_address_to_resource 
    180177 static inline int of_address_to_resource(struct device_node *dev, int index, 
    181 @@ -53,6 +88,19 @@ static inline const __be32 *of_get_address(struct device_node *dev, int index, 
     178@@ -53,6 +88,19 @@ static inline const __be32 *of_get_addre 
    182179 { 
    183180        return NULL; 
     
    199196  
    200197  
    201 --  
    202 1.8.4.rc1 
    203  
  • trunk/target/linux/kirkwood/patches-3.10/0003-of-pci-Add-of_pci_parse_bus_range-function.patch

    r38280 r38295  
    1 From 6275a8e0bacac9702350b6a003470a9ce67c9139 Mon Sep 17 00:00:00 2001 
     1From 389637f9e7f523934acf26c247e4722d761ad966 Mon Sep 17 00:00:00 2001 
    22From: Thierry Reding <thierry.reding@avionic-design.de> 
    3 Date: Mon, 11 Feb 2013 09:22:20 +0100 
     3Date: Thu, 16 May 2013 17:55:19 +0200 
    44Subject: [PATCH 03/29] of/pci: Add of_pci_parse_bus_range() function 
    55 
     
    88 
    99Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> 
     10Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1011--- 
    1112 drivers/of/of_pci.c    | 25 +++++++++++++++++++++++++ 
     
    1314 2 files changed, 26 insertions(+) 
    1415 
    15 diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c 
    16 index 4dd7b9b..42c687a 100644 
    1716--- a/drivers/of/of_pci.c 
    1817+++ b/drivers/of/of_pci.c 
    19 @@ -64,3 +64,28 @@ int of_pci_get_devfn(struct device_node *np) 
     18@@ -64,3 +64,28 @@ int of_pci_get_devfn(struct device_node 
    2019        return (be32_to_cpup(reg) >> 8) & 0xff; 
    2120 } 
     
    4645+} 
    4746+EXPORT_SYMBOL_GPL(of_pci_parse_bus_range); 
    48 diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h 
    49 index 91ec484..7a04826 100644 
    5047--- a/include/linux/of_pci.h 
    5148+++ b/include/linux/of_pci.h 
     
    5754  
    5855 #endif 
    59 --  
    60 1.8.4.rc1 
    61  
  • trunk/target/linux/kirkwood/patches-3.10/0004-clk-mvebu-create-parent-child-relation-for-PCIe-cloc.patch

    r38280 r38295  
    1 From adebeab033de18cabf880f98d2167095520243f2 Mon Sep 17 00:00:00 2001 
     1From 72fb19fc4ff89878273799eb38e8d95b0add3c05 Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Fri, 7 Dec 2012 20:35:20 +0100 
     3Date: Thu, 16 May 2013 17:55:20 +0200 
    44Subject: [PATCH 04/29] clk: mvebu: create parent-child relation for PCIe 
    55 clocks on Armada 370 
     
    1212Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    1313Cc: Mike Turquette <mturquette@linaro.org> 
     14Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1415--- 
    1516 drivers/clk/mvebu/clk-gating-ctrl.c | 4 ++-- 
    1617 1 file changed, 2 insertions(+), 2 deletions(-) 
    1718 
    18 diff --git a/drivers/clk/mvebu/clk-gating-ctrl.c b/drivers/clk/mvebu/clk-gating-ctrl.c 
    19 index ebf141d..b35785a 100644 
    2019--- a/drivers/clk/mvebu/clk-gating-ctrl.c 
    2120+++ b/drivers/clk/mvebu/clk-gating-ctrl.c 
    22 @@ -119,8 +119,8 @@ static const struct mvebu_soc_descr __initconst armada_370_gating_descr[] = { 
     21@@ -119,8 +119,8 @@ static const struct mvebu_soc_descr __in 
    2322        { "pex1_en", NULL,  2 }, 
    2423        { "ge1", NULL, 3 }, 
     
    3130        { "sdio", NULL, 17 }, 
    3231        { "tdm", NULL, 25 }, 
    33 --  
    34 1.8.4.rc1 
    35  
  • trunk/target/linux/kirkwood/patches-3.10/0005-clk-mvebu-add-more-PCIe-clocks-for-Armada-XP.patch

    r38280 r38295  
    1 From 7bda5e7704872a2f01a6c980bb7616d689520ea5 Mon Sep 17 00:00:00 2001 
     1From 52a1c4e3aa9027040c1adc69303aaffc3c2cbaab Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Fri, 18 Jan 2013 16:42:01 +0100 
     3Date: Thu, 16 May 2013 17:55:21 +0200 
    44Subject: [PATCH 05/29] clk: mvebu: add more PCIe clocks for Armada XP 
    55 
     
    1515Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    1616Cc: Mike Turquette <mturquette@linaro.org> 
     17Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1718--- 
    1819 drivers/clk/mvebu/clk-gating-ctrl.c | 14 ++++++++++---- 
    1920 1 file changed, 10 insertions(+), 4 deletions(-) 
    2021 
    21 diff --git a/drivers/clk/mvebu/clk-gating-ctrl.c b/drivers/clk/mvebu/clk-gating-ctrl.c 
    22 index b35785a..2f03723 100644 
    2322--- a/drivers/clk/mvebu/clk-gating-ctrl.c 
    2423+++ b/drivers/clk/mvebu/clk-gating-ctrl.c 
    25 @@ -137,10 +137,14 @@ static const struct mvebu_soc_descr __initconst armada_xp_gating_descr[] = { 
     24@@ -137,10 +137,14 @@ static const struct mvebu_soc_descr __in 
    2625        { "ge2", NULL,  2 }, 
    2726        { "ge1", NULL, 3 }, 
     
    4241        { "sata0lnk", NULL, 14 }, 
    4342        { "sata0", "sata0lnk", 15 }, 
    44 @@ -152,6 +156,8 @@ static const struct mvebu_soc_descr __initconst armada_xp_gating_descr[] = { 
     43@@ -152,6 +156,8 @@ static const struct mvebu_soc_descr __in 
    4544        { "xor0", NULL, 22 }, 
    4645        { "crypto", NULL, 23 }, 
     
    5150        { "sata1lnk", NULL, 29 }, 
    5251        { "sata1", "sata1lnk", 30 }, 
    53 --  
    54 1.8.4.rc1 
    55  
  • trunk/target/linux/kirkwood/patches-3.10/0006-pci-PCIe-driver-for-Marvell-Armada-370-XP-systems.patch

    r38280 r38295  
    1 From b18ed8465d6c2e3b7057d5bb2fc3da5cb15e3fb1 Mon Sep 17 00:00:00 2001 
     1From 8a0a335ed5d4f6c8455090f77ac57c0c25800070 Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Fri, 18 Jan 2013 17:42:58 +0100 
     3Date: Thu, 16 May 2013 17:55:22 +0200 
    44Subject: [PATCH 06/29] pci: PCIe driver for Marvell Armada 370/XP systems 
    55 
     
    2525Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    2626Acked-by: Bjorn Helgaas <bhelgaas@google.com> 
     27Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    2728--- 
    2829 .../devicetree/bindings/pci/mvebu-pci.txt          | 220 ++++++ 
     
    3132 drivers/pci/host/Kconfig                           |   8 + 
    3233 drivers/pci/host/Makefile                          |   1 + 
    33  drivers/pci/host/pci-mvebu.c                       | 879 +++++++++++++++++++++ 
    34  6 files changed, 1113 insertions(+) 
     34 drivers/pci/host/pci-mvebu.c                       | 880 +++++++++++++++++++++ 
     35 6 files changed, 1114 insertions(+) 
    3536 create mode 100644 Documentation/devicetree/bindings/pci/mvebu-pci.txt 
    3637 create mode 100644 drivers/pci/host/Kconfig 
     
    3839 create mode 100644 drivers/pci/host/pci-mvebu.c 
    3940 
    40 diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt 
    41 new file mode 100644 
    42 index 0000000..eb69d92 
    4341--- /dev/null 
    4442+++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt 
     
    264262+       }; 
    265263+}; 
    266 diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig 
    267 index 6d51aa6..ac45398 100644 
    268264--- a/drivers/pci/Kconfig 
    269265+++ b/drivers/pci/Kconfig 
    270 @@ -119,3 +119,5 @@ config PCI_IOAPIC 
     266@@ -125,3 +125,5 @@ config PCI_IOAPIC 
    271267 config PCI_LABEL 
    272268        def_bool y if (DMI || ACPI) 
     
    274270+ 
    275271+source "drivers/pci/host/Kconfig" 
    276 diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile 
    277 index 0c3efcf..6ebf5bf 100644 
    278272--- a/drivers/pci/Makefile 
    279273+++ b/drivers/pci/Makefile 
    280 @@ -67,3 +67,6 @@ obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o 
     274@@ -67,3 +67,6 @@ obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen 
    281275 obj-$(CONFIG_OF) += of.o 
    282276  
     
    285279+# PCI host controller drivers 
    286280+obj-y += host/ 
    287 diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig 
    288 new file mode 100644 
    289 index 0000000..6918fbc 
    290281--- /dev/null 
    291282+++ b/drivers/pci/host/Kconfig 
     
    299290+ 
    300291+endmenu 
    301 diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile 
    302 new file mode 100644 
    303 index 0000000..5ea2d8b 
    304292--- /dev/null 
    305293+++ b/drivers/pci/host/Makefile 
    306294@@ -0,0 +1 @@ 
    307295+obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o 
    308 diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c 
    309 new file mode 100644 
    310 index 0000000..b0ee63b 
    311296--- /dev/null 
    312297+++ b/drivers/pci/host/pci-mvebu.c 
    313 @@ -0,0 +1,879 @@ 
     298@@ -0,0 +1,880 @@ 
    314299+/* 
    315300+ * PCIe driver for Marvell Armada 370 and Armada XP SoCs 
     
    1001986+} 
    1002987+ 
    1003 +static void mvebu_pcie_enable(struct mvebu_pcie *pcie) 
     988+static void __init mvebu_pcie_enable(struct mvebu_pcie *pcie) 
    1004989+{ 
    1005990+       struct hw_pci hw; 
     
    10231008+ * found, maps it. 
    10241009+ */ 
    1025 +static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev, 
    1026 +                                             struct device_node *np, 
    1027 +                                             struct mvebu_pcie_port *port) 
     1010+static void __iomem * __init 
     1011+mvebu_pcie_map_registers(struct platform_device *pdev, 
     1012+                        struct device_node *np, 
     1013+                        struct mvebu_pcie_port *port) 
    10281014+{ 
    10291015+       struct resource regs; 
     
    11801166+}; 
    11811167+ 
    1182 +static int mvebu_pcie_init(void) 
     1168+static int __init mvebu_pcie_init(void) 
    11831169+{ 
    11841170+       return platform_driver_probe(&mvebu_pcie_driver, 
     
    11911177+MODULE_DESCRIPTION("Marvell EBU PCIe driver"); 
    11921178+MODULE_LICENSE("GPLv2"); 
    1193 --  
    1194 1.8.4.rc1 
    1195  
  • trunk/target/linux/kirkwood/patches-3.10/0007-arm-mvebu-PCIe-support-is-now-available-on-mvebu.patch

    r38280 r38295  
    1 From d8bb1510b06f29bb6b63ebafe23656faae60d87f Mon Sep 17 00:00:00 2001 
     1From 3b475bd86ce4c647a65d218a3014396d4b139fb3 Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Fri, 7 Dec 2012 20:56:52 +0100 
     3Date: Thu, 16 May 2013 17:55:23 +0200 
    44Subject: [PATCH 07/29] arm: mvebu: PCIe support is now available on mvebu 
    55 
     
    99 
    1010Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
     11Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1112--- 
    1213 arch/arm/mach-mvebu/Kconfig | 2 ++ 
    1314 1 file changed, 2 insertions(+) 
    1415 
    15 diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig 
    16 index 80a8bca..fb827ac 100644 
    1716--- a/arch/arm/mach-mvebu/Kconfig 
    1817+++ b/arch/arm/mach-mvebu/Kconfig 
     
    2625 if ARCH_MVEBU 
    2726  
    28 --  
    29 1.8.4.rc1 
    30  
  • trunk/target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch

    r38280 r38295  
    1 From 3b93e75d1b66353b8f8ad7d965e17aad68982c55 Mon Sep 17 00:00:00 2001 
     1From 79ae3cf2d6c01b4394ea462f1c49a2e9fbcf0521 Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Wed, 27 Mar 2013 18:48:13 +0100 
     3Date: Wed, 15 May 2013 15:36:54 +0200 
    44Subject: [PATCH 09/29] pci: mvebu: enable driver usage on Kirkwood 
    55 
     
    1010Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    1111Tested-by: Andrew Lunn <andrew@lunn.ch> 
     12Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1213--- 
    1314 Documentation/devicetree/bindings/pci/mvebu-pci.txt | 1 + 
     
    1617 3 files changed, 3 insertions(+), 1 deletion(-) 
    1718 
    18 diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt 
    19 index eb69d92..f8d4058 100644 
    2019--- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt 
    2120+++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt 
     
    2827 - #size-cells, set to <2> 
    2928 - #interrupt-cells, set to <1> 
    30 diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig 
    31 index 6918fbc..1f1d67f 100644 
    3229--- a/drivers/pci/host/Kconfig 
    3330+++ b/drivers/pci/host/Kconfig 
     
    4037  
    4138 endmenu 
    42 diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c 
    43 index b0ee63b..6fe8b90 100644 
    4439--- a/drivers/pci/host/pci-mvebu.c 
    4540+++ b/drivers/pci/host/pci-mvebu.c 
    46 @@ -853,6 +853,7 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev) 
     41@@ -854,6 +854,7 @@ static int __init mvebu_pcie_probe(struc 
    4742 static const struct of_device_id mvebu_pcie_of_match_table[] = { 
    4843        { .compatible = "marvell,armada-xp-pcie", }, 
     
    5247 }; 
    5348 MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table); 
    54 --  
    55 1.8.4.rc1 
    56  
  • trunk/target/linux/kirkwood/patches-3.10/0010-arm-kirkwood-move-PCIe-window-init-to-legacy-driver.patch

    r38280 r38295  
    1 From 080dc44291ff143d84b63e5ff9fda963d46a7dce Mon Sep 17 00:00:00 2001 
     1From 722ffe56a78344821877496f5bb28ca95b4cb67c Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Wed, 27 Mar 2013 18:51:25 +0100 
     3Date: Wed, 15 May 2013 15:36:55 +0200 
    44Subject: [PATCH 10/29] arm: kirkwood: move PCIe window init to legacy driver 
    55 
     
    1818Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    1919Tested-by: Andrew Lunn <andrew@lunn.ch> 
     20Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    2021--- 
    2122 arch/arm/mach-kirkwood/common.c | 24 ------------------------ 
     
    2324 2 files changed, 22 insertions(+), 24 deletions(-) 
    2425 
    25 diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c 
    26 index f389228..41ea98d 100644 
    2726--- a/arch/arm/mach-kirkwood/common.c 
    2827+++ b/arch/arm/mach-kirkwood/common.c 
     
    5857                              KIRKWOOD_NAND_MEM_SIZE); 
    5958        mvebu_mbus_add_window("sram", KIRKWOOD_SRAM_PHYS_BASE, 
    60 diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c 
    61 index 7f43e6c..ddcb09f 100644 
    6259--- a/arch/arm/mach-kirkwood/pcie.c 
    6360+++ b/arch/arm/mach-kirkwood/pcie.c 
     
    7067 #include <asm/irq.h> 
    7168 #include <asm/mach/pci.h> 
    72 @@ -253,6 +254,27 @@ static void __init add_pcie_port(int index, void __iomem *base) 
     69@@ -253,6 +254,27 @@ static void __init add_pcie_port(int ind 
    7370  
    7471 void __init kirkwood_pcie_init(unsigned int portmask) 
     
    9895  
    9996        if (portmask & KW_PCIE0) 
    100 --  
    101 1.8.4.rc1 
    102  
  • trunk/target/linux/kirkwood/patches-3.10/0011-arm-kirkwood-add-SoC-level-Device-Tree-data-for-PCIe.patch

    r38280 r38295  
    1 From 8725a4f93dcb242466990261dc2bd78599b0306a Mon Sep 17 00:00:00 2001 
     1From b2198f4cd8cffdfd5030a176a9ee4d4367526cac Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Wed, 27 Mar 2013 18:55:20 +0100 
     3Date: Wed, 15 May 2013 15:36:56 +0200 
    44Subject: [PATCH 11/29] arm: kirkwood: add SoC-level Device Tree data for PCIe 
    55 interfaces 
     
    1111Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    1212Tested-by: Andrew Lunn <andrew@lunn.ch> 
     13Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1314--- 
    1415 arch/arm/boot/dts/kirkwood-6281.dtsi | 31 +++++++++++++++++++++++ 
     
    1718 3 files changed, 80 insertions(+) 
    1819 
    19 diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi 
    20 index d6c9d65..5137668 100644 
    2120--- a/arch/arm/boot/dts/kirkwood-6281.dtsi 
    2221+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi 
     
    5857        }; 
    5958 }; 
    60 diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi 
    61 index 23991e4..66a751a 100644 
    6259--- a/arch/arm/boot/dts/kirkwood-6282.dtsi 
    6360+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi 
     
    116113        }; 
    117114 }; 
    118 diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi 
    119 index fada7e6..7eef88f 100644 
    120115--- a/arch/arm/boot/dts/kirkwood.dtsi 
    121116+++ b/arch/arm/boot/dts/kirkwood.dtsi 
     
    128123                #address-cells = <1>; 
    129124                #size-cells = <1>; 
    130 --  
    131 1.8.4.rc1 
    132  
  • trunk/target/linux/kirkwood/patches-3.10/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch

    r38280 r38295  
    1 From b7031bd802336c77a6b330f79b275ccbb55fdc96 Mon Sep 17 00:00:00 2001 
     1From cce41fad080eb7e5f3e3e27bbcc5730d624c5d4b Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Wed, 10 Apr 2013 21:22:13 +0200 
     3Date: Wed, 15 May 2013 15:36:57 +0200 
    44Subject: [PATCH 12/29] arm: kirkwood: convert Iomega Iconnect to use DT for 
    55 the PCIe interface 
     
    1010 
    1111Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
     12Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1213--- 
    1314 arch/arm/boot/dts/kirkwood-iconnect.dts | 8 ++++++++ 
     
    1516 2 files changed, 8 insertions(+), 8 deletions(-) 
    1617 
    17 diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts 
    18 index 12ccf74..e591d5d 100644 
    1918--- a/arch/arm/boot/dts/kirkwood-iconnect.dts 
    2019+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts 
     
    3433  
    3534        gpio-leds { 
    36 diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c 
    37 index c8ebde4..98b5ad1 100644 
    3835--- a/arch/arm/mach-kirkwood/board-iconnect.c 
    3936+++ b/arch/arm/mach-kirkwood/board-iconnect.c 
     
    5047-} 
    5148-subsys_initcall(iconnect_pci_init); 
    52 --  
    53 1.8.4.rc1 
    54  
  • trunk/target/linux/kirkwood/patches-3.10/0013-arm-kirkwood-convert-MPL-CEC4-to-use-DT-for-the-PCIe.patch

    r38280 r38295  
    1 From b3e3851d461779cd94a2efe4484f01175fcb460e Mon Sep 17 00:00:00 2001 
     1From b12363b0a393e2751395af002bf9ab192c1140c1 Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Wed, 10 Apr 2013 23:05:32 +0200 
     3Date: Wed, 15 May 2013 15:36:58 +0200 
    44Subject: [PATCH 13/29] arm: kirkwood: convert MPL CEC4 to use DT for the PCIe 
    55 interface 
     
    1010 
    1111Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
     12Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1213--- 
    1314 arch/arm/boot/dts/kirkwood-mplcec4.dts | 8 ++++++++ 
     
    1516 2 files changed, 8 insertions(+), 1 deletion(-) 
    1617 
    17 diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts 
    18 index 7588241..90501cf 100644 
    1918--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts 
    2019+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts 
     
    3433  
    3534        gpio-leds { 
    36 diff --git a/arch/arm/mach-kirkwood/board-mplcec4.c b/arch/arm/mach-kirkwood/board-mplcec4.c 
    37 index 7d6dc66..938712e 100644 
    3835--- a/arch/arm/mach-kirkwood/board-mplcec4.c 
    3936+++ b/arch/arm/mach-kirkwood/board-mplcec4.c 
     
    4643  
    4744  
    48 --  
    49 1.8.4.rc1 
    50  
  • trunk/target/linux/kirkwood/patches-3.10/0014-arm-kirkwood-convert-ZyXEL-NSA310-to-use-DT-for-the-.patch

    r38280 r38295  
    1 From 86310ed36ec224b248b5169371f44250ce8c2275 Mon Sep 17 00:00:00 2001 
     1From f56884bb322085c735b027b64fff4d7294a464ee Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Wed, 10 Apr 2013 23:07:27 +0200 
     3Date: Wed, 15 May 2013 15:36:59 +0200 
    44Subject: [PATCH 14/29] arm: kirkwood: convert ZyXEL NSA310 to use DT for the 
    55 PCIe interface 
     
    1414 
    1515Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
     16Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1617--- 
    1718 arch/arm/boot/dts/kirkwood-nsa310.dts |  8 ++++++++ 
     
    2223 delete mode 100644 arch/arm/mach-kirkwood/board-nsa310.c 
    2324 
    24 diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts 
    25 index a7412b9..9ddf218 100644 
    2625--- a/arch/arm/boot/dts/kirkwood-nsa310.dts 
    2726+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts 
     
    4140  
    4241        gpio_keys { 
    43 diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig 
    44 index 7509a89..267ca95 100644 
    4542--- a/arch/arm/mach-kirkwood/Kconfig 
    4643+++ b/arch/arm/mach-kirkwood/Kconfig 
     
    6057        bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)" 
    6158        select ARCH_KIRKWOOD_DT 
    62 diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile 
    63 index e1f3735..794366e 100644 
    6459--- a/arch/arm/mach-kirkwood/Makefile 
    6560+++ b/arch/arm/mach-kirkwood/Makefile 
    66 @@ -37,7 +37,6 @@ obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)        += board-ns2.o 
     61@@ -37,7 +37,6 @@ obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)        + 
    6762 obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)  += board-ns2.o 
    6863 obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT) += board-ns2.o 
     
    7267 obj-$(CONFIG_MACH_READYNAS_DT)         += board-readynas.o 
    7368 obj-$(CONFIG_MACH_TOPKICK_DT)          += board-usi_topkick.o 
    74 diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c 
    75 deleted file mode 100644 
    76 index 55ade93..0000000 
    7769--- a/arch/arm/mach-kirkwood/board-nsa310.c 
    7870+++ /dev/null 
     
    10395- 
    10496-subsys_initcall(nsa310_pci_init); 
    105 --  
    106 1.8.4.rc1 
    107  
  • trunk/target/linux/kirkwood/patches-3.10/0015-arm-kirkwood-convert-QNAP-TS219-to-use-DT-for-the-PC.patch

    r38280 r38295  
    1 From 0f75608615894c9707e40c0dd3383193fb6c09f6 Mon Sep 17 00:00:00 2001 
     1From c184303509ea2ee9d519db5dbfb2063efca098f7 Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Sat, 13 Apr 2013 13:03:56 +0200 
     3Date: Wed, 15 May 2013 15:37:00 +0200 
    44Subject: [PATCH 15/29] arm: kirkwood: convert QNAP TS219 to use DT for the 
    55 PCIe interface 
     
    1111Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    1212Signed-off-by: Andrew Lunn <andrew@lunn.ch> 
     13Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1314--- 
    1415 arch/arm/boot/dts/kirkwood-ts219-6281.dts | 3 ++- 
     
    1718 3 files changed, 11 insertions(+), 4 deletions(-) 
    1819 
    19 diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts 
    20 index 8295c83..42648ab 100644 
    2120--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts 
    2221+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts 
     
    3130 / { 
    3231        ocp@f1000000 { 
    33 diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts 
    34 index df3f95d..95ceeb9 100644 
    3532--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts 
    3633+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts 
     
    4542 / { 
    4643        ocp@f1000000 { 
    47 diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi 
    48 index 64ea27c..7c022fd 100644 
    4944--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi 
    5045+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi 
     
    6863        }; 
    6964 }; 
    70 --  
    71 1.8.4.rc1 
    72  
  • trunk/target/linux/kirkwood/patches-3.10/0016-arm-kirkwood-convert-db-88f6281-db-88f6282-to-the-De.patch

    r38280 r38295  
    1 From 32f9dd19f7c859205440a8734cb6ab1295c78015 Mon Sep 17 00:00:00 2001 
     1From 8ad6aa146af6af98bd8e308eb7746a5f4cf267d8 Mon Sep 17 00:00:00 2001 
    22From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
    3 Date: Wed, 27 Mar 2013 18:56:40 +0100 
     3Date: Wed, 15 May 2013 15:37:01 +0200 
    44Subject: [PATCH 16/29] arm: kirkwood: convert db-88f6281/db-88f6282 to the 
    55 Device Tree 
     
    2020 
    2121Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
     22Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    2223--- 
    2324 arch/arm/boot/dts/Makefile                  |   2 + 
     
    3839 delete mode 100644 arch/arm/mach-kirkwood/db88f6281-bp-setup.c 
    3940 
    40 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile 
    41 index f0895c5..3844ef2 100644 
    4241--- a/arch/arm/boot/dts/Makefile 
    4342+++ b/arch/arm/boot/dts/Makefile 
    44 @@ -64,6 +64,8 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ 
     43@@ -64,6 +64,8 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += integra 
    4544        integratorcp.dtb 
    4645 dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb 
     
    5150        kirkwood-dns325.dtb \ 
    5251        kirkwood-dockstar.dtb \ 
    53 diff --git a/arch/arm/boot/dts/kirkwood-db-88f6281.dts b/arch/arm/boot/dts/kirkwood-db-88f6281.dts 
    54 new file mode 100644 
    55 index 0000000..9d777ed 
    5652--- /dev/null 
    5753+++ b/arch/arm/boot/dts/kirkwood-db-88f6281.dts 
     
    8783+       }; 
    8884+}; 
    89 diff --git a/arch/arm/boot/dts/kirkwood-db-88f6282.dts b/arch/arm/boot/dts/kirkwood-db-88f6282.dts 
    90 new file mode 100644 
    91 index 0000000..f4c8528 
    9285--- /dev/null 
    9386+++ b/arch/arm/boot/dts/kirkwood-db-88f6282.dts 
     
    127120+       }; 
    128121+}; 
    129 diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi 
    130 new file mode 100644 
    131 index 0000000..c87cfb8 
    132122--- /dev/null 
    133123+++ b/arch/arm/boot/dts/kirkwood-db.dtsi 
     
    222212+       }; 
    223213+}; 
    224 diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig 
    225 index 267ca95..b56bd3d 100644 
    226214--- a/arch/arm/mach-kirkwood/Kconfig 
    227215+++ b/arch/arm/mach-kirkwood/Kconfig 
     
    253241        bool "D-Link Kirkwood-based NAS (Flattened Device Tree)" 
    254242        select ARCH_KIRKWOOD_DT 
    255 diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile 
    256 index 794366e..2fdc3a7 100644 
    257243--- a/arch/arm/mach-kirkwood/Makefile 
    258244+++ b/arch/arm/mach-kirkwood/Makefile 
     
    265251 obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)    += sheevaplug-setup.o 
    266252 obj-$(CONFIG_MACH_GURUPLUG)            += guruplug-setup.o 
    267 @@ -21,6 +20,7 @@ obj-$(CONFIG_MACH_TS41X)              += ts41x-setup.o tsx1x-common.o 
     253@@ -21,6 +20,7 @@ obj-$(CONFIG_MACH_TS41X)              += ts41x-setup 
    268254  
    269255 obj-$(CONFIG_ARCH_KIRKWOOD_DT)         += board-dt.o 
     
    273259 obj-$(CONFIG_MACH_DOCKSTAR_DT)         += board-dockstar.o 
    274260 obj-$(CONFIG_MACH_DREAMPLUG_DT)                += board-dreamplug.o 
    275 diff --git a/arch/arm/mach-kirkwood/board-db88f628x-bp.c b/arch/arm/mach-kirkwood/board-db88f628x-bp.c 
    276 new file mode 100644 
    277 index 0000000..2f574bc 
    278261--- /dev/null 
    279262+++ b/arch/arm/mach-kirkwood/board-db88f628x-bp.c 
     
    303286+       kirkwood_ge00_init(&db88f628x_ge00_data); 
    304287+} 
    305 diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c 
    306 index e9647b8..f5aed1f 100644 
    307288--- a/arch/arm/mach-kirkwood/board-dt.c 
    308289+++ b/arch/arm/mach-kirkwood/board-dt.c 
    309 @@ -147,6 +147,10 @@ static void __init kirkwood_dt_init(void) 
     290@@ -147,6 +147,10 @@ static void __init kirkwood_dt_init(void 
    310291            of_machine_is_compatible("lacie,netspace_v2")) 
    311292                ns2_init(); 
     
    318299                mplcec4_init(); 
    319300  
    320 @@ -181,6 +185,8 @@ static const char * const kirkwood_dt_board_compat[] = { 
     301@@ -181,6 +185,8 @@ static const char * const kirkwood_dt_bo 
    321302        "lacie,netspace_max_v2", 
    322303        "lacie,netspace_mini_v2", 
     
    327308        "netgear,readynas-duo-v2", 
    328309        "plathome,openblocks-a6", 
    329 diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h 
    330 index 21da3b1..cbbc0b8 100644 
    331310--- a/arch/arm/mach-kirkwood/common.h 
    332311+++ b/arch/arm/mach-kirkwood/common.h 
     
    344323 void mplcec4_init(void); 
    345324 #else 
    346 diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 
    347 deleted file mode 100644 
    348 index 5a369fe..0000000 
    349325--- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 
    350326+++ /dev/null 
     
    458434-       .restart        = kirkwood_restart, 
    459435-MACHINE_END 
    460 --  
    461 1.8.4.rc1 
    462  
  • trunk/target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch

    r38294 r38295  
    1 From 40a635881d8fedff7242598cd3bf892e4733f7dc Mon Sep 17 00:00:00 2001 
     1From 799e69d38053e344267360a583676eafe2ed8648 Mon Sep 17 00:00:00 2001 
    22From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
    3 Date: Wed, 29 May 2013 21:32:43 +0200 
    4 Subject: [PATCH 18/29] net: mv643xx_eth: use phy_disconnect instead of 
     3Date: Wed, 29 May 2013 09:32:43 +0000 
     4Subject: [PATCH 20/29] net: mv643xx_eth: use phy_disconnect instead of 
    55 phy_detach 
    66 
     
    1212 
    1313Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
     14Signed-off-by: David S. Miller <davem@davemloft.net> 
    1415--- 
    1516 drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- 
    1617 1 file changed, 1 insertion(+), 1 deletion(-) 
    1718 
    18 diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    19 index d1cbfb1..748dcd3 100644 
    2019--- a/drivers/net/ethernet/marvell/mv643xx_eth.c 
    2120+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    22 @@ -2805,7 +2805,7 @@ static int mv643xx_eth_remove(struct platform_device *pdev) 
     21@@ -2805,7 +2805,7 @@ static int mv643xx_eth_remove(struct pla 
    2322  
    2423        unregister_netdev(mp->dev); 
     
    2928  
    3029        if (!IS_ERR(mp->clk)) 
    31 --  
    32 1.8.4.rc1 
    33  
  • trunk/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch

    r38294 r38295  
    1 From ba7ccfb6824e89ea6175abcf854e7808597a2c40 Mon Sep 17 00:00:00 2001 
     1From 002271ca6718b5dfb8082873fb0a60abc1d9e8d5 Mon Sep 17 00:00:00 2001 
    22From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
    3 Date: Wed, 29 May 2013 21:32:44 +0200 
    4 Subject: [PATCH 19/29] net: mv643xx_eth: use managed devm_ioremap for port 
     3Date: Wed, 29 May 2013 09:32:44 +0000 
     4Subject: [PATCH 21/29] net: mv643xx_eth: use managed devm_ioremap for port 
    55 registers 
    66 
     
    88 
    99Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
     10Signed-off-by: David S. Miller <davem@davemloft.net> 
    1011--- 
    1112 drivers/net/ethernet/marvell/mv643xx_eth.c | 3 +-- 
    1213 1 file changed, 1 insertion(+), 2 deletions(-) 
    1314 
    14 diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    15 index 748dcd3..0a8c064 100644 
    1615--- a/drivers/net/ethernet/marvell/mv643xx_eth.c 
    1716+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    18 @@ -2470,7 +2470,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) 
     17@@ -2470,7 +2470,7 @@ static int mv643xx_eth_shared_probe(stru 
    1918        if (msp == NULL) 
    2019                return -ENOMEM; 
     
    2524                return -ENOMEM; 
    2625  
    27 @@ -2498,7 +2498,6 @@ static int mv643xx_eth_shared_remove(struct platform_device *pdev) 
     26@@ -2498,7 +2498,6 @@ static int mv643xx_eth_shared_remove(str 
    2827 { 
    2928        struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev); 
     
    3332                clk_disable_unprepare(msp->clk); 
    3433  
    35 --  
    36 1.8.4.rc1 
    37  
  • trunk/target/linux/kirkwood/patches-3.10/0022-net-mv643xx_eth-add-phy_node-to-platform_data-struct.patch

    r38294 r38295  
    1 From 76a09d3052c7c1c5d4a3fcdfee3a12cfc998d58f Mon Sep 17 00:00:00 2001 
     1From 30b19330e175f621b04718bc4e55db75768997aa Mon Sep 17 00:00:00 2001 
    22From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
    3 Date: Wed, 29 May 2013 21:32:45 +0200 
    4 Subject: [PATCH 20/29] net: mv643xx_eth: add phy_node to platform_data struct 
     3Date: Wed, 29 May 2013 09:32:45 +0000 
     4Subject: [PATCH 22/29] net: mv643xx_eth: add phy_node to platform_data struct 
    55 
    66This adds a struct device_node pointer for a phy passed by phandle 
     
    88 
    99Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
     10Signed-off-by: David S. Miller <davem@davemloft.net> 
    1011--- 
    1112 include/linux/mv643xx_eth.h | 2 ++ 
    1213 1 file changed, 2 insertions(+) 
    1314 
    14 diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h 
    15 index 141d395..6e8215b 100644 
    1615--- a/include/linux/mv643xx_eth.h 
    1716+++ b/include/linux/mv643xx_eth.h 
    18 @@ -30,6 +30,7 @@ struct mv643xx_eth_shared_platform_data { 
     17@@ -30,6 +30,7 @@ struct mv643xx_eth_shared_platform_data 
    1918 #define MV643XX_ETH_PHY_ADDR(x)                (0x80 | (x)) 
    2019 #define MV643XX_ETH_PHY_NONE           0xff 
     
    3231        /* 
    3332         * Use this MAC address if it is valid, overriding the 
    34 --  
    35 1.8.4.rc1 
    36  
  • trunk/target/linux/kirkwood/patches-3.10/0023-net-mv643xx_eth-use-of_phy_connect-if-phy_node-prese.patch

    r38294 r38295  
    1 From 04417da7ac6d1a2a38d4406d899ab92bf6e488e1 Mon Sep 17 00:00:00 2001 
     1From db22a1196162f981444d241f92d02e2e50d12ed7 Mon Sep 17 00:00:00 2001 
    22From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
    3 Date: Wed, 29 May 2013 21:32:46 +0200 
    4 Subject: [PATCH 21/29] net: mv643xx_eth: use of_phy_connect if phy_node 
     3Date: Wed, 29 May 2013 09:32:46 +0000 
     4Subject: [PATCH 23/29] net: mv643xx_eth: use of_phy_connect if phy_node 
    55 present 
    66 
     
    99 
    1010Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
     11Signed-off-by: David S. Miller <davem@davemloft.net> 
    1112--- 
    1213 drivers/net/ethernet/marvell/mv643xx_eth.c | 25 ++++++++++++++++++------- 
    1314 1 file changed, 18 insertions(+), 7 deletions(-) 
    1415 
    15 diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    16 index 0a8c064..946033b 100644 
    1716--- a/drivers/net/ethernet/marvell/mv643xx_eth.c 
    1817+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c 
     
    2524 static char mv643xx_eth_driver_name[] = "mv643xx_eth"; 
    2625 static char mv643xx_eth_driver_version[] = "1.4"; 
    27 @@ -2715,17 +2716,27 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 
     26@@ -2715,17 +2716,27 @@ static int mv643xx_eth_probe(struct plat 
    2827        netif_set_real_num_tx_queues(dev, mp->txq_count); 
    2928        netif_set_real_num_rx_queues(dev, mp->rxq_count); 
     
    6059        SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops); 
    6160  
    62 --  
    63 1.8.4.rc1 
    64  
  • trunk/target/linux/kirkwood/patches-3.10/0024-net-mv643xx_eth-proper-initialization-for-Kirkwood-S.patch

    r38294 r38295  
    1 From 3b0f26629fef1b55a71031b4ef4db27d0a66a0be Mon Sep 17 00:00:00 2001 
     1From 4c1ae9f272bf34388d0fbdc99aa18af2b6c9eda1 Mon Sep 17 00:00:00 2001 
    22From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
    3 Date: Wed, 29 May 2013 21:32:47 +0200 
    4 Subject: [PATCH 22/29] net: mv643xx_eth: proper initialization for Kirkwood 
     3Date: Wed, 29 May 2013 09:32:47 +0000 
     4Subject: [PATCH 24/29] net: mv643xx_eth: proper initialization for Kirkwood 
    55 SoCs 
    66 
     
    1717 
    1818Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
     19Signed-off-by: David S. Miller <davem@davemloft.net> 
    1920--- 
    2021 drivers/net/ethernet/marvell/mv643xx_eth.c | 11 +++++++++++ 
    2122 1 file changed, 11 insertions(+) 
    2223 
    23 diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    24 index 946033b..af6bdcc 100644 
    2524--- a/drivers/net/ethernet/marvell/mv643xx_eth.c 
    2625+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    27 @@ -116,6 +116,8 @@ static char mv643xx_eth_driver_version[] = "1.4"; 
     26@@ -116,6 +116,8 @@ static char mv643xx_eth_driver_version[] 
    2827 #define  LINK_UP                       0x00000002 
    2928 #define TXQ_COMMAND                    0x0048 
     
    3433 #define TX_BW_MTU                      0x0058 
    3534 #define TX_BW_BURST                    0x005c 
    36 @@ -2701,6 +2703,15 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 
     35@@ -2701,6 +2703,15 @@ static int mv643xx_eth_probe(struct plat 
    3736  
    3837        mp->dev = dev; 
     
    5049         * Start with a default rate, and if there is a clock, allow 
    5150         * it to override the default. 
    52 --  
    53 1.8.4.rc1 
    54  
  • trunk/target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch

    r38294 r38295  
    1 From dd6cae3b60ee88b301f9325db144e70b5e12482e Mon Sep 17 00:00:00 2001 
     1From 0e701e28611fc08558406accadae40be36fe5289 Mon Sep 17 00:00:00 2001 
    22From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
    3 Date: Wed, 29 May 2013 21:32:48 +0200 
    4 Subject: [PATCH 23/29] net: mv643xx_eth: add DT parsing support 
     3Date: Wed, 29 May 2013 09:32:48 +0000 
     4Subject: [PATCH 25/29] net: mv643xx_eth: add DT parsing support 
    55 
    66This adds device tree parsing support for the shared driver of mv643xx_eth. 
     
    1010 
    1111Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
     12Signed-off-by: David S. Miller <davem@davemloft.net> 
    1213--- 
    1314 .../devicetree/bindings/net/marvell-orion-net.txt  |  85 ++++++++++++ 
     
    1617 create mode 100644 Documentation/devicetree/bindings/net/marvell-orion-net.txt 
    1718 
    18 diff --git a/Documentation/devicetree/bindings/net/marvell-orion-net.txt b/Documentation/devicetree/bindings/net/marvell-orion-net.txt 
    19 new file mode 100644 
    20 index 0000000..a73b79f 
    2119--- /dev/null 
    2220+++ b/Documentation/devicetree/bindings/net/marvell-orion-net.txt 
     
    107105+       }; 
    108106+}; 
    109 diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    110 index af6bdcc..004a250 100644 
    111107--- a/drivers/net/ethernet/marvell/mv643xx_eth.c 
    112108+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c 
     
    121117  
    122118 static char mv643xx_eth_driver_name[] = "mv643xx_eth"; 
    123 @@ -2453,13 +2456,148 @@ static void infer_hw_params(struct mv643xx_eth_shared_private *msp) 
     119@@ -2453,13 +2456,148 @@ static void infer_hw_params(struct mv643 
    124120        } 
    125121 } 
     
    271267        if (!mv643xx_eth_version_printed++) 
    272268                pr_notice("MV-643xx 10/100/1000 ethernet driver version %s\n", 
    273 @@ -2472,6 +2610,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) 
     269@@ -2472,6 +2610,7 @@ static int mv643xx_eth_shared_probe(stru 
    274270        msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL); 
    275271        if (msp == NULL) 
     
    279275        msp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); 
    280276        if (msp->base == NULL) 
    281 @@ -2488,12 +2627,15 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) 
     277@@ -2488,12 +2627,15 @@ static int mv643xx_eth_shared_probe(stru 
    282278        if (dram) 
    283279                mv643xx_eth_conf_mbus_windows(msp, dram); 
     
    297293 } 
    298294  
    299 @@ -2501,9 +2643,9 @@ static int mv643xx_eth_shared_remove(struct platform_device *pdev) 
     295@@ -2501,9 +2643,9 @@ static int mv643xx_eth_shared_remove(str 
    300296 { 
    301297        struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev); 
     
    308304 } 
    309305  
    310 @@ -2513,6 +2655,7 @@ static struct platform_driver mv643xx_eth_shared_driver = { 
     306@@ -2513,6 +2655,7 @@ static struct platform_driver mv643xx_et 
    311307        .driver = { 
    312308                .name   = MV643XX_ETH_SHARED_NAME, 
     
    316312 }; 
    317313  
    318 @@ -2721,6 +2864,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 
     314@@ -2721,6 +2864,8 @@ static int mv643xx_eth_probe(struct plat 
    319315        if (!IS_ERR(mp->clk)) { 
    320316                clk_prepare_enable(mp->clk); 
     
    325321  
    326322        set_params(mp, pd); 
    327 --  
    328 1.8.4.rc1 
    329  
  • trunk/target/linux/kirkwood/patches-3.10/0026-ARM-kirkwood-add-gigabit-ethernet-and-mvmdio-device-.patch

    r38294 r38295  
    1 From 81547b563bd8340d98cdf2c020449ef2e7e8821d Mon Sep 17 00:00:00 2001 
     1From 678cc6aa6f66182cddfc0c8fc34d4ef196669b83 Mon Sep 17 00:00:00 2001 
    22From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
    3 Date: Tue, 2 Jul 2013 13:00:19 +0200 
    4 Subject: [PATCH 24/29] ARM: kirkwood: add gigabit ethernet and mvmdio device 
     3Date: Sun, 7 Jul 2013 22:34:56 +0200 
     4Subject: [PATCH 26/29] ARM: kirkwood: add gigabit ethernet and mvmdio device 
    55 tree nodes 
    66 
     
    1010 
    1111Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
     12Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1213--- 
    1314 arch/arm/boot/dts/kirkwood-cloudbox.dts            | 16 +++++++ 
     
    3940 26 files changed, 414 insertions(+), 2 deletions(-) 
    4041 
    41 diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts 
    42 index 5f21d4e..03e1b68 100644 
    4342--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts 
    4443+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts 
     
    6362+       }; 
    6463+}; 
    65 diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi 
    66 index c87cfb8..ca8bf36 100644 
    6764--- a/arch/arm/boot/dts/kirkwood-db.dtsi 
    6865+++ b/arch/arm/boot/dts/kirkwood-db.dtsi 
     
    8784+       }; 
    8885+}; 
    89 diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi 
    90 index 6875ac0..7c8bc17 100644 
    9186--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi 
    9287+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi 
     
    111106+       }; 
    112107+}; 
    113 diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts 
    114 index 0196cf6..b5aebbc 100644 
    115108--- a/arch/arm/boot/dts/kirkwood-dockstar.dts 
    116109+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts 
     
    136129+       }; 
    137130+}; 
    138 diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts 
    139 index 289e51d..e0c93d4 100644 
    140131--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts 
    141132+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts 
     
    172163+       }; 
    173164+}; 
    174 diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts 
    175 index c3573be..aba5849 100644 
    176165--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts 
    177166+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts 
     
    196185+       }; 
    197186+}; 
    198 diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts 
    199 index 44fd97d..210dfb9 100644 
    200187--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts 
    201188+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts 
     
    234221+       }; 
    235222+}; 
    236 diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts 
    237 index 5335b1a..fff3e65 100644 
    238223--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts 
    239224+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts 
     
    258243+       }; 
    259244+}; 
    260 diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts 
    261 index e591d5d..9fe8ba2 100644 
    262245--- a/arch/arm/boot/dts/kirkwood-iconnect.dts 
    263246+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts 
     
    282265+       }; 
    283266+}; 
    284 diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts 
    285 index 3694e94..315f095 100644 
    286267--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts 
    287268+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts 
     
    314295+       }; 
    315296+}; 
    316 diff --git a/arch/arm/boot/dts/kirkwood-is2.dts b/arch/arm/boot/dts/kirkwood-is2.dts 
    317 index 0bdce0a..2e5fe72 100644 
    318297--- a/arch/arm/boot/dts/kirkwood-is2.dts 
    319298+++ b/arch/arm/boot/dts/kirkwood-is2.dts 
     
    324303+ 
    325304+&ethphy0 { reg = <8>; }; 
    326 diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts 
    327 index 5bbd054..f9194b1 100644 
    328305--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts 
    329306+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts 
     
    348325+       }; 
    349326+}; 
    350 diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi 
    351 index 37d45c4..dcc6470 100644 
    352327--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi 
    353328+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi 
     
    384359+       }; 
    385360+}; 
    386 diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts 
    387 index 90501cf..32a0133 100644 
    388361--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts 
    389362+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts 
     
    419392+       }; 
    420393+}; 
    421 diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts 
    422 index 1ca66ab..b66b2cd 100644 
    423394--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts 
    424395+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts 
     
    443414+       }; 
    444415+}; 
    445 diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi 
    446 index 6affd92..6a48bfd 100644 
    447416--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi 
    448417+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi 
     
    467436+       }; 
    468437+}; 
    469 diff --git a/arch/arm/boot/dts/kirkwood-ns2.dts b/arch/arm/boot/dts/kirkwood-ns2.dts 
    470 index f2d36ecf..8ffd552 100644 
    471438--- a/arch/arm/boot/dts/kirkwood-ns2.dts 
    472439+++ b/arch/arm/boot/dts/kirkwood-ns2.dts 
     
    477444+ 
    478445+&ethphy0 { reg = <8>; }; 
    479 diff --git a/arch/arm/boot/dts/kirkwood-ns2lite.dts b/arch/arm/boot/dts/kirkwood-ns2lite.dts 
    480 index b02eb4e..16332f8 100644 
    481446--- a/arch/arm/boot/dts/kirkwood-ns2lite.dts 
    482447+++ b/arch/arm/boot/dts/kirkwood-ns2lite.dts 
     
    487452+ 
    488453+&ethphy0 { reg = <0>; }; 
    489 diff --git a/arch/arm/boot/dts/kirkwood-ns2max.dts b/arch/arm/boot/dts/kirkwood-ns2max.dts 
    490 index bcec4d6..68d767d 100644 
    491454--- a/arch/arm/boot/dts/kirkwood-ns2max.dts 
    492455+++ b/arch/arm/boot/dts/kirkwood-ns2max.dts 
     
    497460+ 
    498461+&ethphy0 { reg = <8>; }; 
    499 diff --git a/arch/arm/boot/dts/kirkwood-ns2mini.dts b/arch/arm/boot/dts/kirkwood-ns2mini.dts 
    500 index adab1ab..5b1b17b 100644 
    501462--- a/arch/arm/boot/dts/kirkwood-ns2mini.dts 
    502463+++ b/arch/arm/boot/dts/kirkwood-ns2mini.dts 
     
    507468+ 
    508469+&ethphy0 { reg = <0>; }; 
    509 diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts 
    510 index d27f724..f8be3e3 100644 
    511470--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts 
    512471+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts 
     
    531490+       }; 
    532491+}; 
    533 diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts 
    534 index 66eb45b..34eacf2 100644 
    535492--- a/arch/arm/boot/dts/kirkwood-topkick.dts 
    536493+++ b/arch/arm/boot/dts/kirkwood-topkick.dts 
     
    555512+       }; 
    556513+}; 
    557 diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts 
    558 index 42648ab..fff3a3e 100644 
    559514--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts 
    560515+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts 
     
    568523+ 
    569524+&ethphy0 { reg = <8>; }; 
    570 diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts 
    571 index 95ceeb9..ed0441a 100644 
    572525--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts 
    573526+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts 
     
    581534+ 
    582535+&ethphy0 { reg = <0>; }; 
    583 diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi 
    584 index 7c022fd..6b063eb 100644 
    585536--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi 
    586537+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi 
     
    605556+       }; 
    606557+}; 
    607 diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi 
    608 index 7eef88f..ebc6dc4 100644 
    609558--- a/arch/arm/boot/dts/kirkwood.dtsi 
    610559+++ b/arch/arm/boot/dts/kirkwood.dtsi 
     
    667616        }; 
    668617 }; 
    669 --  
    670 1.8.4.rc1 
    671  
  • trunk/target/linux/kirkwood/patches-3.10/0028-ARM-kirkwood-remove-legacy-clk-alias-for-mv643xx_eth.patch

    r38294 r38295  
    1 From dcfe8d8652de29fae2e247137d0e776fdda60b14 Mon Sep 17 00:00:00 2001 
     1From 57bad8fd425fd4fd2ae6e4ae1e7e19c9281d2d3d Mon Sep 17 00:00:00 2001 
    22From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
    33Date: Tue, 2 Jul 2013 13:00:23 +0200 
    4 Subject: [PATCH 26/29] ARM: kirkwood: remove legacy clk alias for mv643xx_eth 
     4Subject: [PATCH 28/29] ARM: kirkwood: remove legacy clk alias for mv643xx_eth 
    55 
    66With all boards converted to DT enabled mv643xx_eth we can now 
     
    88 
    99Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
     10Signed-off-by: Jason Cooper <jason@lakedaemon.net> 
    1011--- 
    1112 arch/arm/mach-kirkwood/board-dt.c | 2 -- 
    1213 1 file changed, 2 deletions(-) 
    1314 
    14 diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c 
    15 index 15e61c8..a6ff0a8 100644 
    1615--- a/arch/arm/mach-kirkwood/board-dt.c 
    1716+++ b/arch/arm/mach-kirkwood/board-dt.c 
    18 @@ -66,12 +66,10 @@ static void __init kirkwood_legacy_clk_init(void) 
     17@@ -66,12 +66,10 @@ static void __init kirkwood_legacy_clk_i 
    1918         */ 
    2019        clkspec.args[0] = CGC_BIT_GE0; 
     
    2928 } 
    3029  
    31 --  
    32 1.8.4.rc1 
    33  
  • trunk/target/linux/kirkwood/patches-3.10/0029-net-mv643xx_eth-do-not-use-port-number-as-platform-d.patch

    r38294 r38295  
    1 From eac92acae29cfab34785d61cbb3218e88e487b77 Mon Sep 17 00:00:00 2001 
     1From dc4eff91629aa5132f9c0737ef6d9ef013d4f8ce Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    3 Date: Mon, 8 Jul 2013 00:35:12 +0200 
    4 Subject: [PATCH 27/29] net: mv643xx_eth: do not use port number as platform 
     3Date: Mon, 8 Jul 2013 00:44:55 +0200 
     4Subject: [PATCH 29/29] net: mv643xx_eth: do not use port number as platform 
    55 device id 
    66 
     
    1313 
    1414Signed-off-by: Jonas Gorski <jogo@openwrt.org> 
     15Signed-off-by: David S. Miller <davem@davemloft.net> 
    1516--- 
    1617 drivers/net/ethernet/marvell/mv643xx_eth.c | 13 +++++++++++-- 
    1718 1 file changed, 11 insertions(+), 2 deletions(-) 
    1819 
    19 diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    20 index 004a250..e57d292 100644 
    2120--- a/drivers/net/ethernet/marvell/mv643xx_eth.c 
    2221+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c 
    23 @@ -2483,6 +2483,7 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, 
     22@@ -2483,6 +2483,7 @@ static int mv643xx_eth_shared_of_add_por 
    2423        struct resource res; 
    2524        const char *mac_addr; 
     
    2928        memset(&ppd, 0, sizeof(ppd)); 
    3029        ppd.shared = pdev; 
    31 @@ -2503,6 +2504,14 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, 
     30@@ -2503,6 +2504,14 @@ static int mv643xx_eth_shared_of_add_por 
    3231                return -EINVAL; 
    3332        } 
     
    4443        if (mac_addr) 
    4544                memcpy(ppd.mac_addr, mac_addr, 6); 
    46 @@ -2521,7 +2530,7 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, 
     45@@ -2521,7 +2530,7 @@ static int mv643xx_eth_shared_of_add_por 
    4746                of_property_read_u32(pnp, "duplex", &ppd.duplex); 
    4847        } 
     
    5352                return -ENOMEM; 
    5453        ppdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); 
    55 @@ -2538,7 +2547,7 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, 
     54@@ -2538,7 +2547,7 @@ static int mv643xx_eth_shared_of_add_por 
    5655        if (ret) 
    5756                goto port_err; 
     
    6261        return 0; 
    6362  
    64 --  
    65 1.8.4.rc1 
    66  
  • trunk/target/linux/kirkwood/patches-3.10/0050-of-add-support-for-parsing-mac-addresses-from-mtd.patch

    r38280 r38295  
    99 1 file changed, 99 insertions(+), 1 deletion(-) 
    1010 
    11 diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c 
    12 index ffab033..8b40ac6 100644 
    1311--- a/drivers/of/of_net.c 
    1412+++ b/drivers/of/of_net.c 
     
    2119 /** 
    2220  * It maps 'enum phy_interface_t' found in include/linux/phy.h 
    23 @@ -55,6 +56,103 @@ const int of_get_phy_mode(struct device_node *np) 
     21@@ -55,6 +56,103 @@ const int of_get_phy_mode(struct device_ 
    2422 } 
    2523 EXPORT_SYMBOL_GPL(of_get_phy_mode); 
     
    125123  * Search the device tree for the best MAC address to use.  'mac-address' is 
    126124  * checked first, because that is supposed to contain to "most recent" MAC 
    127 @@ -89,6 +187,6 @@ const void *of_get_mac_address(struct device_node *np) 
     125@@ -89,6 +187,6 @@ const void *of_get_mac_address(struct de 
    128126        if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value)) 
    129127                return pp->value; 
     
    133131 } 
    134132 EXPORT_SYMBOL(of_get_mac_address); 
    135 --  
    136 1.8.4.rc1 
    137  
Note: See TracChangeset for help on using the changeset viewer.