Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755332AbbFBDPU (ORCPT ); Mon, 1 Jun 2015 23:15:20 -0400 Received: from mail-bn1on0114.outbound.protection.outlook.com ([157.56.110.114]:53222 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754686AbbFBDPN (ORCPT ); Mon, 1 Jun 2015 23:15:13 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; From: Zhao Qiang To: , , , CC: Zhao Qiang Subject: [PATCH v5] QE: Move QE from arch/powerpc to drivers/soc Date: Tue, 2 Jun 2015 10:37:30 +0800 Message-ID: <1433212650-29579-1-git-send-email-B45475@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD004;1:U9p/AyPaSGIoXcxxLwwtaR018PCc/YNoUze1ECZZ6JR96k6qTR0YVPN6PZShPs/vsjRaHkxdm1tn0clA1IX2zBubGjudiVuEwfEXWOhf6aq725eYdVTfa/ofnrbBRpG9oDQEwb3fLgehWYFQjL83w8Fj7PS61Pn5eg2p95uuC3CIGQujBK25LqySJBpVKQnlWGNRj65AFESGR68u3jb03yail3kRlqWWRrd2SRvfWA4jhTEVJ107hsoa+X3wAraSa8AWrq2HGhCtZjNKhY4mLDrqy8qZxsoYxi5643nxcepmQ5bKzwe963VZYq+FJQPg4OejG/zS2zS0AOaMpp7Bqw== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(339900001)(40224003)(199003)(189002)(229853001)(48376002)(104016003)(189998001)(5001830100001)(106466001)(97736004)(46102003)(2201001)(19580405001)(19580395003)(81156007)(50466002)(5001770100001)(47776003)(85426001)(36756003)(64706001)(50986999)(5001960100002)(4001540100001)(5001860100001)(77156002)(77096005)(68736005)(5001920100001)(105606002)(107886002)(50226001)(6806004)(62966003)(92566002)(87936001)(4001430100001)(42262002)(2101003)(4001450100001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR0301MB1544;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1544;2:Kn7XP21Lkw697lPYbLpZV3x0Pm3ayeh7i/Rh8QGYr5MZmy78EV5J68CcnWoFVzNk;2:37uOLWa86o7yvfqGkMRDt170eDkQBNemT25Miqa2/pkn9lgKtByx8MJf4HVluGd6NCwfYGxzRJjK8uz0De3CvOW9A5Zkna+3CcJxyKtpQ++Y7zWuvSvwc9GOf6fjsyFtR76Esigix8FCtTfEOEmBVBMwMIkxqM9auAAPSDDuUba1UlpOws9beKaJum5OUV17d7fDFkYpB7ScE6pgfFGWa4Zet0irgJB5zznLzjfj00U=;6:0O6oB6uqW1bZJ0nDQsKsuJ/X0tvQoR4LXFf8PIF3meeB/xtjY9nAIvlV21csqq8kmIs+FwQPdHn+f4YxgxeimtzbWS9BqUpqcouf57py2dymG5PEMaJcHyppotzhWejuekgreJBii4WpVYYzDSZUSyqzl0CiqmQhzbK5ciNQe/3xppFUEy8arX1nYa+YcH9sKpj0c20CdnlNZHY431lc6yLUWK6mHkgrETK3fitw6iYrcXbGV8qOcJB8fgQrxzdqvnmG5xuQMdphp23NnnR/+Cj2g23S89W/D7v/k7qnoNWe+uUUyA9v+7x0/2DKFHS8/Tr7VGqgT8wxuf6FsyMIKw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB1544; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(520003)(3002001);SRVR:BY2PR0301MB1544;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB1544; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1544;3:Hm1lJxl/Jb6YJfun1bMVMsGU4v+TYXd+kvphiQ8cQ1EHifcRf7ZVokKeZde+OtiiipDV1eypCLST9WQZPFVgLPXUhF7TRjveq6goVTIxyK/JW1o94PKgUKdYHjCX5VsQ9soZJgRbiO7ggKwHbgUqmNCzUM1JuesvCiTprQHR0O4sGwV0Gq187g8k9B8sDAc8nyoGksNANbGgoRVwKvGRiblTLtD/nKbsd8fwweZimVaDnnId4KTAN6zOIMdJt9FlEk6zcmSbpXbEvg2pXOZWJNPn3TDk467S8jg4PCJgJRyAg7KegHygEYfoavxP8tL3 X-Forefront-PRVS: 05954A7C45 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR0301MB1544;9:ORTKKp98mQ67/UIeeP4pSjE37ykN6zXgqiMH4jOM?= =?us-ascii?Q?Sach61MWuLjBq9NA0GM20gDs9oezLOMfCdjZgQx+rZP+SjIZu+pwV54c+evD?= =?us-ascii?Q?j+UeOWgs3eOz4Le0KsPwNYd8F0X5Wld5C3zIZENsronv/1NH2qHHdAV3k3L2?= =?us-ascii?Q?awmroyXKIIAi9UrztpjXTkIs23D1prr9+L0HcCgZuzTBIl1I8dGv+ajy0aeg?= =?us-ascii?Q?0Dhym6uwtm3aLmmdAhYd2u7l9KIqBpfWd98Uhb4FS6+PqryryKQH/U+Nbuv8?= =?us-ascii?Q?wHIj1WNQCXaVEvqv7kRZIdEIHA9wkXtXOvuN7DnZTVerFFKOf7EuXTO456Wo?= =?us-ascii?Q?QxXQ5lPufPejOUX7Gmo8llFw780Lx/U0/YhdKVzPF6xe6qh/gw3OOKpCIcNQ?= =?us-ascii?Q?iEL1B4Dvx8Ut4CVzWqplJc62eTImahyseV1tdH6FUtajrZ6SeZirqozWrCrX?= =?us-ascii?Q?PAj98XNr9Jt1JxEV5F//P4Gn500IJklDjpkCMznCRGQ0Kn4wL5fHXxcsn1sy?= =?us-ascii?Q?z2x0AWFXOS/bEZMvp0woDYNvKM9xrF+CbHAEO7ZKFJn555Rkn0ji1sUkDKQR?= =?us-ascii?Q?A4wnK6hCXYznE1mQ7Fd7LFHmUhOuj8pgQFtFfaRxpwLvWfbcvZRrXHmkGq0w?= =?us-ascii?Q?yKXwNS3gwdE0YqJR7QOAwgoPOSgpkpb7/ArFlBqFV09ixe430meLUW6hbepj?= =?us-ascii?Q?+o8IL8BpWVHIJeFfK+2ULzqGVUi73NhskIr32Tt8kGaMXq0wgV5XKOXZ5aZd?= =?us-ascii?Q?pAE9pe0jdYBzvWuSD+t8EhLKYH8BLOi27KmgdXNP9RRcTKWYS+tyAFvLOr5z?= =?us-ascii?Q?S/Xn8Fkk5r4jtRTXzKl78iJKsC/w/b01QfcnA9BL8fgErhxiit03bKEgr9FO?= =?us-ascii?Q?qTa+giabAKUALE8v8M976RWSaF18j1cBpbwcApo63JVNgAdRhb5Lrl02vRw1?= =?us-ascii?Q?x8izNDts2vaG3OfgxEHw0Toaa6SHt2Se+Jy1MAFukwue6TwvneH+lWVut3P4?= =?us-ascii?Q?UU2Vs+NXm8pKp+MhzjxsGEVnLzUMGPW+DxrQPhKLMV+sYjRZXiMzLLEuFa5S?= =?us-ascii?Q?wm9cjnKaX6mT6ONJGNb9rViSYk0AANVH79dmUKocMnhLmeUv8SaMTqsc/Gy+?= =?us-ascii?Q?kq4wyNI014z6k1xbLHkvw5DSsr0hGHwN?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1544;3:2sb04DIe7wY/egOgRTFvcDvpyG+qdc5vEmPX842MZ2vXB1rx5lfpYU9PR8rkIkJRowbsQ7O/lbaZuSiW8obdlAoJ+F5XFj2X7YwjInSJ0BNKjoEg2OJgo9E5E6op3h0LxjaqISY/7lwBFEwRfrIqGg==;10:AZH8rsxYx9ukaWOaFR+4mQOVqJwJ2EXtkpmOj1GlRPISlguVrozmd9vz8AWxsMm1JQ3ReeWbOBYcEDbhDRYgNEK5vzlE/98yL9dRDT4jl3w=;6:kAcbY8muEy00CJWX8IHLOBowjZ5TwkfHK5SBLaaZ+IAKPA340KFxM799Pn2rdl3Q X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2015 02:41:34.9440 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB1544 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 26131 Lines: 822 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 --- Changes for v2: - move code to driver/soc Changes for v3: - change drivers/soc/qe to drivers/soc/fsl-qe Changes for v4: - move drivers/soc/fsl-qe to drivers/soc/fsl/qe - move head files for qe from include/linux/fsl to include/soc/fsl - move qe_ic.c to drivers/irqchip/ Changes for v5: - update MAINTAINERS MAINTAINERS | 5 +++-- arch/powerpc/platforms/83xx/km83xx.c | 4 ++-- arch/powerpc/platforms/83xx/misc.c | 2 +- arch/powerpc/platforms/83xx/mpc832x_mds.c | 4 ++-- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 4 ++-- arch/powerpc/platforms/83xx/mpc836x_mds.c | 4 ++-- arch/powerpc/platforms/83xx/mpc836x_rdk.c | 4 ++-- arch/powerpc/platforms/85xx/common.c | 2 +- arch/powerpc/platforms/85xx/corenet_generic.c | 2 +- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 4 ++-- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 4 ++-- arch/powerpc/platforms/85xx/twr_p102x.c | 4 ++-- arch/powerpc/platforms/Kconfig | 19 ------------------ arch/powerpc/sysdev/qe_lib/Kconfig | 23 ++++++---------------- arch/powerpc/sysdev/qe_lib/Makefile | 10 +++------- arch/powerpc/sysdev/qe_lib/gpio.c | 2 +- arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +- arch/powerpc/sysdev/qe_lib/usb.c | 4 ++-- drivers/irqchip/Makefile | 1 + .../sysdev/qe_lib => drivers/irqchip}/qe_ic.c | 2 +- .../sysdev/qe_lib => drivers/irqchip}/qe_ic.h | 2 +- drivers/net/ethernet/freescale/fsl_pq_mdio.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 8 ++++---- drivers/net/ethernet/freescale/ucc_geth.h | 8 ++++---- drivers/soc/Kconfig | 2 ++ drivers/soc/Makefile | 1 + drivers/soc/fsl/Makefile | 5 +++++ .../sysdev/qe_lib => drivers/soc/fsl/qe}/Kconfig | 16 +++++++++------ drivers/soc/fsl/qe/Makefile | 8 ++++++++ .../sysdev/qe_lib => drivers/soc/fsl/qe}/qe.c | 4 ++-- .../sysdev/qe_lib => drivers/soc/fsl/qe}/ucc.c | 6 +++--- .../qe_lib => drivers/soc/fsl/qe}/ucc_fast.c | 8 ++++---- .../qe_lib => drivers/soc/fsl/qe}/ucc_slow.c | 8 ++++---- drivers/spi/spi-fsl-cpm.c | 2 +- drivers/tty/serial/ucc_uart.c | 2 +- drivers/usb/gadget/fsl_qe_udc.c | 2 +- drivers/usb/host/fhci-hcd.c | 2 +- drivers/usb/host/fhci-hub.c | 2 +- drivers/usb/host/fhci-sched.c | 2 +- drivers/usb/host/fhci.h | 4 ++-- .../include/asm => include/linux/fsl}/qe_ic.h | 0 .../include/asm => include/soc/fsl}/immap_qe.h | 0 {arch/powerpc/include/asm => include/soc/fsl}/qe.h | 2 +- .../powerpc/include/asm => include/soc/fsl}/ucc.h | 4 ++-- .../include/asm => include/soc/fsl}/ucc_fast.h | 6 +++--- .../include/asm => include/soc/fsl}/ucc_slow.h | 6 +++--- 46 files changed, 103 insertions(+), 115 deletions(-) rename {arch/powerpc/sysdev/qe_lib => drivers/irqchip}/qe_ic.c (99%) rename {arch/powerpc/sysdev/qe_lib => drivers/irqchip}/qe_ic.h (98%) create mode 100644 drivers/soc/fsl/Makefile copy {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/Kconfig (50%) create mode 100644 drivers/soc/fsl/qe/Makefile rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/qe.c (99%) rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/ucc.c (98%) rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/ucc_fast.c (99%) rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/ucc_slow.c (98%) rename {arch/powerpc/include/asm => include/linux/fsl}/qe_ic.h (100%) rename {arch/powerpc/include/asm => include/soc/fsl}/immap_qe.h (100%) rename {arch/powerpc/include/asm => include/soc/fsl}/qe.h (99%) rename {arch/powerpc/include/asm => include/soc/fsl}/ucc.h (96%) rename {arch/powerpc/include/asm => include/soc/fsl}/ucc_fast.h (98%) rename {arch/powerpc/include/asm => include/soc/fsl}/ucc_slow.h (99%) diff --git a/MAINTAINERS b/MAINTAINERS index c43ea88..84b234b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3743,8 +3743,9 @@ F: include/linux/fs_enet_pd.h FREESCALE QUICC ENGINE LIBRARY L: linuxppc-dev@lists.ozlabs.org S: Orphan -F: arch/powerpc/sysdev/qe_lib/ -F: arch/powerpc/include/asm/*qe.h +F: drivers/soc/fsl/qe/ +F: include/soc/fsl/*qe*.h +F: include/soc/fsl/*ucc*.h FREESCALE USB PERIPHERAL DRIVERS M: Li Yang diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c index bf4c447..11c386bb2 100644 --- a/arch/powerpc/platforms/83xx/km83xx.c +++ b/arch/powerpc/platforms/83xx/km83xx.c @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include "mpc83xx.h" diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c index 125336f..3e2e6d2 100644 --- a/arch/powerpc/platforms/83xx/misc.c +++ b/arch/powerpc/platforms/83xx/misc.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index 8d76220..dfa4ba4 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include "mpc83xx.h" diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index eff5baa..c5b80c7 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c index 1a26d2f..fba4cd3 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c @@ -44,8 +44,8 @@ #include #include #include -#include -#include +#include +#include #include "mpc83xx.h" diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c index b63b42d..2512364 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_rdk.c +++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/arch/powerpc/platforms/85xx/common.c b/arch/powerpc/platforms/85xx/common.c index b564b5e..c3f5089 100644 --- a/arch/powerpc/platforms/85xx/common.c +++ b/arch/powerpc/platforms/85xx/common.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include "mpc85xx.h" diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index e56b89a..5e2acb9 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index a392e94..0a41795 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -47,8 +47,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index e358bed..13595cc 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c index 1eadb6d..a4ac222 100644 --- a/arch/powerpc/platforms/85xx/twr_p102x.c +++ b/arch/powerpc/platforms/85xx/twr_p102x.c @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 391b3f6..ae8879c 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -277,25 +277,6 @@ config TAU_AVERAGE If in doubt, say N here. -config QUICC_ENGINE - bool "Freescale QUICC Engine (QE) Support" - depends on FSL_SOC && PPC32 - select PPC_LIB_RHEAP - select CRC32 - help - The QUICC Engine (QE) is a new generation of communications - coprocessors on Freescale embedded CPUs (akin to CPM in older chips). - Selecting this option means that you wish to build a kernel - for a machine with a QE coprocessor. - -config QE_GPIO - bool "QE GPIO support" - depends on QUICC_ENGINE - select ARCH_REQUIRE_GPIOLIB - help - Say Y here if you're going to use hardware that connects to the - QE GPIOs. - config CPM2 bool "Enable support for the CPM2 (Communications Processor Module)" depends on (FSL_SOC_BOOKE && PPC32) || 8260 diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig index 3c25199..c170805 100644 --- a/arch/powerpc/sysdev/qe_lib/Kconfig +++ b/arch/powerpc/sysdev/qe_lib/Kconfig @@ -1,24 +1,13 @@ # # QE Communication options # - -config UCC_SLOW - bool - default y if SERIAL_QE +config QE_GPIO + bool "QE GPIO support" + depends on QUICC_ENGINE + select ARCH_REQUIRE_GPIOLIB help - This option provides qe_lib support to UCC slow - protocols: UART, BISYNC, QMC - -config UCC_FAST - bool - default y if UCC_GETH - help - This option provides qe_lib support to UCC fast - protocols: HDLC, Ethernet, ATM, transparent - -config UCC - bool - default y if UCC_FAST || UCC_SLOW + Say Y here if you're going to use hardware that connects to the + QE GPIOs. config QE_USB bool diff --git a/arch/powerpc/sysdev/qe_lib/Makefile b/arch/powerpc/sysdev/qe_lib/Makefile index f1855c1..2f8630b 100644 --- a/arch/powerpc/sysdev/qe_lib/Makefile +++ b/arch/powerpc/sysdev/qe_lib/Makefile @@ -1,10 +1,6 @@ # # Makefile for the linux ppc-specific parts of QE # -obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_ic.o qe_io.o - -obj-$(CONFIG_UCC) += ucc.o -obj-$(CONFIG_UCC_SLOW) += ucc_slow.o -obj-$(CONFIG_UCC_FAST) += ucc_fast.o -obj-$(CONFIG_QE_USB) += usb.o -obj-$(CONFIG_QE_GPIO) += gpio.o +obj-$(CONFIG_QUICC_ENGINE) += qe_io.o +obj-$(CONFIG_QE_USB) += usb.o +obj-$(CONFIG_QE_GPIO) += gpio.o diff --git a/arch/powerpc/sysdev/qe_lib/gpio.c b/arch/powerpc/sysdev/qe_lib/gpio.c index 521e67a..35f90ea 100644 --- a/arch/powerpc/sysdev/qe_lib/gpio.c +++ b/arch/powerpc/sysdev/qe_lib/gpio.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include struct qe_gpio_chip { struct of_mm_gpio_chip mm_gc; diff --git a/arch/powerpc/sysdev/qe_lib/qe_io.c b/arch/powerpc/sysdev/qe_lib/qe_io.c index d099941..54a44e8 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_io.c +++ b/arch/powerpc/sysdev/qe_lib/qe_io.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/arch/powerpc/sysdev/qe_lib/usb.c b/arch/powerpc/sysdev/qe_lib/usb.c index 27f23bd..f71e4d1 100644 --- a/arch/powerpc/sysdev/qe_lib/usb.c +++ b/arch/powerpc/sysdev/qe_lib/usb.c @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include int qe_usb_clock_set(enum qe_clock clk, int rate) { diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 62a13e5..b887856 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -30,3 +30,4 @@ obj-$(CONFIG_XTENSA) += irq-xtensa-pic.o obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o obj-$(CONFIG_BRCMSTB_L2_IRQ) += irq-brcmstb-l2.o +obj-$(CONFIG_QUICC_ENGINE) += qe_ic.o diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/drivers/irqchip/qe_ic.c similarity index 99% rename from arch/powerpc/sysdev/qe_lib/qe_ic.c rename to drivers/irqchip/qe_ic.c index b2b87c3..eb4d160 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c +++ b/drivers/irqchip/qe_ic.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "qe_ic.h" diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.h b/drivers/irqchip/qe_ic.h similarity index 98% rename from arch/powerpc/sysdev/qe_lib/qe_ic.h rename to drivers/irqchip/qe_ic.h index efef7ab..5c4480e 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.h +++ b/drivers/irqchip/qe_ic.h @@ -16,7 +16,7 @@ #ifndef _POWERPC_SYSDEV_QE_IC_H #define _POWERPC_SYSDEV_QE_IC_H -#include +#include #define NR_QE_IC_INTS 64 diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c index 583e71a..77448fd 100644 --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c @@ -28,7 +28,7 @@ #include #include -#include /* for ucc_set_qe_mux_mii_mng() */ +#include /* for ucc_set_qe_mux_mii_mng() */ #include "gianfar.h" diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c index fab39e2..28874dc 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c @@ -40,10 +40,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "ucc_geth.h" diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h index 75f3371..012fdcf 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.h +++ b/drivers/net/ethernet/freescale/ucc_geth.h @@ -22,11 +22,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include #define DRV_DESC "QE UCC Gigabit Ethernet Controller" #define DRV_NAME "ucc_geth" diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig index c854385..324d75c 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -2,4 +2,6 @@ menu "SOC (System On Chip) specific Drivers" source "drivers/soc/qcom/Kconfig" +source "drivers/soc/fsl/qe/Kconfig" + endmenu diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 0f7c447..b85c368 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -3,3 +3,4 @@ # obj-$(CONFIG_ARCH_QCOM) += qcom/ +obj-y += fsl/ diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile new file mode 100644 index 0000000..170fe81 --- /dev/null +++ b/drivers/soc/fsl/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Linux Kernel SOC fsl specific device drivers. +# + +obj-$(CONFIG_QUICC_ENGINE) += qe/ diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/drivers/soc/fsl/qe/Kconfig similarity index 50% copy from arch/powerpc/sysdev/qe_lib/Kconfig copy to drivers/soc/fsl/qe/Kconfig index 3c25199..e6b8862 100644 --- a/arch/powerpc/sysdev/qe_lib/Kconfig +++ b/drivers/soc/fsl/qe/Kconfig @@ -1,6 +1,16 @@ # # QE Communication options # +config QUICC_ENGINE + bool "Freescale QUICC Engine (QE) Support" + depends on FSL_SOC && PPC32 + select PPC_LIB_RHEAP + select CRC32 + help + The QUICC Engine (QE) is a new generation of communications + coprocessors on Freescale embedded CPUs (akin to CPM in older chips). + Selecting this option means that you wish to build a kernel + for a machine with a QE coprocessor. config UCC_SLOW bool @@ -19,9 +29,3 @@ config UCC_FAST config UCC bool default y if UCC_FAST || UCC_SLOW - -config QE_USB - bool - default y if USB_FSL_QE - help - QE USB Controller support diff --git a/drivers/soc/fsl/qe/Makefile b/drivers/soc/fsl/qe/Makefile new file mode 100644 index 0000000..703793f --- /dev/null +++ b/drivers/soc/fsl/qe/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for the linux ppc-specific parts of QE +# +obj-$(CONFIG_QUICC_ENGINE) += qe.o + +obj-$(CONFIG_UCC) += ucc.o +obj-$(CONFIG_UCC_SLOW) += ucc_slow.o +obj-$(CONFIG_UCC_FAST) += ucc_fast.o diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/drivers/soc/fsl/qe/qe.c similarity index 99% rename from arch/powerpc/sysdev/qe_lib/qe.c rename to drivers/soc/fsl/qe/qe.c index 238a07b..2c56958 100644 --- a/arch/powerpc/sysdev/qe_lib/qe.c +++ b/drivers/soc/fsl/qe/qe.c @@ -32,10 +32,10 @@ #include #include #include -#include -#include #include #include +#include +#include static void qe_snums_init(void); static int qe_sdma_init(void); diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/drivers/soc/fsl/qe/ucc.c similarity index 98% rename from arch/powerpc/sysdev/qe_lib/ucc.c rename to drivers/soc/fsl/qe/ucc.c index 621575b..f444c95 100644 --- a/arch/powerpc/sysdev/qe_lib/ucc.c +++ b/drivers/soc/fsl/qe/ucc.c @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include int ucc_set_qe_mux_mii_mng(unsigned int ucc_num) { diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/drivers/soc/fsl/qe/ucc_fast.c similarity index 99% rename from arch/powerpc/sysdev/qe_lib/ucc_fast.c rename to drivers/soc/fsl/qe/ucc_fast.c index 65aaf15..5b2e9b5e 100644 --- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c +++ b/drivers/soc/fsl/qe/ucc_fast.c @@ -21,11 +21,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include void ucc_fast_dump_regs(struct ucc_fast_private * uccf) { diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c b/drivers/soc/fsl/qe/ucc_slow.c similarity index 98% rename from arch/powerpc/sysdev/qe_lib/ucc_slow.c rename to drivers/soc/fsl/qe/ucc_slow.c index befaf11..b42c5dd 100644 --- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c +++ b/drivers/soc/fsl/qe/ucc_slow.c @@ -21,11 +21,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include u32 ucc_slow_get_qe_cr_subblock(int uccs_num) { diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c index 54b0637..77524c4 100644 --- a/drivers/spi/spi-fsl-cpm.c +++ b/drivers/spi/spi-fsl-cpm.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "spi-fsl-lib.h" #include "spi-fsl-cpm.h" diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index d569ca5..a8d528b 100644 --- a/drivers/tty/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c index ad54833..9b0477b 100644 --- a/drivers/usb/gadget/fsl_qe_udc.c +++ b/drivers/usb/gadget/fsl_qe_udc.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 1cf68ea..7a63726 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "fhci.h" diff --git a/drivers/usb/host/fhci-hub.c b/drivers/usb/host/fhci-hub.c index 6af2512..c6e91fc 100644 --- a/drivers/usb/host/fhci-hub.c +++ b/drivers/usb/host/fhci-hub.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "fhci.h" /* virtual root hub specific descriptor */ diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c index 95ca598..acf4d44 100644 --- a/drivers/usb/host/fhci-sched.c +++ b/drivers/usb/host/fhci-sched.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "fhci.h" diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h index 154e6a0..7492270 100644 --- a/drivers/usb/host/fhci.h +++ b/drivers/usb/host/fhci.h @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #define USB_CLOCK 48000000 diff --git a/arch/powerpc/include/asm/qe_ic.h b/include/linux/fsl/qe_ic.h similarity index 100% rename from arch/powerpc/include/asm/qe_ic.h rename to include/linux/fsl/qe_ic.h diff --git a/arch/powerpc/include/asm/immap_qe.h b/include/soc/fsl/immap_qe.h similarity index 100% rename from arch/powerpc/include/asm/immap_qe.h rename to include/soc/fsl/immap_qe.h diff --git a/arch/powerpc/include/asm/qe.h b/include/soc/fsl/qe.h similarity index 99% rename from arch/powerpc/include/asm/qe.h rename to include/soc/fsl/qe.h index 32b9bfa..5b54099 100644 --- a/arch/powerpc/include/asm/qe.h +++ b/include/soc/fsl/qe.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #define QE_NUM_OF_SNUM 256 /* There are 256 serial number in QE */ #define QE_NUM_OF_BRGS 16 diff --git a/arch/powerpc/include/asm/ucc.h b/include/soc/fsl/ucc.h similarity index 96% rename from arch/powerpc/include/asm/ucc.h rename to include/soc/fsl/ucc.h index 6927ac2..cdb2345 100644 --- a/arch/powerpc/include/asm/ucc.h +++ b/include/soc/fsl/ucc.h @@ -15,8 +15,8 @@ #ifndef __UCC_H__ #define __UCC_H__ -#include -#include +#include +#include #define STATISTICS diff --git a/arch/powerpc/include/asm/ucc_fast.h b/include/soc/fsl/ucc_fast.h similarity index 98% rename from arch/powerpc/include/asm/ucc_fast.h rename to include/soc/fsl/ucc_fast.h index 72ea9ba..e8dd1f5 100644 --- a/arch/powerpc/include/asm/ucc_fast.h +++ b/include/soc/fsl/ucc_fast.h @@ -16,10 +16,10 @@ #include -#include -#include +#include +#include -#include +#include /* Receive BD's status */ #define R_E 0x80000000 /* buffer empty */ diff --git a/arch/powerpc/include/asm/ucc_slow.h b/include/soc/fsl/ucc_slow.h similarity index 99% rename from arch/powerpc/include/asm/ucc_slow.h rename to include/soc/fsl/ucc_slow.h index c44131e..057f861 100644 --- a/arch/powerpc/include/asm/ucc_slow.h +++ b/include/soc/fsl/ucc_slow.h @@ -17,10 +17,10 @@ #include -#include -#include +#include +#include -#include +#include /* transmit BD's status */ #define T_R 0x80000000 /* ready bit */ -- 2.1.0.27.g96db324 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/