diff options
author | Zhao Qiang <qiang.zhao@freescale.com> | 2015-11-29 21:48:57 -0500 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2015-12-22 18:12:56 -0500 |
commit | 7aa1aa6ecec2af19d9aa85430ce3e56119e21626 (patch) | |
tree | 0acc8cf320d38abb5bdb12ff8df6053dfa612dd0 /drivers/net | |
parent | 302c059f2e7bac7342f912bc77ff5bd6490c8edd (diff) |
QE: Move QE from arch/powerpc to drivers/soc
ls1 has qe and ls1 has arm cpu.
move qe from arch/powerpc to drivers/soc/fsl
to adapt to powerpc and arm
Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/freescale/fsl_pq_mdio.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/ucc_geth.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/ucc_geth.h | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c index 55c36230e176..d0a6fa6d4f3e 100644 --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
31 | #if IS_ENABLED(CONFIG_UCC_GETH) | 31 | #if IS_ENABLED(CONFIG_UCC_GETH) |
32 | #include <asm/ucc.h> /* for ucc_set_qe_mux_mii_mng() */ | 32 | #include <soc/fsl/qe/ucc.h> |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | #include "gianfar.h" | 35 | #include "gianfar.h" |
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c index 650f7888e32b..c30b72e02a1a 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c | |||
@@ -40,10 +40,10 @@ | |||
40 | #include <asm/uaccess.h> | 40 | #include <asm/uaccess.h> |
41 | #include <asm/irq.h> | 41 | #include <asm/irq.h> |
42 | #include <asm/io.h> | 42 | #include <asm/io.h> |
43 | #include <asm/immap_qe.h> | 43 | #include <soc/fsl/qe/immap_qe.h> |
44 | #include <asm/qe.h> | 44 | #include <soc/fsl/qe/qe.h> |
45 | #include <asm/ucc.h> | 45 | #include <soc/fsl/qe/ucc.h> |
46 | #include <asm/ucc_fast.h> | 46 | #include <soc/fsl/qe/ucc_fast.h> |
47 | #include <asm/machdep.h> | 47 | #include <asm/machdep.h> |
48 | 48 | ||
49 | #include "ucc_geth.h" | 49 | #include "ucc_geth.h" |
diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h index 75f337163ce3..5da19b440a6a 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.h +++ b/drivers/net/ethernet/freescale/ucc_geth.h | |||
@@ -22,11 +22,11 @@ | |||
22 | #include <linux/list.h> | 22 | #include <linux/list.h> |
23 | #include <linux/if_ether.h> | 23 | #include <linux/if_ether.h> |
24 | 24 | ||
25 | #include <asm/immap_qe.h> | 25 | #include <soc/fsl/qe/immap_qe.h> |
26 | #include <asm/qe.h> | 26 | #include <soc/fsl/qe/qe.h> |
27 | 27 | ||
28 | #include <asm/ucc.h> | 28 | #include <soc/fsl/qe/ucc.h> |
29 | #include <asm/ucc_fast.h> | 29 | #include <soc/fsl/qe/ucc_fast.h> |
30 | 30 | ||
31 | #define DRV_DESC "QE UCC Gigabit Ethernet Controller" | 31 | #define DRV_DESC "QE UCC Gigabit Ethernet Controller" |
32 | #define DRV_NAME "ucc_geth" | 32 | #define DRV_NAME "ucc_geth" |