From patchwork Mon Aug 31 08:58:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Qiang X-Patchwork-Id: 512394 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3853114018C for ; Mon, 31 Aug 2015 19:09:37 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 1BB621A2ADC for ; Mon, 31 Aug 2015 19:09:37 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0116.outbound.protection.outlook.com [157.56.111.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 25BE81A0A2C for ; Mon, 31 Aug 2015 19:04:37 +1000 (AEST) Received: from CO2PR03CA0049.namprd03.prod.outlook.com (10.141.194.176) by CY1PR0301MB0779.namprd03.prod.outlook.com (10.160.160.14) with Microsoft SMTP Server (TLS) id 15.1.256.15; Mon, 31 Aug 2015 09:04:30 +0000 Received: from BL2FFO11FD049.protection.gbl (2a01:111:f400:7c09::197) by CO2PR03CA0049.outlook.office365.com (2a01:111:e400:1414::48) with Microsoft SMTP Server (TLS) id 15.1.262.13 via Frontend Transport; Mon, 31 Aug 2015 09:04:29 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD049.mail.protection.outlook.com (10.173.161.211) with Microsoft SMTP Server (TLS) id 15.1.256.10 via Frontend Transport; Mon, 31 Aug 2015 09:04:29 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t7V94E0B009056; Mon, 31 Aug 2015 02:04:26 -0700 From: Zhao Qiang To: Subject: [PATCH V7 3/3] QE: Move QE from arch/powerpc to drivers/soc Date: Mon, 31 Aug 2015 16:58:40 +0800 Message-ID: <1441011520-15424-3-git-send-email-qiang.zhao@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1441011520-15424-1-git-send-email-qiang.zhao@freescale.com> References: <1441011520-15424-1-git-send-email-qiang.zhao@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD049; 1:JGJqK/IjDyL3BDkwPLhFLege1JBuDT7NFCtDRNs4x+Ry8B8Vu8BV5d3Of4tviOuUXx/55eZj4o0m5zRxnAg3DBBA6rmOmCUtMDWId2s1tDJVfYy1Hvkd/qwtUGafB7MV0G7OZf+mrqWIe9qeG9Rcf3ZnatdBw51XLe6EVGwEPe8Srb3SmLFXax8dgrRqaPlH9eKGbekgC26qUJoNEdpTGYXgiSdet0GRVdNiq3twujjpy2UuxNxMcirsGI6iU519L+U8Zhna8m0x58aDEtXJNicc3KhDSelM16kRX7eKmoJNvD69JNmT6y+J7EQ7GcBQpFyyPp1xqkJQHP48s5LcuamfpJ6g6UonUee0MegPM2KNMqENFnR9wkKgBdn+h/vgX79N5nV24/RmysqxMnFabQ== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(3050300001)(339900001)(189002)(40224003)(199003)(77096005)(86362001)(575784001)(69596002)(47776003)(5001860100001)(64706001)(92566002)(19580405001)(48376002)(6806004)(36756003)(104016003)(5003940100001)(68736005)(2371004)(4001450100002)(19580395003)(50466002)(46102003)(2950100001)(33646002)(77156002)(81156007)(62966003)(50226001)(5007970100001)(2351001)(76176999)(87936001)(105606002)(106466001)(110136002)(229853001)(5001830100001)(5001960100002)(50986999)(4001540100001)(107886002)(97736004)(85426001)(189998001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB0779; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0779; 2:Xp3iLfwjWS1AyOdWaOEiKYsaL5eCAfo8V0gMfLcJOFIiGDzFDNH8rIoDtFRnJUwUQGImjxeYvMS+WnG98Z7Kcw7TNjs3scf+HRFbraFXu+aZOdwMnAXTlR/bKVuzdVhwZTMiFZ0YArhd1CryrjBPku1C0J9ewf93XUwbNYz+EoE=; 3:4z+/sRWRFRjl69hWge8CPAe3DypXbSndrKhr95BMkVb4esM0czMlJ/N/3EAazTrfKmsGxV3EeGzxgCcrmBGFsNtum6XysSErwm/MW10rg64zF2AQjS3O4SkC1S53iBLAcTIkDBk2dNBauXKPfGkgzARG6xrapT8TBdGZ61zAatr/nlyzx0PKQg0+dfsVyAIKEh8OlFSWvS2spHj1vdjkV735YCFu3x/tCbxTjbJ7/XI=; 25:t/Eg/DHufyBviC6gDocyLjLxEqYoxFyYKC98WVtMh9VigoMGmtQoD7rxbl/oQzOcITuJcxmXhh1f4MHMu4gbVljJxDb1PsRyMj55N8ybJ6JvZurmZGrqykT0GbDPfN52gHRn+lhWehhzXk3HmR0kKWfI9XBFS5Ovg3BxGwC1nJXtZ/nilz4j2JtVwPBTI/5GrPWsLrGgza+ShtORfM5p8WMfcwblpslVSwhvrubL1RqfT1RK0xXpUMKBoh5vi8T3Sgy/nZhScTIm9Qp6zqxW0A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0779; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0779; 20:hol+CP3wqX8LyiDIpguCex5tkFK3xsgtcHQ/k1oDeZGCpNKq/WISuycgF4SkcEfcuXMRaeG7EHVpGxGzRlPn6j3b/SmyKORB1QMVWqjUwqaVCL4HOd/Q4joCEvDcRcQHDFTHQcNn66z5qftKjuu7hwXTu8F9EL8dxo30AYbH9/vbazL4Zld2DReg/RDj5oNNMq4ix7V53dVHAE1YrFqoHT1Zpsr3DuWb+JXGQHBINUVoPCAz5+dq6c0t9sZMeIvt/P1kJzH+jW+OX2fg+6aEdPgFAbczC601TA/+38vcNTcHwu7DVHSsKR41iynmd+gFzDeG9xJ4yR5Sq5JYXVqqTrPqhVAy0gXO5+d5g7afFO8=; 4:m0fzlvJPXPDhdpT2u4TFtG7+Vu/nTTe5c4VyV8KPPN5hnBkkOHFW/kJPeXGKMGTW500MwVH7wWN47GhNtpuY/dR2HWQUZXHUhwr+xJSN//nEqxsnVW3vtVv9p/djLzaISTX4KFBlsHY1ZGA2Asr9t+lSkU05Uc693pfngOpd2MW6tyAbHHZyrK/6HpIS5zyW3FNfMq7u215EiFeZ+eh5V+P12oXAOWWYlNtvXKXxfdoPy8iPs8cUzsDs1Y7hOXByzIZpdqA2u6VN/+wdbdpXo6dMXJDgeZS6jJG6ffkszPDS1AU7Z2HD4j1D5HqCpGQgPmvhkOAdRpMMC3SFKZdOvg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:CY1PR0301MB0779; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB0779; X-Forefront-PRVS: 0685122203 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0779; 23:AFfvoU8FnPnrdue657EUVk6SLuIaPKUMLBLfJzp?= =?us-ascii?Q?xnxSBIkSUabXl8yf/WuKZ9KRUtZjQpN/FC8dUCjxyGFv6N3Yp2bBSzOnKEXJ?= =?us-ascii?Q?Wz/HX58/+esd7Mk1JwKhdngFyILTJ6Zsl53aCtardtJ0tod6ar1W9nnlTdVv?= =?us-ascii?Q?hcozK4+6bIZGJtWTPb2iJUJzJV1KeAk9YR0vkLzVWGqOuXSFT5XTuBAmp1Dm?= =?us-ascii?Q?mv3e9g7Pek8o7wN0Fe52d7aAwIkvhXjpiH9K68puwuHv+ePVh2r9DJaofyRm?= =?us-ascii?Q?XO1e2AQkMR1/ayE20W9FcaXm6YtE49kACi1xngWndIMlU1cHspdIQJZfs/Gx?= =?us-ascii?Q?iU6zcixyAw5MtaPMpm2K4rE8M8x3tdEicRZyZYGE7w880lPhMK8QL2xKrmCM?= =?us-ascii?Q?IrFnXIvgBqIHkCHIiCeIFXr6Q01QFNsGemuZhD1bjLqPvcUtg0hXES2N5AfQ?= =?us-ascii?Q?bbLjJsd9kF4PBvx452iLkEGq/pjs6SawjV0Pgss+k7dGFL4d9AX+Jx3EIbml?= =?us-ascii?Q?+HfP0w3Nk3cFCyH08ixIRw+xqLDY/kexyTzpJ3HGp4mybvQ+LjL0JOeNSoW2?= =?us-ascii?Q?H9mFX9VoefpmjpzH0qG+cKxeOhbMDFlSjD6ev2x5KFpjce4L8jNuNab6izz9?= =?us-ascii?Q?q3s+KoOcNWIyhgeOceyBeOgmsPAkgghACln3gpPBacFAPW44Myw3hN3QdkXH?= =?us-ascii?Q?nqh0eY7Zi8ay5wesOdBSOEGGAfGujwYM3SnXXsJVeyILJuyjJImHJFktQXQn?= =?us-ascii?Q?izx5m5zDEdDY/tgCx2wfFbbaznHJX90M8fl8Id9JY8JjqgafsF4nq+s0f3CM?= =?us-ascii?Q?XJpbmi2oVs6A/okt+HcPhvhSFQUTMBu9y8Ua7ssgAF6SQFQCD4wlG39CyLxb?= =?us-ascii?Q?ydeBOIo4slgkcreBwiLDiMibl5+6uuKKgrMR2u5COlad1xRvE5acNcsUnJ/B?= =?us-ascii?Q?oCtwh2bl/uHrQDoqcb+EMo+Ksg274K1v+VGVDTAY7AljFFisZAOaYwiRvjTp?= =?us-ascii?Q?7WqR9f99TNwYMQ5itR8xjnVioOgULnHcO8HAUdDgeAfEQRyzLw7P6KZ6DFGw?= =?us-ascii?Q?3scBLwkA0CiKFP+1x74zXEGiOnuqWyZc4c2/P3iee4nWeh+m/Rnlm0MYQPPX?= =?us-ascii?Q?Sq2PgkaTgE3jY0J5Hw5xiBQWstIvlX0m3T8r3YtPRwBRKNu27j2Ewsl1BXop?= =?us-ascii?Q?NJME7HU8XdNrFJhf5fZhQec4X3rETY6Yc1xui2Am8dAo5qp+ObulAb+eOwa0?= =?us-ascii?Q?g/5Xxg39pYhxC2U1TNUO/tAV7SzHiYJIEywhCVt4p9Z1rvVa8cq4dptWfEFY?= =?us-ascii?Q?cCipP84/QV0whTWs8mwx3a+EIraenYjDqUyO5whax68KZ?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0779; 5:RVa0rz4ZbHTOVX6SE6H7dnBLQrlO3pZzAswG0ggKCdqZH0bPtCuJweKAyKcuAXibUcPMPQQ2f3COAESF0ZRUC1by0SUyZ3/G+0g7BWMgldHYywpLO1yFSZAuxA1NUWul4/8dtqonzX/gyZavygLkxw==; 24:3WvvJAKcJGJEBavJ0lwSG/7m3uFZ+lFJYl6GXrJPdWJhNu22kc4zLUY5/wPtQdk+Dy4bU5HfjuRFybMGy68AoOwLD8pbwgrQvp6jXvlCnUg=; 20:x2JZKE8k/3NrgDoxo42cjUMBCCpIbim7DO2FNHcV04ihHe56TupBLcX+4/06bX2TH3b9uGiNKeKOGJPXD9VF3g== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2015 09:04:29.5896 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0779 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhao Qiang , lauraa@codeaurora.org, linux-kernel@vger.kernel.org, paulus@samba.org, linuxppc-dev@lists.ozlabs.org, X.xie@freescale.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 --- hanges 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 Changes for v6: - rebase Changes for v7: - move this patch from 2/3 to 3/3 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 | 20 ------------- arch/powerpc/sysdev/cpm_common.c | 2 +- arch/powerpc/sysdev/qe_lib/Kconfig | 22 ++++----------- arch/powerpc/sysdev/qe_lib/Makefile | 6 +--- 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 | 4 +-- 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 | 1 + drivers/soc/Makefile | 1 + drivers/soc/fsl/Makefile | 5 ++++ drivers/soc/fsl/qe/Kconfig | 33 ++++++++++++++++++++++ drivers/soc/fsl/qe/Makefile | 9 ++++++ .../sysdev/qe_lib => drivers/soc/fsl/qe}/qe.c | 4 +-- .../qe_lib => drivers/soc/fsl/qe}/qe_common.c | 2 +- .../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/udc/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}/qe_ic.h | 0 .../include/asm => include/soc/fsl/qe}/immap_qe.h | 0 .../include/asm => include/soc/fsl/qe}/qe.h | 2 +- .../include/asm => include/soc/fsl/qe}/ucc.h | 4 +-- .../include/asm => include/soc/fsl/qe}/ucc_fast.h | 6 ++-- .../include/asm => include/soc/fsl/qe}/ucc_slow.h | 6 ++-- 48 files changed, 127 insertions(+), 110 deletions(-) rename {arch/powerpc/sysdev/qe_lib => drivers/irqchip}/qe_ic.c (99%) rename {arch/powerpc/sysdev/qe_lib => drivers/irqchip}/qe_ic.h (97%) create mode 100644 drivers/soc/fsl/Makefile create mode 100644 drivers/soc/fsl/qe/Kconfig 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}/qe_common.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 (98%) rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/ucc_slow.c (98%) rename {arch/powerpc/include/asm => include/linux/fsl/qe}/qe_ic.h (100%) rename {arch/powerpc/include/asm => include/soc/fsl/qe}/immap_qe.h (100%) rename {arch/powerpc/include/asm => include/soc/fsl/qe}/qe.h (99%) rename {arch/powerpc/include/asm => include/soc/fsl/qe}/ucc.h (96%) rename {arch/powerpc/include/asm => include/soc/fsl/qe}/ucc_fast.h (98%) rename {arch/powerpc/include/asm => include/soc/fsl/qe}/ucc_slow.h (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 562ae4e..c688e61 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4155,8 +4155,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 ae111581..7ecd758 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 ef9d01a..eacf34b 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 aacc43f..20dce79 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 0c7a43e..2e6a6a4 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 eb24abd..b1b8ab8 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 823e370..9a5a00d 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 0f91edc..d81ea0c 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 bd839dc..1ecbf7f 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..ea4d4f3 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..0c5e313 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 30e002f..a47654e 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 01f98a2..c9541a5 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -272,26 +272,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 GENERIC_ALLOCATOR - 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/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c index 328c3ec..eaee6f6 100644 --- a/arch/powerpc/sysdev/cpm_common.c +++ b/arch/powerpc/sysdev/cpm_common.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig index 3c25199..2f80075 100644 --- a/arch/powerpc/sysdev/qe_lib/Kconfig +++ b/arch/powerpc/sysdev/qe_lib/Kconfig @@ -1,24 +1,14 @@ # # QE Communication options # - -config UCC_SLOW - bool - default y if SERIAL_QE - help - This option provides qe_lib support to UCC slow - protocols: UART, BISYNC, QMC - -config UCC_FAST - bool - default y if UCC_GETH +config QE_GPIO + bool "QE GPIO support" + depends on QUICC_ENGINE + select ARCH_REQUIRE_GPIOLIB help - This option provides qe_lib support to UCC fast - protocols: HDLC, Ethernet, ATM, transparent + Say Y here if you're going to use hardware that connects to the + QE GPIOs. -config UCC - bool - default y if UCC_FAST || UCC_SLOW config QE_USB bool diff --git a/arch/powerpc/sysdev/qe_lib/Makefile b/arch/powerpc/sysdev/qe_lib/Makefile index 9507a27..1b123df 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_common.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_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..aa5c11ac 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 7ea0174..7ae59ab 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..111f7ab 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 dda4927..9ff5932 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -47,3 +47,4 @@ obj-$(CONFIG_KEYSTONE_IRQ) += irq-keystone.o obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.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 6512cd8..e31d95b 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c +++ b/drivers/irqchip/qe_ic.c @@ -27,7 +27,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 97% rename from arch/powerpc/sysdev/qe_lib/qe_ic.h rename to drivers/irqchip/qe_ic.h index efef7ab..9f15cc4 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.h +++ b/drivers/irqchip/qe_ic.h @@ -1,5 +1,5 @@ /* - * arch/powerpc/sysdev/qe_lib/qe_ic.h + * drivers/irqchip/qe_ic.h * * QUICC ENGINE Interrupt Controller Header * @@ -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 3c40f6b..21bdf55 100644 --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c @@ -29,7 +29,7 @@ #include #if IS_ENABLED(CONFIG_UCC_GETH) -#include /* for ucc_set_qe_mux_mii_mng() */ +#include #endif #include "gianfar.h" diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c index 4dd40e0..7d24664 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..5da19b4 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 d8bde82..676737a 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -1,5 +1,6 @@ menu "SOC (System On Chip) specific Drivers" +source "drivers/soc/fsl/qe/Kconfig" source "drivers/soc/mediatek/Kconfig" source "drivers/soc/qcom/Kconfig" source "drivers/soc/ti/Kconfig" diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 70042b2..0259e23 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -2,6 +2,7 @@ # Makefile for the Linux Kernel SOC specific device drivers. # +obj-y += fsl/ obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ obj-$(CONFIG_ARCH_QCOM) += qcom/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile new file mode 100644 index 0000000..7c7d045 --- /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/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig new file mode 100644 index 0000000..3012571 --- /dev/null +++ b/drivers/soc/fsl/qe/Kconfig @@ -0,0 +1,33 @@ +# +# QE Communication options +# + +config QUICC_ENGINE + bool "Freescale QUICC Engine (QE) Support" + depends on FSL_SOC && PPC32 + select PPC_LIB_RHEAP + select GENERIC_ALLOCATOR + 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 + default y if SERIAL_QE + 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 diff --git a/drivers/soc/fsl/qe/Makefile b/drivers/soc/fsl/qe/Makefile new file mode 100644 index 0000000..51c9dce --- /dev/null +++ b/drivers/soc/fsl/qe/Makefile @@ -0,0 +1,9 @@ +# +#Makefile for the Linux fsl parts of QE +# + + +obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_common.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 3f9f596..d8fd4cd 100644 --- a/arch/powerpc/sysdev/qe_lib/qe.c +++ b/drivers/soc/fsl/qe/qe.c @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/arch/powerpc/sysdev/qe_lib/qe_common.c b/drivers/soc/fsl/qe/qe_common.c similarity index 99% rename from arch/powerpc/sysdev/qe_lib/qe_common.c rename to drivers/soc/fsl/qe/qe_common.c index 55079b9..b3ca0cf 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_common.c +++ b/drivers/soc/fsl/qe/qe_common.c @@ -22,7 +22,7 @@ #include #include -#include +#include static struct gen_pool *muram_pool; static struct genpool_data_align muram_pool_data; 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..b59d335 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 98% rename from arch/powerpc/sysdev/qe_lib/ucc_fast.c rename to drivers/soc/fsl/qe/ucc_fast.c index 65aaf15..a768931 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 5f91628..9334bdb 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 9c46a30..bcb26bb 100644 --- a/drivers/spi/spi-fsl-cpm.c +++ b/drivers/spi/spi-fsl-cpm.c @@ -16,7 +16,7 @@ * option) any later version. */ #include -#include +#include #include #include #include diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index 7d2532b..0b2cccd 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/udc/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c index e0822f1..f44659e 100644 --- a/drivers/usb/gadget/udc/fsl_qe_udc.c +++ b/drivers/usb/gadget/udc/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 c6cebb9..0960f41 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 3bacdd7..60d55eb 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..a9609a3 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..3fc82c1 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/qe_ic.h similarity index 100% rename from arch/powerpc/include/asm/qe_ic.h rename to include/linux/fsl/qe/qe_ic.h diff --git a/arch/powerpc/include/asm/immap_qe.h b/include/soc/fsl/qe/immap_qe.h similarity index 100% rename from arch/powerpc/include/asm/immap_qe.h rename to include/soc/fsl/qe/immap_qe.h diff --git a/arch/powerpc/include/asm/qe.h b/include/soc/fsl/qe/qe.h similarity index 99% rename from arch/powerpc/include/asm/qe.h rename to include/soc/fsl/qe/qe.h index 35257c8..1496d33 100644 --- a/arch/powerpc/include/asm/qe.h +++ b/include/soc/fsl/qe/qe.h @@ -23,7 +23,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/qe/ucc.h similarity index 96% rename from arch/powerpc/include/asm/ucc.h rename to include/soc/fsl/qe/ucc.h index 6927ac2..894f14c 100644 --- a/arch/powerpc/include/asm/ucc.h +++ b/include/soc/fsl/qe/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/qe/ucc_fast.h similarity index 98% rename from arch/powerpc/include/asm/ucc_fast.h rename to include/soc/fsl/qe/ucc_fast.h index 72ea9ba..df8ea79 100644 --- a/arch/powerpc/include/asm/ucc_fast.h +++ b/include/soc/fsl/qe/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/qe/ucc_slow.h similarity index 99% rename from arch/powerpc/include/asm/ucc_slow.h rename to include/soc/fsl/qe/ucc_slow.h index 233ef5f..6c0573a 100644 --- a/arch/powerpc/include/asm/ucc_slow.h +++ b/include/soc/fsl/qe/ucc_slow.h @@ -17,10 +17,10 @@ #include -#include -#include +#include +#include -#include +#include /* transmit BD's status */ #define T_R 0x80000000 /* ready bit */