Changeset 42550


Ignore:
Timestamp:
2014-09-15T12:19:20+02:00 (3 years ago)
Author:
blogic
Message:

lantiq: fix switch init on vr9 SoC

Signed-off-by: John Crispin <blogic@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/lantiq/patches-3.14/0025-NET-MIPS-lantiq-adds-xrx200-net.patch

    r42476 r42550  
    1515 create mode 100644 drivers/net/ethernet/lantiq_xrx200_sw.h 
    1616 
    17 diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig 
    18 index 506b024..0a0dbe6 100644 
    19 --- a/drivers/net/ethernet/Kconfig 
    20 +++ b/drivers/net/ethernet/Kconfig 
    21 @@ -84,7 +84,13 @@ config LANTIQ_ETOP 
     17Index: linux-3.14.18/drivers/net/ethernet/Kconfig 
     18=================================================================== 
     19--- linux-3.14.18.orig/drivers/net/ethernet/Kconfig     2014-09-06 01:34:59.000000000 +0200 
     20+++ linux-3.14.18/drivers/net/ethernet/Kconfig  2014-09-13 05:02:42.601066602 +0200 
     21@@ -84,7 +84,13 @@ 
    2222        tristate "Lantiq SoC ETOP driver" 
    2323        depends on SOC_TYPE_XWAY 
     
    3434 source "drivers/net/ethernet/marvell/Kconfig" 
    3535 source "drivers/net/ethernet/mellanox/Kconfig" 
    36 diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile 
    37 index c0b8789..459cce8 100644 
    38 --- a/drivers/net/ethernet/Makefile 
    39 +++ b/drivers/net/ethernet/Makefile 
    40 @@ -38,6 +38,7 @@ obj-$(CONFIG_IP1000) += icplus/ 
     36Index: linux-3.14.18/drivers/net/ethernet/Makefile 
     37=================================================================== 
     38--- linux-3.14.18.orig/drivers/net/ethernet/Makefile    2014-09-06 01:34:59.000000000 +0200 
     39+++ linux-3.14.18/drivers/net/ethernet/Makefile 2014-09-13 05:02:42.601066602 +0200 
     40@@ -38,6 +38,7 @@ 
    4141 obj-$(CONFIG_JME) += jme.o 
    4242 obj-$(CONFIG_KORINA) += korina.o 
     
    4646 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ 
    4747 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ 
    48 diff --git a/drivers/net/ethernet/lantiq_pce.h b/drivers/net/ethernet/lantiq_pce.h 
    49 new file mode 100644 
    50 index 0000000..0c38efe 
    51 --- /dev/null 
    52 +++ b/drivers/net/ethernet/lantiq_pce.h 
     48Index: linux-3.14.18/drivers/net/ethernet/lantiq_pce.h 
     49=================================================================== 
     50--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     51+++ linux-3.14.18/drivers/net/ethernet/lantiq_pce.h     2014-09-13 05:02:42.601066602 +0200 
    5352@@ -0,0 +1,163 @@ 
    5453+/* 
     
    215214+       MC_ENTRY(0x0000, 0x0000, 39, OUT_NONE,   0, INSTR,   FLAG_END,   0), 
    216215+}; 
    217 diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c 
    218 new file mode 100644 
    219 index 0000000..2da9d47 
    220 --- /dev/null 
    221 +++ b/drivers/net/ethernet/lantiq_xrx200.c 
    222 @@ -0,0 +1,1798 @@ 
     216Index: linux-3.14.18/drivers/net/ethernet/lantiq_xrx200.c 
     217=================================================================== 
     218--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     219+++ linux-3.14.18/drivers/net/ethernet/lantiq_xrx200.c  2014-09-13 05:04:05.185068633 +0200 
     220@@ -0,0 +1,1796 @@ 
    223221+/* 
    224222+ *   This program is free software; you can redistribute it and/or modify it 
     
    18521850+       struct device_node *port; 
    18531851+       const __be32 *wan; 
    1854 +       const __be32 *sw; 
    18551852+ 
    18561853+       /* alloc the network device */ 
     
    18771874+ 
    18781875+       /* should the switch be enabled on this interface ? */ 
    1879 +       sw = of_get_property(iface, "lantiq,switch", NULL); 
    1880 +       if (sw && (*sw == 1)) 
     1876+       if (of_find_property(iface, "lantiq,switch", NULL)) 
    18811877+               priv->sw = 1; 
    18821878+ 
     
    20192015+MODULE_DESCRIPTION("Lantiq SoC XRX200 ethernet"); 
    20202016+MODULE_LICENSE("GPL"); 
    2021 diff --git a/drivers/net/ethernet/lantiq_xrx200_sw.h b/drivers/net/ethernet/lantiq_xrx200_sw.h 
    2022 new file mode 100644 
    2023 index 0000000..e7188a2 
    2024 --- /dev/null 
    2025 +++ b/drivers/net/ethernet/lantiq_xrx200_sw.h 
     2017Index: linux-3.14.18/drivers/net/ethernet/lantiq_xrx200_sw.h 
     2018=================================================================== 
     2019--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     2020+++ linux-3.14.18/drivers/net/ethernet/lantiq_xrx200_sw.h       2014-09-13 05:02:42.605066602 +0200 
    20262021@@ -0,0 +1,1328 @@ 
    20272022+/* 
     
    33533348+ 
    33543349+ 
    3355 --  
    3356 1.7.10.4 
    3357  
Note: See TracChangeset for help on using the changeset viewer.