From patchwork Mon Jul 25 08:59:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Zhao X-Patchwork-Id: 652196 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rybWs074Bz9sBR for ; Mon, 25 Jul 2016 19:27:53 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rybWr6BKDzDrNf for ; Mon, 25 Jul 2016 19:27:52 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0059.outbound.protection.outlook.com [104.47.37.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rybV41ChpzDrJ2 for ; Mon, 25 Jul 2016 19:26:19 +1000 (AEST) Received: from BN6PR03CA0038.namprd03.prod.outlook.com (10.175.124.24) by SN1PR0301MB1567.namprd03.prod.outlook.com (10.162.130.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.544.10; Mon, 25 Jul 2016 09:11:05 +0000 Received: from BL2FFO11FD020.protection.gbl (2a01:111:f400:7c09::151) by BN6PR03CA0038.outlook.office365.com (2603:10b6:404:10c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15 via Frontend Transport; Mon, 25 Jul 2016 09:11:05 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD020.mail.protection.outlook.com (10.173.161.38) with Microsoft SMTP Server (TLS) id 15.1.539.16 via Frontend Transport; Mon, 25 Jul 2016 09:11:06 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u6P9B2mL010061; Mon, 25 Jul 2016 02:11:03 -0700 From: Zhao Qiang To: Subject: [Patch v3 1/3] irqchip/qeic: move qeic driver from drivers/soc/fsl/qe Date: Mon, 25 Jul 2016 16:59:54 +0800 Message-ID: <1469437196-38003-1-git-send-email-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131139114666449431; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(48376002)(50986999)(81156014)(104016004)(6806005)(11100500001)(8666005)(68736007)(110136002)(356003)(33646002)(189998001)(97736004)(19580405001)(19580395003)(106466001)(2906002)(81166006)(50466002)(85426001)(7846002)(87936001)(229853001)(575784001)(305945005)(86362001)(105606002)(586003)(77096005)(2351001)(36756003)(5003940100001)(8676002)(8936002)(50226002)(92566002)(4326007)(47776003)(7059030)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB1567; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD020; 1:/YscGFlBhxWwgeYeEfwpYmkSve/0NgjY7fn5CYaWJlOe4guhuhAYF24x84pzFWJSmPWJGJoahDl9efIgLVA//FM69AfZBIX2grvHiZEDDBXZaWRNnZINBQFLAGXQFsIYPF2eEcMTUoWwDYjXuCwDtxthGuF3SA9jqcU9eCaPErDNGmpV9ww3usl0lxhkuPjsOBS8Tar5b54XG2V7Ia2saRr4X5umuGgIAuFaPIpFr9c7KcyX5uG+x+nFylzeYuHSaDAUW2YXKIEevQs7E1SO69xWUnIgcSZSM6AYcgXcOwy+QTJBzt/CTe43YXGpPl7IyKyiOIDupyp/DkpH8lXk1AIEeQ3+Cz2PFleAkjTq0opFi1Ehd4KXZwO0S8wyuvlJSthSn+5tAmm7H8XZBru3YA21QTrvPQwZT5mTbOeDBewR4Ml4GTCX5a4gSYRTJq/ewGxuhxZuzUcxgb5gMba86wVtHejmhfv3oI6XYDa5PFsH2NglvWAAegoW2lrPo2zW0136YCblIp3arrt0mFR9rqppuzfbLUvHI5JMCLBGnQjUiess2JvJlPvmSMFEiGcAHuOyIOgraOy3xDr41XAbwZYQrklDCXpJHc5SZUckv+rmHc86ryBJTRYRrjusq1y5sfPiCusYgl0XNxupq/kJBafetKuhmeY0Mvqnh74wqv/5SZnV6zzAiD51BVissGqWayW3jedomu87wc9HsvknOROohKyUHPIqforWt0bWUNU= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 416da6d2-fc57-4fec-f8b8-08d3b46b9c4e X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1567; 2:oKUb4hmJaY4HuQFX8cZnnOOl1vTMWHc8DcTSsqG4GoYoMNeHh/USVfuGSPMa9IfCWd7nKwSMlZ02+tqfPxklJlO8GYOHBkgf0UBjLziYXKtfFI5ic5R3dhcSO/H805m8PYg8yDTzaxfyzoK1TngoE+N07cYjdwx70XOjTn4Z50ejZE6InNSYFB41yuaGecpk; 3:LdhlzB9odSunJvCvcjk8JszPwtO8LHuFpWMu8YmUEa5l/pcFn1gnddi0Ko32V/grwGfxKqRqQQ/UQg29taOCq5NvaOiuQp/lTMPPfiNx/r21Ku9kP29vFQJ81Mew3di+IXCwyYcHT6TMrX77uNtGuWKok5XdLuQK54ZAU7bghxp8/6aU7a30i0xt57k417WOqnig4Rrm1F/OLJYmjDn5Dvpk41tVULxUVUBcRG8k5Lg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1567; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1567; 25:/VcK3YrDb8eXv1E1ToeeqkhDxVMGcOUJoCWPE6jZq1HKRRlE9QwUbzOhlTT6EeDgCIX3mTbpo9yuUk3LHAOniirGWg7c5MzM9UMLt053oFVwmLI1ZDuMllHjYEdSKa/92TKuRk+0ymQpp61ZliehHXNoxCi5JICQ+GWnhl/2jBTElDpPSu5/UBdVYpGmMtg746NelpmmyDLwZwWsyDuVnUxKZ2CgmZyhkirJGJCczGUOdn3+Y9ImiUgld9Aocq8s3KNndLW1BNXLIMEbVczkIpU+YBTomqtjzMaqrpukRULjgXwBokhLqOqwUSXE7oRNpJdF7DE2AM0DboNroKd29CaRsTh0s560+AF7WT+7A7XuO+/neb9Atlpxy26XyYn8Z0zS0cUR3kKI5AWoiiSGaUDii1rVieSvgiymLtI5hhgI2HSPSz2ZEsGie0HjMMa1w3z3Se4pty3tDqrp7j2fi9eiQHkVcj7HphnzbAAEBwUFexSH1tPM/KYbBbqNsejm80hVyP2dHw39Tlm/yUjZ1pMprr8ArDnyBRhqTxXUcL2Np9+t05Uw80OOUxSjA0vR91RV8NJ3Fbxtq/xH/PaxgaKkvQP23onZK0byQZ2Ipmri6jfW2HL+PWRjr7omKnE0Q2zim7wRw8M8kyadonMGGVxKbxiRw0iuMboLJFYaizLmpmCVhP1/DQpwFYxd0+/OGtbnjB9PZ++iUcsSs0f6Oz9uf9IJUC0wgWXpjrxlirWjPx/r4ilIaOr3rHNcSg7p X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1567; 31:AJQsuU95Xw89N7Aw2dk6FEePAbH3wnJlO1BAjZg6TuIB301B6Cy9Nzqfvgl2BhqJRkqL9IHLFQFXP7vaIvYW9kf1HkbWqO0kFeahBKHfXX0750QFzCQg5qCHdFer6miutShX2lXQA/CkhdcE4IeM+ipaXFhrYcfjbpHND6WWyq1Y9/sOuO4wTI0ppRwqRb+3IE0wIv0Q9D+gVHkJhsPvjA==; 4:uNixDVabf6w9YiL9hOg/On0pQG8UrYkY1ZepG4g2Lf8jb/ElsmcJ10MUrRg9O+ijG6miyAnB093lGnjqaje/Ust+5tvNuODMr1AKKM9co5JQI7Ht0v9h/21ba7uQaBRSE8OyeNK16wYFW+OJBv8NbMmRi3ZuN6nTlWQWVZkY1ld3/ZWM20oCe19o193ayGJk9zsY8+heMqW8XL402PVVBYCibihFhLswp/oEEb2MAZ+Xb0BkYNLFS+TAImR/QZ7BbbEoj78ILlKwxU5TyIVxq0z34TelZ0kNxyLJSiiNBwQe/H7UESj4Iqq1UYRvzlm6n0TTxl30hgvfQ71UNrHCJjyw+sS/O/2Ba9HhyNHbro9aoqSdB3++EEo3vjy3g32u4D1OTfqwl4bkxxOPe9eiwvKw5FxspsD6ywfxUsHVUBV03bTSnasg4svlUeqcceaKtauSxWTE/mHwoyN8d9A488KddEoUQiXxaIdMbZrZb7KsaocrNrvx6nK4D7eHBRWD/NoMFMLipktGDpm4dk3KM+VVw75pAnGW0YlKVuN6jf2kFIpmmQBqkddhLm1oOAVC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(13017025)(13018025)(13023025)(13024025)(13015025)(10201501046)(3002001)(6055026); SRVR:SN1PR0301MB1567; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB1567; X-Forefront-PRVS: 0014E2CF50 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB1567; 23:06RcbanYNFMEY+JS0s70uk5qiibmvP54ncczEP3?= =?us-ascii?Q?ZMVprQZK11PcrLFVGIN7mWIAFZieAdL81OglZhVKzhunpuaVAlGUO3iUJjWC?= =?us-ascii?Q?65cnSVM7ACLQYW+wsK9B4g8IXGqob9hC2GUfMpWgn/MI8rXs5udEXa6aOPnV?= =?us-ascii?Q?7NTUdzQm+WMCDQB4lr+UbCv7pdkN/SdusRkY/t1W4LOM6D/xjTRJ/14cG04l?= =?us-ascii?Q?JR98zqpuL/q9KenQY8vqp9quE5v2nzKFqXv+PzW+6U6l6dbPgXycxMrZEo73?= =?us-ascii?Q?zsPp9inl4HwyBlRqM36sdQ3jR2HbTPlN8Nh9TTSyFVmLm8a1HPZKdOXdX2mV?= =?us-ascii?Q?5agbRXgiG4w2NhoRrLe2SreAXvyZMgxRAr3/Faz+JT1QypzttF5FEu99YLfu?= =?us-ascii?Q?haPdxf6R8trpXcBci3Gl7NLQtxKSCYOPh759LPMWh+JzNwfuCjg90oWhoQhJ?= =?us-ascii?Q?RWPfWhUvbXgShxSIuGw01n6kSMOgyuSXIQsgtJxWopVTz+eAqRZRjwSF4FWr?= =?us-ascii?Q?RQy/EncICp7yKTrUVPBC7NNXAj8ISyw6IsLdJ6fKXQdQ7LBliI9ZuMzrd//7?= =?us-ascii?Q?CubI2N/lSjOrdbzTwjq98YhwotQyQoQxZ3AsOzD9c+VEMyy1TibAu6+aVnPa?= =?us-ascii?Q?rO+fpXSKJ/ihi/ssvDqlYK11L5m4Togk1ISVQf8oJ5Fkroe2wyzKnwMnJp+x?= =?us-ascii?Q?bFIaCRhnlFi/wRqRJOrg87Ou18uhaTGQsHUg7Q2FsEDT/CyvhQTl9NA6k2Pb?= =?us-ascii?Q?fxEjQyp3bSXdLE0INuipre7FU7btVRpaMS5qfPwYevjwe0QhIJlt5NmRP5z8?= =?us-ascii?Q?1ERbq8oL+gBWr2ONUvlZDM0nXhGHCuMuRdzqn3TA6UzTd20UYbSNJsb3FIZu?= =?us-ascii?Q?MLAGJ2Syuj2b7U+tqbAA3+91RwVKEnGhfeXxdcZHj2yN3shhdGUfcX1+HES2?= =?us-ascii?Q?OLIAhxvqEyHKDh5zM2zDleFONQrHYZVJL9k8gEWabMVgkBJF/ZWaFn72cSf6?= =?us-ascii?Q?cNNo2j+/I2zqvpqYAO++S2vfjSc+O8/yZz1ycV6x5Z4C6Ik4rTKsCPv/aiiO?= =?us-ascii?Q?2WjHTnwv78tZf8yR7ybOVsOYWJYygrxM20oo7NdLAQ7qt8QLe61zqrbNdmHY?= =?us-ascii?Q?I1/yBtMYPn38+muyAUzui0BoA88FxMWG2?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1567; 6:0NVBTbB2iS4VN8Cru5028cQBSk4215wKoVGdl7J4mj1TJGTN1JYhZUnhixAVnDDWNayuMtKH3DmuZhMyWmSFdRn0EXF4Bb0gaQ3MK/Z2QpiNjjzf8PQwjy70K1SpBo9TjZui6z8QkohDdz+9voNR7mtynFBSOV+FSsPWY6G81H/Gdq6mxxnMEK3mX4PkuvXhoiCC0RV8nYhr7Ikb1qI8piazl6/BRpNjiAj9xk9QxDuZr49gmkCFkiulPOij+ZOdXG6AVv0d906WSAlrgXciUpqSikTEocF80X655xkBdCk=; 5:kI0GJQ0V53av1h5YetDW0+RlRI3CN4Ej+PWDUNNhN5LZDWX+c5qwhEO7/jqEUJC3tktKH/fYlLFpoYzmhuX0je7GNxVcTcLC6wFt6hSOY3X4pEXb0JIpnKUm1dh6Znb2lpK5NJDqFGARd1J9mQ/p5QgGFxJcwvWIgO63LRHEDNc=; 24:6UlUIDsexJNGBRpIu0LvO2poSUvyrWR0K3T9j6AvKN06oVLCOKMxtU0czJf50kZPo3G8hwQu9b9MwGoflgHfMw0MNEVndmPCFZN81TA4Zo0=; 7:GwqyKJfz3D4ufKu7LdTZaxUM7pWiWBZ44rGPEVIBUBg2gRQS5HEZO6ZtgG6uvhXzd9MnrxSvGQvO1/vjOlO/OcRJis7o2lMjwKOcw6TZJuJLt69aECETzzO7ACdKGYymuOGc0X/BQpjpemPkMO1oSlb8fxsnOmFdV+Utth2CoUmNgN8ApEcQjW4nhHzF5fPEvr+leeSRTd6Du9IbTE5p9CFi13AUpXPLr0WHmfWb7PI7d1ScpeKJKAOlArOzvgJe SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2016 09:11:06.4577 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB1567 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: oss@buserror.net, Zhao Qiang , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, xiaobo.xie@nxp.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" move the driver from drivers/soc/fsl/qe to drivers/irqchip, merge qe_ic.h and qe_ic.c into irq-qeic.c. Signed-off-by: Zhao Qiang --- Changes for v2: - modify the subject and commit msg Changes for v3: - merge .h file to .c, rename it with irq-qeic.c drivers/irqchip/Makefile | 1 + drivers/{soc/fsl/qe/qe_ic.c => irqchip/irq-qeic.c} | 82 +++++++++++++++- drivers/soc/fsl/qe/Makefile | 2 +- drivers/soc/fsl/qe/qe_ic.h | 103 --------------------- 4 files changed, 83 insertions(+), 105 deletions(-) rename drivers/{soc/fsl/qe/qe_ic.c => irqchip/irq-qeic.c} (85%) delete mode 100644 drivers/soc/fsl/qe/qe_ic.h diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 38853a1..cef999d 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -69,3 +69,4 @@ obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o +obj-$(CONFIG_QUICC_ENGINE) += qe_ic.o diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/irqchip/irq-qeic.c similarity index 85% rename from drivers/soc/fsl/qe/qe_ic.c rename to drivers/irqchip/irq-qeic.c index ec2ca86..1f91225 100644 --- a/drivers/soc/fsl/qe/qe_ic.c +++ b/drivers/irqchip/irq-qeic.c @@ -30,7 +30,87 @@ #include #include -#include "qe_ic.h" +#define NR_QE_IC_INTS 64 + +/* QE IC registers offset */ +#define QEIC_CICR 0x00 +#define QEIC_CIVEC 0x04 +#define QEIC_CRIPNR 0x08 +#define QEIC_CIPNR 0x0c +#define QEIC_CIPXCC 0x10 +#define QEIC_CIPYCC 0x14 +#define QEIC_CIPWCC 0x18 +#define QEIC_CIPZCC 0x1c +#define QEIC_CIMR 0x20 +#define QEIC_CRIMR 0x24 +#define QEIC_CICNR 0x28 +#define QEIC_CIPRTA 0x30 +#define QEIC_CIPRTB 0x34 +#define QEIC_CRICR 0x3c +#define QEIC_CHIVEC 0x60 + +/* Interrupt priority registers */ +#define CIPCC_SHIFT_PRI0 29 +#define CIPCC_SHIFT_PRI1 26 +#define CIPCC_SHIFT_PRI2 23 +#define CIPCC_SHIFT_PRI3 20 +#define CIPCC_SHIFT_PRI4 13 +#define CIPCC_SHIFT_PRI5 10 +#define CIPCC_SHIFT_PRI6 7 +#define CIPCC_SHIFT_PRI7 4 + +/* CICR priority modes */ +#define CICR_GWCC 0x00040000 +#define CICR_GXCC 0x00020000 +#define CICR_GYCC 0x00010000 +#define CICR_GZCC 0x00080000 +#define CICR_GRTA 0x00200000 +#define CICR_GRTB 0x00400000 +#define CICR_HPIT_SHIFT 8 +#define CICR_HPIT_MASK 0x00000300 +#define CICR_HP_SHIFT 24 +#define CICR_HP_MASK 0x3f000000 + +/* CICNR */ +#define CICNR_WCC1T_SHIFT 20 +#define CICNR_ZCC1T_SHIFT 28 +#define CICNR_YCC1T_SHIFT 12 +#define CICNR_XCC1T_SHIFT 4 + +/* CRICR */ +#define CRICR_RTA1T_SHIFT 20 +#define CRICR_RTB1T_SHIFT 28 + +/* Signal indicator */ +#define SIGNAL_MASK 3 +#define SIGNAL_HIGH 2 +#define SIGNAL_LOW 0 + +struct qe_ic { + /* Control registers offset */ + volatile u32 __iomem *regs; + + /* The remapper for this QEIC */ + struct irq_domain *irqhost; + + /* The "linux" controller struct */ + struct irq_chip hc_irq; + + /* VIRQ numbers of QE high/low irqs */ + unsigned int virq_high; + unsigned int virq_low; +}; + +/* + * QE interrupt controller internal structure + */ +struct qe_ic_info { + u32 mask; /* location of this source at the QIMR register. */ + u32 mask_reg; /* Mask register offset */ + u8 pri_code; /* for grouped interrupts sources - the interrupt + code as appears at the group priority register */ + u32 pri_reg; /* Group priority register offset */ +}; static DEFINE_RAW_SPINLOCK(qe_ic_lock); diff --git a/drivers/soc/fsl/qe/Makefile b/drivers/soc/fsl/qe/Makefile index 2031d38..51e4726 100644 --- a/drivers/soc/fsl/qe/Makefile +++ b/drivers/soc/fsl/qe/Makefile @@ -1,7 +1,7 @@ # # 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_QUICC_ENGINE)+= qe.o qe_common.o qe_io.o obj-$(CONFIG_CPM) += qe_common.o obj-$(CONFIG_UCC) += ucc.o obj-$(CONFIG_UCC_SLOW) += ucc_slow.o diff --git a/drivers/soc/fsl/qe/qe_ic.h b/drivers/soc/fsl/qe/qe_ic.h deleted file mode 100644 index 926a2ed..0000000 --- a/drivers/soc/fsl/qe/qe_ic.h +++ /dev/null @@ -1,103 +0,0 @@ -/* - * drivers/soc/fsl/qe/qe_ic.h - * - * QUICC ENGINE Interrupt Controller Header - * - * Copyright (C) 2006 Freescale Semiconductor, Inc. All rights reserved. - * - * Author: Li Yang - * Based on code from Shlomi Gridish - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ -#ifndef _POWERPC_SYSDEV_QE_IC_H -#define _POWERPC_SYSDEV_QE_IC_H - -#include - -#define NR_QE_IC_INTS 64 - -/* QE IC registers offset */ -#define QEIC_CICR 0x00 -#define QEIC_CIVEC 0x04 -#define QEIC_CRIPNR 0x08 -#define QEIC_CIPNR 0x0c -#define QEIC_CIPXCC 0x10 -#define QEIC_CIPYCC 0x14 -#define QEIC_CIPWCC 0x18 -#define QEIC_CIPZCC 0x1c -#define QEIC_CIMR 0x20 -#define QEIC_CRIMR 0x24 -#define QEIC_CICNR 0x28 -#define QEIC_CIPRTA 0x30 -#define QEIC_CIPRTB 0x34 -#define QEIC_CRICR 0x3c -#define QEIC_CHIVEC 0x60 - -/* Interrupt priority registers */ -#define CIPCC_SHIFT_PRI0 29 -#define CIPCC_SHIFT_PRI1 26 -#define CIPCC_SHIFT_PRI2 23 -#define CIPCC_SHIFT_PRI3 20 -#define CIPCC_SHIFT_PRI4 13 -#define CIPCC_SHIFT_PRI5 10 -#define CIPCC_SHIFT_PRI6 7 -#define CIPCC_SHIFT_PRI7 4 - -/* CICR priority modes */ -#define CICR_GWCC 0x00040000 -#define CICR_GXCC 0x00020000 -#define CICR_GYCC 0x00010000 -#define CICR_GZCC 0x00080000 -#define CICR_GRTA 0x00200000 -#define CICR_GRTB 0x00400000 -#define CICR_HPIT_SHIFT 8 -#define CICR_HPIT_MASK 0x00000300 -#define CICR_HP_SHIFT 24 -#define CICR_HP_MASK 0x3f000000 - -/* CICNR */ -#define CICNR_WCC1T_SHIFT 20 -#define CICNR_ZCC1T_SHIFT 28 -#define CICNR_YCC1T_SHIFT 12 -#define CICNR_XCC1T_SHIFT 4 - -/* CRICR */ -#define CRICR_RTA1T_SHIFT 20 -#define CRICR_RTB1T_SHIFT 28 - -/* Signal indicator */ -#define SIGNAL_MASK 3 -#define SIGNAL_HIGH 2 -#define SIGNAL_LOW 0 - -struct qe_ic { - /* Control registers offset */ - volatile u32 __iomem *regs; - - /* The remapper for this QEIC */ - struct irq_domain *irqhost; - - /* The "linux" controller struct */ - struct irq_chip hc_irq; - - /* VIRQ numbers of QE high/low irqs */ - unsigned int virq_high; - unsigned int virq_low; -}; - -/* - * QE interrupt controller internal structure - */ -struct qe_ic_info { - u32 mask; /* location of this source at the QIMR register. */ - u32 mask_reg; /* Mask register offset */ - u8 pri_code; /* for grouped interrupts sources - the interrupt - code as appears at the group priority register */ - u32 pri_reg; /* Group priority register offset */ -}; - -#endif /* _POWERPC_SYSDEV_QE_IC_H */