Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933950AbbHXJmj (ORCPT ); Mon, 24 Aug 2015 05:42:39 -0400 Received: from mail-bl2on0110.outbound.protection.outlook.com ([65.55.169.110]:36192 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933908AbbHXJmd (ORCPT ); Mon, 24 Aug 2015 05:42:33 -0400 X-Greylist: delayed 313 seconds by postgrey-1.27 at vger.kernel.org; Mon, 24 Aug 2015 05:42:32 EDT 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; From: Zhao Qiang To: CC: , , , , , , , Zhao Qiang Subject: [PATCH v6 2/3] QE: Move QE from arch/powerpc to drivers/soc Date: Mon, 24 Aug 2015 17:31:42 +0800 Message-ID: <1440408703-6113-2-git-send-email-qiang.zhao@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1440408703-6113-1-git-send-email-qiang.zhao@freescale.com> References: <1440408703-6113-1-git-send-email-qiang.zhao@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11OLC005;1:HmPS0wdcyqZ6fVmydTrdU78HAr31sKcNHwkd9jThbT+bH00otziceR3HO4iRbO29GJ7ZZI6gtqvKsQ5h8WoPNoQrgftgyN90eNuX9w5jVsoKHRXfglxv3BUgiIA18inancs9lA8PPABAijboOUY90xt1kLuYcQBAjvw7n8OVpB21uPCCk2lNM8BhH5sLR45gf0YX3PTA1uXUc53AAZmuc77xk/Fqoys8qu8MKIKatKHw2QWCEn0gpxYE/3Sp1jZX/K76eqbWl3DrAe/mgd1OU3It6B1EQW3E9f+J+4LChM/T8FWE5PsvIR9OdseMk+aM3gJLKV/7uUH3C5w18keCLsEqizEPirn5iMTuypjH4wGMTVmhuAfc/+tGXg996bKpqsmeYIbN1mvMxMsKGjwkVA== X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(3050300001)(339900001)(40224003)(199003)(189002)(64706001)(2351001)(5001860100001)(85426001)(4001540100001)(47776003)(5001960100002)(4001450100002)(48376002)(107886002)(50466002)(68736005)(189998001)(97736004)(110136002)(5001830100001)(36756003)(69596002)(50226001)(81156007)(92566002)(77096005)(106466001)(62966003)(76176999)(104016003)(19580405001)(105606002)(77156002)(46102003)(33646002)(86362001)(2950100001)(5003940100001)(6806004)(19580395003)(50986999)(5007970100001)(87936001)(2371004)(229853001)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR0301MB0773;H:az84smr01.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;BY2PR0301MB0773;2:yI5GNsPppGWSukRPxDlHAz/N6OARtiIT/ia3WPloVCyxswB3/fOjOStqwAgtsYcMPMCan4aMCAYHxENClQDesM8kk2tM1t8OaXO/uMpzv9e3mJSn9Hvbypzw/bK4ji7YAw28gJS5jBTajKuMMhGwLQRASOunXOdB/wZT7Qv6l7o=;3:02enpgalYdQgYMka+bXC3wxKcu62Q6umxmPre5OFYYyvwuAPHf2Q7z+oYBABwCh3KMgcrw6do1cMyj+I/kfdIAqgE+HOcnpPT0VQjug9ZLrJUA3WX7irIV3YpbwWCB97ucVK57Xdyi+eISAjYkzCMRiSjVQWSfEfVMnWz1z6A437U57BAZhmnXyapDrlT2EBXwbodUao7Iqi/UR8KUfTPzeEZTCbNfTLkQ6fTzNUKs0=;25:460vso6uAE77XliLgtEOS96ND3Ct6kztZ4gd77PM8LNgoezGfhEef0ivktXPD/3qUeOsGW3gTiG9SFCO3UEySr/kKwp/+DYmS0ueKwCiQptFZk1tq9nDVzW5R3vwBvBCKGpOXBdFSigILz4ujH5V24YKbAXtwDVI7KbgydtDL4l1PHFCfcTST0DpngCHjlLFBaH5jh/e97AabUEkEglAl9UZeamL0lUfElDMfJFMGDGeaPw0RkVJEQHsRY1Dl+pooUG/brazfzZHgHNc7lYelw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0773; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0773;20:0yfaviOAn5VgegqdiMZfd1PnEnbf0EB3hsFOaYdVFZOyjsgUKAEvnT6xFkawL7MurHpcOxocHhOO90qmHHJmXzc7LdMJc5fBWfdoWOMRDZyILvwreflXdxmYV/jwqAqtjHtD3mdJm8OTiqnRo/ZrG1kXAIcw4WgS+tKOwVWe9x1+JOdFVA9Cg1tVrHGkBueAqXwhFHkIlloIVipCztVAiy+9cxc0cAL3fGleGm9XKPK7EdsHb1G7W4PxzT8/OFjQIVkHiDq8XBBxAvRT4aA2XjLppcBPBlVbobw13egITmL152P5IinF/3zq/1fsRh0pYo4RQatTmMtT/w5kZeHBXIKyKKctcaFSYnbiO1CkZoA=;4:UO38TNxW6P3B0YGvdDN+jAUyqw94P/E7NNbDKMnnbZnl3vDSLylUz+p+rY99E3cRUz702ecTgVueetAI4EoZ2TdDsuE5zu6A1KF+yeLYQFgbMFDgLgGsLCs4UAwI1TKH9ULMCLG+PdX89z3+hN+5NJoG0b+F1rlfc37o/W1ZVh40y1Chx+anXXk9273/egGlqYgZEcWjc2dejdL+7sbxBlHoVJPJE/gkkn2Z1QTRsdqmn8MYty+nJ94BhCLsbR2PYnjtzo0Mn4gpnjhxEBW24cg+a9E2B45A9GqartjxRGlsNDTagermow9739z7iFyw 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:BY2PR0301MB0773;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0773; X-Forefront-PRVS: 06780E24F8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR0301MB0773;23:cBqN00nU8mC9y/j7g75NPy73XVShAvFdR+wmwe3?= =?us-ascii?Q?6K06RXTUuTH2DRMynbfox/qkXk7WFvPCsg2xuB/e/0Utx3U/YY9EKfnDxJ2N?= =?us-ascii?Q?vcHcxfEYpk2J1gfL0H1eUglcr9kJ6LAb3inW9Ixa5VfEso6HpOtfOd+zRqUg?= =?us-ascii?Q?tec+KC+zVY7pSV93+ztWJdUBZl33QyBhH8txb6U0NQ5NT3tJ6mtlZhxmJbKU?= =?us-ascii?Q?zodGsz+lF4rk+nNRY31HmFlOMWRC8R8LqDXhK3TgTLQrHhgvo17W/3niGYzC?= =?us-ascii?Q?mFsLhD1iPInnCqx+1+4j5dtMz1faLgqFEurdLNyM5hHcDDIdUNGK06rSgcEg?= =?us-ascii?Q?g/TRh1do4t6rEW1jKeueJJVQ3qC6UOmbolCBHMEuMG7TVC9UKl66Xi/qEoNp?= =?us-ascii?Q?JKqBJPQyIIPy8ViJN+yQ2naM3NcDlti8eWrkCVEUyMUj8VlsGPpzAoM1bJN0?= =?us-ascii?Q?6ApXXoaT+9WpuiC7yxikuIF6zFRsu+S9W/gt/Ttast8gzHV/KeOF0gT8Htbb?= =?us-ascii?Q?AlpHJPOlcjAwQKzOKp4+XPsY6dZmxKeo/SiHubqA8Ptr9I4FUI+bmg8v56Ab?= =?us-ascii?Q?ugV6N/E928iYXfcLF4Q228RgQ9x0e13LKdHcem4338Ne+BGaAC4nsbWNwenF?= =?us-ascii?Q?kLA68wv/wvBcLx7zKZYTtalm3nv0/9NJwmrWuBaMBcuNG5KWcEZPWR6X31Xm?= =?us-ascii?Q?qW+MJPyOmPCC+osAnPad3rzAd2fPfzA0CS8tu+WB9spppn6CvWfc3+QT7T/p?= =?us-ascii?Q?oY2V+aps3Nwgs+xWcaHmOqt9eKyU7X3hGscM+9nK+VcRn90LO8jmOBtMA4gD?= =?us-ascii?Q?U+hnwl/KBV1TU9ogmKIdXBYd4eryLM9PnbjN8jYmT9L078JnwnfXrt1TI7Ng?= =?us-ascii?Q?M0G88+3Ct16q7Bz0DKBxw+xwXbam65gDSXs/tVYEA+08ndgjyfMyDMa/44lB?= =?us-ascii?Q?ckiJ/qHeOxoag0vMn9kb+kg9ALFAh3wS/HxIGmI0BNM29+wGqL5AhCgQ45QT?= =?us-ascii?Q?uCSOCoZgiLD8QxqfWAqeZKxT4+L4n4fDW8MtUsskh7RuculwaNnQqmBk61TR?= =?us-ascii?Q?X9tC3ljCc9wY5sCBUdyzRnFRapybhjwLpc6q3WC/zO8xJ1+s2lCu4dnvZejE?= =?us-ascii?Q?KmruDNkgR7aDyiMQk42WLGZEyZC9TEXX373E6oGCMFIYJpYvWVsgR4gB1o9z?= =?us-ascii?Q?PfGloQaEzFrFrzs7yI/hDyN2LCnhw5Wi87qVx+93PaDsOPS0PoSB6acFrgA1?= =?us-ascii?Q?8/Tl1/MBq04ThX0NgFt0+0MUcgpIYmYZ6/EzjTI0+q0Db6qN9FTOHh6RNLvJ?= =?us-ascii?Q?C2z1rZTB92ffuzE1UY2tcbm4=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0773;5:p0yMnwuTTXciMrSBIgv3gN4yxDMjUpmwdxrefq1hyEbl+7kNpuXDqhwCCCzB1LP8l1m7WOgg4QrkwvtoTTTjZLkZiymIvenjJgJXyxWMJdsYIMF92ZNTG0EaUnswLVvDJqTI3I2NOxVj0vZdQgUG0A==;24:LDOdJxiggvlBg4/YqwF2CgJJLC4O0VKvis1Tst5y4RU9vpdJUQGvLcYSD/OWBuFGZoqUY4jtCUF/GvriJqHF5Dntat1CI1ifb3fqCHqe/9k=;20:kUwDpyINceohtq9i15vfrU9qZ5z63FFjyRxh6A3raQwMR8NuKFhAZsjUeMNDoqbrWsbpi+PzzY1re5uDwSlOBw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2015 09:42:27.3762 (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: BY2PR0301MB0773 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 26849 Lines: 839 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 Changes for v6: - rebase 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 | 25 +++++------------ 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 | 4 +-- .../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 | 1 + drivers/soc/Makefile | 1 + drivers/soc/fsl/Makefile | 6 +++++ drivers/soc/fsl/qe/Kconfig | 31 ++++++++++++++++++++++ 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/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 ++--- 46 files changed, 124 insertions(+), 109 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 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}/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 bf4c447..996a109 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 8d76220..1efb6b4 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..67b27b4 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..a01d363 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..64c5d17 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 7bfb9b1..a79d34e 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 b7f9c40..c9541a5 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -272,25 +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 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..c50a98d 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 - 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 +config QE_GPIO + bool "QE GPIO support" + depends on QUICC_ENGINE + select ARCH_REQUIRE_GPIOLIB + help + Say Y here if you are 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..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_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..b1d1566 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_SOC_VF610) += irq-vf610-mscm-ir.o obj-$(CONFIG_BCM7038_L1_IRQ) += irq-bcm7038-l1.o obj-$(CONFIG_BCM7120_L2_IRQ) += irq-bcm7120-l2.o obj-$(CONFIG_BRCMSTB_L2_IRQ) += irq-brcmstb-l2.o +obj-$(CONFIG_QUICC_ENGINE) += qe_ic.o obj-$(CONFIG_KEYSTONE_IRQ) += irq-keystone.o obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.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..9696204 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c +++ b/drivers/irqchip/qe_ic.c @@ -1,5 +1,5 @@ /* - * arch/powerpc/sysdev/qe_lib/qe_ic.c + * "drivers/irqchip/qe_ic.c" * * Copyright (C) 2006 Freescale Semiconductor, Inc. All rights reserved. * @@ -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 98% rename from arch/powerpc/sysdev/qe_lib/qe_ic.h rename to drivers/irqchip/qe_ic.h index efef7ab..b54dc4d 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 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..bc66744 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -2,6 +2,7 @@ menu "SOC (System On Chip) specific Drivers" source "drivers/soc/mediatek/Kconfig" source "drivers/soc/qcom/Kconfig" +source "drivers/soc/fsl/qe/Kconfig" source "drivers/soc/ti/Kconfig" source "drivers/soc/versatile/Kconfig" diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 70042b2..6204901 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ obj-$(CONFIG_ARCH_QCOM) += qcom/ +obj-y += fsl/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-$(CONFIG_SOC_TI) += ti/ obj-$(CONFIG_PLAT_VERSATILE) += versatile/ diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile new file mode 100644 index 0000000..56e53f3 --- /dev/null +++ b/drivers/soc/fsl/Makefile @@ -0,0 +1,6 @@ +# +# 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..ee692b0 --- /dev/null +++ b/drivers/soc/fsl/qe/Kconfig @@ -0,0 +1,31 @@ + # + # 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 + 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..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 c2518cd..4d17b2d 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/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 32b9bfa..8bdd3fe 100644 --- a/arch/powerpc/include/asm/qe.h +++ b/include/soc/fsl/qe/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/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 */ -- 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/