From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964823AbdKJDuE (ORCPT ); Thu, 9 Nov 2017 22:50:04 -0500 Received: from mail-cys01nam02on0067.outbound.protection.outlook.com ([104.47.37.67]:17376 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964788AbdKJDuA (ORCPT ); Thu, 9 Nov 2017 22:50:00 -0500 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; From: Zhao Qiang To: , , CC: , Zhao Qiang Subject: [Patch v13 1/4] irqchip/qeic: move qeic driver from drivers/soc/fsl/qe Date: Fri, 10 Nov 2017 11:31:22 +0800 Message-ID: <20171110033125.991-2-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171110033125.991-1-qiang.zhao@nxp.com> References: <20171110033125.991-1-qiang.zhao@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131547593979416258;(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)(336005)(7966004)(376002)(39380400002)(39860400002)(346002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(189998001)(76176999)(50986999)(316002)(86362001)(1076002)(575784001)(4326008)(36756003)(53936002)(356003)(106466001)(6666003)(8936002)(68736007)(33646002)(2950100002)(85426001)(50466002)(498600001)(305945005)(8676002)(48376002)(50226002)(81156014)(77096006)(81166006)(105606002)(2201001)(47776003)(97736004)(5660300001)(2906002)(16586007)(54906003)(104016004)(5003940100001)(110136005)(8656006)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR03MB2355;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC001;1:h2RaNXG2zG0CyYY/oWnqlp1X1mmeI4sD+q8qTYxNcKe29W0Y8ogEDv3vqoHnAIStb3PqZv3Q3UfeDII8nfhP9QjAqV6nKUSKTAOWA2SFRVKDymTeyuaXMl/S+kYSJtHN MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3316582-ef32-470c-4ec2-08d527ee1caa X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603256);SRVR:BN3PR03MB2355; X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2355;3:sjaNgOsSV0fiy7miGE3jLaqCxC+8jqcd3PAdpwvmQ029OI6gqw7w0ai/YR8XTOLPYFiNvbIAjJWr26Y3a/jRzBpe9Np8uI4ZAcxx/rwimUPK2nY2GAbgZWeyAzBjX+99ff9QSaKHBZ9pElGEGUvIpZYxh2HfiCAOlkXpCJD2iEpaIwUMsOb/WyC6GULIApXlz3ZTaNUkfdrDfOAx5fUEJpCyace8sjmrqkyr/LeMCwTSYVuAXJUHMgDtn18Zi7ZwtniOq78dNPb5P1ehCKMCAd8xE3bPvv51SFT92fF9zCkIuUe3cQGFMpBWl+vwlxTbo3BvDAiEP0PfmkxuH+Ay5eaDwCpG7eBqt1CXSEakrnc=;25:5gT5aWrYIZevnQKFqIXncNK4cpQyYv4s8jgVzI8l1+ketHMQfWCk/baFn7IJxKr84Gde7MLzYjdh8OD1ne6CDBaGtnW6mPnWGMS/8MFgh+b6SEjDLmjsrYgjtJfGzTxF+/ICAnc9HUUoKHRHSsuQ0HWv6QoSFHAATv93b09oHknR/2WBp+Rcslik4BJmelj7Gk1KGdFMYxdQhaBggBCe8qeg937b9sx29W7yKJKJq9Qb0/jP9qGVEpy572Emix8jf+7CN2EsoYcnYWodk0GY9Le8E7QnfSqslZImWXRQhCz/bXOdAPgJTZBMxWrLtW/Y4d/R/KWFkt/Sj9XvPfUXzw== X-MS-TrafficTypeDiagnostic: BN3PR03MB2355: X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2355;31:BJXjcsYRmQ/LrOQ/JlhypsbRvGlcOZKV1caaXsEDvH0+gIG1c5yTTg/Cj/QmGX+yrBU+4rFSonrl2hXH9xFZLn9Il51+hA7Q99fN2ewf83hxYRfH8hfCOEVfv+MFIuufU1nvrnW+/t+5nGEtkIw4L3Tq6QkjRpfuem1Ppdq9FARNYzQ5TplKLXAIL4PkJMtJtjc6XE78BRwmHilYfZGpU3o9o6R40ZDpe2oPxkZ8fUs=;4:Eb/nF/aFXk1YI+W8Rj4n08mksvdBGeNBPZJEIp7d24zT2doeMr0DoUSjin6qLW2EvxOHSbO62fxMYLTmMzrW7frq3G2bAHUms9pN3Mvvmbl4wOB/1kAFjqzC+gLbjwm5bJckrE0rhPEPG3q30QCP7VY5hapzqb6+qNbYkuYBLxtlVoWJ6Z9DNiavMagEuT2lpx/UI7J/eSo4xSovjsNrdmHmqLt8Qd49iIbO5cilPB9Iw953du1yH3TcKZNqBg/do7IsG6or1UbIfUJb7aSNEScFptogPTjH6Lh3u7awQAumOE0vSJZzBCyGlArMvWombZ8K9qEdcAijGHmGy58rQ302ADLFM+czulKIQEPt473UmumgVSFMHbyr5K3In3yF X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(185117386973197)(101931422205132); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(3231021)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93001095)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123556025)(20161123559100)(20161123565025)(20161123563025)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BN3PR03MB2355;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BN3PR03MB2355; X-Forefront-PRVS: 0487C0DB7E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN3PR03MB2355;23:w/oaddp+vlUKVrefJuIP7H0mAw/nutzVBUj7MokP/?= =?us-ascii?Q?lXrf+YFc+nyWk9wqoxjpIfN5jIch+7H1N7ynNEKypua0lqnARAc1pBUm5Fm0?= =?us-ascii?Q?RB7zXeWgpA2Tj3brnVhPv2wZOUeezvWZs2Wj2SuWcRqIAghze3X04eSn/cJ2?= =?us-ascii?Q?dP9O7awvflt20RPRF1BhDTN7zPtEoLaziU4LjHdCr59M06PelYprc30Gb2SS?= =?us-ascii?Q?CEByVR9XHCh5sIiRaQL54fSvMx0a5rbTp5uivZ2v9TMisnyixEnw0HkPquO6?= =?us-ascii?Q?G9NI24iK24w+J8H422r84QIQ5JKyv9GhI+erEabQ5FgDaeywdRDxUrW+oki4?= =?us-ascii?Q?obtlN5691EG8LTyqFOrJXMtYe2qatqxKpOzyqHExxrm3qyT7i7YUFho6eTs9?= =?us-ascii?Q?C9IQLttFfkreiP+uI0h8HTb0r55kqDsIkNhiYRsOFC6ygbj92AJQbFFAzk8g?= =?us-ascii?Q?FuROmK4d0nS8HROYU4yMACpwtviGj6caEFzRnu5Os+l51vqDhZ0BtlC0bhQr?= =?us-ascii?Q?DG5C3XZUkZiiqLI/Mvx2f6Ln69nXVifyGcytWGolPozI5mFwqvUUAFcK8EY+?= =?us-ascii?Q?pZe/GX24LAocg9n+PwVjtzp/Hs4ertLKT6JdZ+lDyg5oo5dTzw9bU/QMqhiR?= =?us-ascii?Q?qxv06UY3WNGs4I+IjM5Gk/tLsIsVYCRkd9U/Lsdh/uvdCBhY0vnYiMJqm6Cx?= =?us-ascii?Q?74aiKALPaRo8fYuOFMwQLBZXt3csmFALUoYH4uBm6Tb2m3ro6c4wV6R3MJjE?= =?us-ascii?Q?p3/aBw90nXoSeI1Kpv3baYcPBTp22Lswh9P6ViHy7EeGCHVATrqRSuKRjH94?= =?us-ascii?Q?kcWgGXOmWmAwve8SYxMXKLPlWokIXb7Kpt+Mm6UOJf2+/rkN+ecNYszVOOSZ?= =?us-ascii?Q?gt5dzjJ+9Or+lOlrTcUN3tZHuv7aNqyRSnQ1OT20I50AY45qIRkvJyr3aKwO?= =?us-ascii?Q?/0DkCxET7p9KuNaejYN2rCUZl5OMvuByELd/wvwDDGeCfyZ71es3r+GMMZhV?= =?us-ascii?Q?rFjazmqiUmFJdZ72eJcPtB6z/ZFMYCiTLK7/WwBgJMl5m/erNpuHvfGoDAEZ?= =?us-ascii?Q?yBrRMugxZt2JJR6yb9EeRuBze8XizLeuL6C9HiY4HBqIdvOhar5KtXpoDlUr?= =?us-ascii?Q?Jts1xhH82/576gkumgIKksc4Kgg5f+vM0tbWuIJLS5Q3ORC4TI19sYI2Mnl+?= =?us-ascii?Q?D+a70BTkyoRYG7zcX8pMVKxEli9/LDZni+CzZDhqyA7ol2ThrfwzlDoLCTDY?= =?us-ascii?Q?zPxKp8HhW4eXcpl9Hw=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2355;6:6M1jpXaPyaH5d4V+s80O1RlTR5SG9v4p0Zmwn9+tefAHe0tfCFDA684Um7Y2JE/eW0YM2wq2JOHzaBQilg+g1wkhtsrQfTCqOn3mNg8bc4DtfpYR3pYJe+9EjrDY0IGPr2Wkw/4BNeJF7OYN/4G9s44cLcpT1EoA/aKKTaWalCU/kRa287mG/ekTlqiiuZhHS2xtbUu7a+tMGVLlaHwAkNL4eQl5quhcaG6IcKHUvMHa/oHfUmD/trirxrOBeaPa80agts37eDBDYtW7ekJeqHy9JnSGbM/jTBYtZcpxridTzjCOk1KSy9+2fFFkK9uclhcUYHQEvjsGTMDwtSyZ6WKMguJe2YmEIrIUDSJStQA=;5:Vzy+vToW+izhCe+pVGgCAefXlH1FyFjQw5P2qmnlToeNyS/whdZ8p70Jo+Kx4TYcMNfPtcsuzGl4T1pHEPDK69/zf6ChvTQ8Kb0IQwJbBQ3/5XJdruPXFfAr69dGiXNe+fuSfwTgPtk9OHhpF9Vn72rJDYTQBpZD6gFmqogdEM4=;24:119AtrqmkLZT7bs4HtxklSKeeH8KKv0XsyLprppRWIi0FShCTPNKS9rDBWwk7zi4VZ3FSgO6lY0CbBWhLk0Yan01hNKqrAKFKOmjNcDhcU0=;7:U04H8ETE0BqloaXGpiCylOLmbeaQb2XVKHFGujxx30+kKgDjo0M4QKOxOIbid9aGBzlnzLm1UPXgdKI8oFOWWNAuDOwpo7gDHXq4a+BOLnCl7qE3oW8RXDgO3SD3tQweH7RlkXdFvE1tYQYxooXJXZj8h6E8KbFemz33fHL2cM32AkgZZGl9jFnU55diaTQugkUh0SBQDWJLBHNiJQdqmsfp2kS5r4N9r2e3dREA5CcsRi2/zTrtnUNaeuY4CgQw SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2017 03:49:57.3956 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3316582-ef32-470c-4ec2-08d527ee1caa 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: BN3PR03MB2355 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- MAINTAINERS | 6 + drivers/irqchip/Makefile | 1 + drivers/{soc/fsl/qe/qe_ic.c => irqchip/irq-qeic.c} | 141 +++++++++++++++++---- drivers/soc/fsl/qe/Makefile | 2 +- drivers/soc/fsl/qe/qe_ic.h | 103 --------------- 5 files changed, 123 insertions(+), 130 deletions(-) rename drivers/{soc/fsl/qe/qe_ic.c => irqchip/irq-qeic.c} (81%) delete mode 100644 drivers/soc/fsl/qe/qe_ic.h diff --git a/MAINTAINERS b/MAINTAINERS index af0cb69f6a3e..e872c84e4e37 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5553,6 +5553,12 @@ F: drivers/soc/fsl/qe/ F: include/soc/fsl/*qe*.h F: include/soc/fsl/*ucc*.h +FREESCALE QEIC DRIVERS +M: Qiang Zhao +L: linux-kernel@vger.kernel.org +S: Maintained +F: drivers/irqchip/irq-qeic.c + FREESCALE QUICC ENGINE UCC ETHERNET DRIVER M: Li Yang L: netdev@vger.kernel.org diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 845abc107ad5..77aa4f55a54c 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -79,3 +79,4 @@ obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o obj-$(CONFIG_IRQ_UNIPHIER_AIDET) += irq-uniphier-aidet.o +obj-$(CONFIG_QUICC_ENGINE) += irq-qeic.o diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/irqchip/irq-qeic.c similarity index 81% rename from drivers/soc/fsl/qe/qe_ic.c rename to drivers/irqchip/irq-qeic.c index ec2ca864b0c5..aba71354e17c 100644 --- a/drivers/soc/fsl/qe/qe_ic.c +++ b/drivers/irqchip/irq-qeic.c @@ -1,7 +1,7 @@ /* - * arch/powerpc/sysdev/qe_lib/qe_ic.c + * drivers/irqchip/irq-qeic.c * - * Copyright (C) 2006 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (C) 2016 Freescale Semiconductor, Inc. All rights reserved. * * Author: Li Yang * Based on code from Shlomi Gridish @@ -30,145 +30,234 @@ #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 BIT(18) +#define CICR_GXCC BIT(17) +#define CICR_GYCC BIT(16) +#define CICR_GZCC BIT(19) +#define CICR_GRTA BIT(21) +#define CICR_GRTB BIT(22) +#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 */ + 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 { + /* location of this source at the QIMR register. */ + u32 mask; + + /* Mask register offset */ + u32 mask_reg; + + /* + * for grouped interrupts sources - the interrupt + * code as appears at the group priority register + */ + u8 pri_code; + + /* Group priority register offset */ + u32 pri_reg; +}; static DEFINE_RAW_SPINLOCK(qe_ic_lock); static struct qe_ic_info qe_ic_info[] = { [1] = { - .mask = 0x00008000, + .mask = BIT(15), .mask_reg = QEIC_CIMR, .pri_code = 0, .pri_reg = QEIC_CIPWCC, }, [2] = { - .mask = 0x00004000, + .mask = BIT(14), .mask_reg = QEIC_CIMR, .pri_code = 1, .pri_reg = QEIC_CIPWCC, }, [3] = { - .mask = 0x00002000, + .mask = BIT(13), .mask_reg = QEIC_CIMR, .pri_code = 2, .pri_reg = QEIC_CIPWCC, }, [10] = { - .mask = 0x00000040, + .mask = BIT(6), .mask_reg = QEIC_CIMR, .pri_code = 1, .pri_reg = QEIC_CIPZCC, }, [11] = { - .mask = 0x00000020, + .mask = BIT(5), .mask_reg = QEIC_CIMR, .pri_code = 2, .pri_reg = QEIC_CIPZCC, }, [12] = { - .mask = 0x00000010, + .mask = BIT(4), .mask_reg = QEIC_CIMR, .pri_code = 3, .pri_reg = QEIC_CIPZCC, }, [13] = { - .mask = 0x00000008, + .mask = BIT(3), .mask_reg = QEIC_CIMR, .pri_code = 4, .pri_reg = QEIC_CIPZCC, }, [14] = { - .mask = 0x00000004, + .mask = BIT(2), .mask_reg = QEIC_CIMR, .pri_code = 5, .pri_reg = QEIC_CIPZCC, }, [15] = { - .mask = 0x00000002, + .mask = BIT(1), .mask_reg = QEIC_CIMR, .pri_code = 6, .pri_reg = QEIC_CIPZCC, }, [20] = { - .mask = 0x10000000, + .mask = BIT(28), .mask_reg = QEIC_CRIMR, .pri_code = 3, .pri_reg = QEIC_CIPRTA, }, [25] = { - .mask = 0x00800000, + .mask = BIT(23), .mask_reg = QEIC_CRIMR, .pri_code = 0, .pri_reg = QEIC_CIPRTB, }, [26] = { - .mask = 0x00400000, + .mask = BIT(22), .mask_reg = QEIC_CRIMR, .pri_code = 1, .pri_reg = QEIC_CIPRTB, }, [27] = { - .mask = 0x00200000, + .mask = BIT(21), .mask_reg = QEIC_CRIMR, .pri_code = 2, .pri_reg = QEIC_CIPRTB, }, [28] = { - .mask = 0x00100000, + .mask = BIT(20), .mask_reg = QEIC_CRIMR, .pri_code = 3, .pri_reg = QEIC_CIPRTB, }, [32] = { - .mask = 0x80000000, + .mask = BIT(31), .mask_reg = QEIC_CIMR, .pri_code = 0, .pri_reg = QEIC_CIPXCC, }, [33] = { - .mask = 0x40000000, + .mask = BIT(30), .mask_reg = QEIC_CIMR, .pri_code = 1, .pri_reg = QEIC_CIPXCC, }, [34] = { - .mask = 0x20000000, + .mask = BIT(29), .mask_reg = QEIC_CIMR, .pri_code = 2, .pri_reg = QEIC_CIPXCC, }, [35] = { - .mask = 0x10000000, + .mask = BIT(28), .mask_reg = QEIC_CIMR, .pri_code = 3, .pri_reg = QEIC_CIPXCC, }, [36] = { - .mask = 0x08000000, + .mask = BIT(27), .mask_reg = QEIC_CIMR, .pri_code = 4, .pri_reg = QEIC_CIPXCC, }, [40] = { - .mask = 0x00800000, + .mask = BIT(23), .mask_reg = QEIC_CIMR, .pri_code = 0, .pri_reg = QEIC_CIPYCC, }, [41] = { - .mask = 0x00400000, + .mask = BIT(22), .mask_reg = QEIC_CIMR, .pri_code = 1, .pri_reg = QEIC_CIPYCC, }, [42] = { - .mask = 0x00200000, + .mask = BIT(21), .mask_reg = QEIC_CIMR, .pri_code = 2, .pri_reg = QEIC_CIPYCC, }, [43] = { - .mask = 0x00100000, + .mask = BIT(20), .mask_reg = QEIC_CIMR, .pri_code = 3, .pri_reg = QEIC_CIPYCC, diff --git a/drivers/soc/fsl/qe/Makefile b/drivers/soc/fsl/qe/Makefile index 2031d385bc7e..51e472648bad 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 926a2ed42319..000000000000 --- 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 */ -- 2.14.1