From patchwork Wed Sep 28 03:15:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Zhao X-Patchwork-Id: 675924 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 3skNTX1kBSz9s4n for ; Wed, 28 Sep 2016 13:28:48 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3skNTX0tqCzDrYr for ; Wed, 28 Sep 2016 13:28:48 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0046.outbound.protection.outlook.com [104.47.40.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3skNSK371BzDrYb for ; Wed, 28 Sep 2016 13:27:45 +1000 (AEST) Received: from DM5PR03CA0014.namprd03.prod.outlook.com (10.175.104.24) by BN1PR0301MB0706.namprd03.prod.outlook.com (10.160.78.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5; Wed, 28 Sep 2016 03:27:40 +0000 Received: from BL2FFO11OLC010.protection.gbl (2a01:111:f400:7c09::166) by DM5PR03CA0014.outlook.office365.com (2603:10b6:3:118::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5 via Frontend Transport; Wed, 28 Sep 2016 03:27:40 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.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 BL2FFO11OLC010.mail.protection.outlook.com (10.173.160.154) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Wed, 28 Sep 2016 03:27:39 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u8S3RZWZ019482; Tue, 27 Sep 2016 20:27:36 -0700 From: Zhao Qiang To: Subject: [PATCH v7] QE: remove PPCisms for QE Date: Wed, 28 Sep 2016 11:15:31 +0800 Message-ID: <1475032531-10263-1-git-send-email-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131195068601545749; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(81156014)(81166006)(7846002)(8676002)(8936002)(8666005)(69596002)(2906002)(356003)(92566002)(50466002)(36756003)(33646002)(626004)(305945005)(105606002)(50226002)(5660300001)(110136003)(87936001)(6916009)(47776003)(104016004)(106466001)(77096005)(11100500001)(5003940100001)(85426001)(97736004)(86362001)(68736007)(4326007)(2351001)(189998001)(229853001)(19580395003)(586003)(50986999)(19580405001)(48376002)(7059030)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0706; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC010; 1:L8ataTOdlYaSpbQ0q4uq7+oJFFAUEjTYM2koZcpL5FrUgXeTwlhhuKj5G3aNp3sQPRvpIEK+DY/9gMqa0sdSUZfZl38j1+detDR//NrLOBj8zvDpI0EdsQDYc7oo6eDSsOjazRY0c/88LQLflPdi7A50O/kMuQ/MZ/caD+nRj48XAP0+VkK74GvLvPTGHeAQzCfMN+liLVMJkQXz0/of+EJY63CCGRmTU4uoPZI9xUFOzxh/3OBHWhccJ/Av71MLToHF+Etdr58Xczf6jn+8GzIo4qJdN11Vit5ri/iks7qsM1z2n5WSa7UMAkWeFPHhB0nHEcj36xBT+S/JQ7AmLfcOCXpj/ULhXccI2XDmoDYbeCFlLUv4harRsqnbtHd27+ZQ1HKpVjVnf+N89vANP93rkpemF5uWmgTKBWfCsR4sSIwxUpuwP8y2R0xtJtLTQCt3CF5DPDBW1IaVhKj1XNNxOHRcYnKF661UZW3Hr4kGS3tSaBDWnB29aI2kauFIWCS8b+aLAxeZGoxe4TuW+NfCcJLOlhdMNYWNygZMvJBUtnk6Zirp43W9eVqPMKzD24f4Ry02vN8x0AF+IKw22+6+P4S3L+NeUKk+InZ90VjOJUtzjtbUFQ2jocjjdqqzqiNK2XMBTdhdcDVbUBMFLgiDAemiO/AgbJddzhJuaOS9mhwohyvnjEUjFzSi8YgZw/Yl+lN30ISByrata8BCJq9a+iPxYWxz1ffV7b5yjzM= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 50bf8867-0e98-49b3-d2b8-08d3e74f66bb X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0706; 2:s4acW/j4Q5lEwSk8mzPePGktUGhCn47A1Ig/Srn1WA3Sm3B4WffENwkByrMew3UJOE0c9a70yroRbb5c0lRoEbkRmQUoAKTTSbzECIt+GLh+UHOrwi/TxRQqnZiDHv1ZmV+3nRBIqU5DpuY/BqKpK1yZuqKQYjbt8otI8IuuM0EOPhYliEJUUpJF/4G/KHYx; 3:054lwFtLiEQLXz51m9pnNlLX/+dAUVZKkSGHovS3v6gho+gpWNRL3mn0WTPpZCNbwCO4tLxzhydAVkn5KUMIMr0PgG9R2XqxzvR/LepgDugPVND7Av2yzz20c/ldj9BiKj7DeRHYHR0yZTYL/6gX/M8XokC3PYGW2bnc1byJmuLsowUiy3tMEj7gcw/XMepDFDNfEBRE/cnn3eh7c8fjOFEwheBT7jf5DoT7TzRWsnc=; 25:kmR+tbNCVY7fbfoDIAvanYND2kw+umutnM5BaAX91e/EpugTIFTykEcOtqKZs2+IEIbpPpPxpGDfMxeLIK6cE2DPBLCQoRJKnY0IAEtDaxwG5FclTV4cp8qeNEqYzkeH5PVGQgHbG3XFdg8GYobGi8BQHUZzN43T40yZrY9n5wEq92nwDsV5NqtyPWqRrv26uxM4UiLqnhmI++KvQCRGoMAv7tJQSGlbXUnRWh8OOj8sM93ygPFtTNHLLfdRN4q3v2uY+g5rkcKntowkEk6lJQ1GHqXFoVoXh5TMohi/A163s6PQmOim64GWPDXAwA2bH2+/7fCXkdaOqsw5DniB/kFl/p+md/7Ceue4XWXbr1exVu8vdHh1U0uixxscaolul+2JFmznGbaeMxXD9W1+JwQwQZHJH6WuJ5EdOt3/wJg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1PR0301MB0706; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0706; 31:0q2SQXrWowVCL67S/g8oblaeZdbCuMfGFCdL7VwUNWmHgAO6Idn5qrcHo7LXJYgJiwZUPe5zd3eIJyYt4ip6b7JyBHOzFz+klOANvMLSYoXhC1l4MZtGXC4Kgzg57H/roY1j5jCm3R6vu9flEygrY1/3ElSBn1QGaMp4/OYzuf5kkizKrFBJXrOZF9ciC3jW1ZCDKWrWUkFDQEMd8dzLkO1c/TVPMiU946WKW5Rllvg=; 4:Jw9fMjLLVc1lP6Wz9yjIqwKDpuSdxlSlM4XLtRFM3uxB+RmQ2A2S+RNNhMdKP4+ritB0C2xRgdfw2LCewF7doOH9o0dEwIG7L8Upe1gKN2azO+/S0dYnNNfXozJCRzLhmLPverMEcpliE7hIEcSRcOhh19Q9eespKegcluhU+ZzW9hfZ3oH9ZarzT40Vfybg5OyY8Q4IzpAKYIj2l3V7d5i5pCZhPpH6pecwIQxdHXy9hvXUDuQjWhldgGXgVFvH2naOTZrLlKQMcMH8HbTYmuMsNde8rnAwXBaebCzm94Uuxs7q2exQ7mf5G3vJeOzS4+DCDnUNHh9O241LS8wgojHPU2hl0C6yQpIU1lTDZops6TaziMbXtATMFoaVnYHFok46dqV29lOBYLzJNhgGNJyrngYf8H9VHF9yoRuJgAZivIdhQAv2y8OSvIFFOgb0Mcviqfri+CT+mov7+Ve51R5V3QFctU0A3l1yqDZOZ877ozhnyFfYb/SdrbNKKxpjgFtcL5+0smyogk4PrSsdlbmiz7JxKR3LXZ6AUTEtZDg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(13015025)(13023025)(13024025)(13017025)(13018025)(3002001)(10201501046)(6055026); SRVR:BN1PR0301MB0706; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0706; X-Forefront-PRVS: 0079056367 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0706; 23:f+HokiGp7XiynG7PlzeiFzvbm9OqQfvSr16SpBA?= =?us-ascii?Q?D/i2irX3WMeKB9VhC8eXZgpvhy8GugXduNMfWeJdoJLLfSGiv1XOyWciobSg?= =?us-ascii?Q?Fga74enq9FodncwLZpIVo4aClStVz8cmLEuQy+8TbYRyKT5AwOyPqViA8+Uf?= =?us-ascii?Q?Df/Jr5uNE3aIUx6eVK/5BddzDMxXMXBN5EfiMfUt/PuIlVdgZOJWmCO4OMQk?= =?us-ascii?Q?ZBJoZ7iXpftNFD0V0eWaqGg8XAXSUOA1kdCYB9kMfsp8z+8HASqyhD03GAe1?= =?us-ascii?Q?O5B6jLY2OwnXW/arKkauZOTYR871hIaLhJKn824Q/c2CIaFeB/N3NTMaEzB7?= =?us-ascii?Q?YkCLS4Jcrafsjw2Tplw/jRCo466ZqEMqUBuWPNHeSwe5jAqrlRr0LlY1j5yy?= =?us-ascii?Q?JAgWy8M26CMkZUpQAbDBXVPbGvq6eodccGLDp8bkUzqw/H418YQDnh8usWA5?= =?us-ascii?Q?a/MXCDfBvsrgwvUwd25s0W6YdTAxXqL8FtzGvrLZLu0jcX+7l9OUEKFfAmyy?= =?us-ascii?Q?q3DxhQoGAQBsT3+RZnlF+k4g59usVhmHHdVaP9O5HtaxQ2q5qDouJvdz0nUw?= =?us-ascii?Q?5F2yj6/DrGhpn9qOV6tgzgjDSWVOsH8Linvt2U22UpICwE3Mlm9k+DyNy91C?= =?us-ascii?Q?Q7IWVryH6xPnvAZxP+u3aTmo0V1giqfsaypJkX4qshzM+qn8bkEEqi4gvuCN?= =?us-ascii?Q?+ESTOW8mYnnKVvS4p6LcLnvIovD8K+eW1IvYKJHLDHR02dbY1rh7T6j3nsh2?= =?us-ascii?Q?Mo26xxD8LD/QWZIQQp1OKrAiVfFBNKAvfuspZ8/ZNgPbcw9JQgxQf4b65KTz?= =?us-ascii?Q?KWmaPBFCchRZ3zknUORAxP9G+gyazz7Pkrzit735dZx4NnAlhGJIfeYrDemE?= =?us-ascii?Q?vHDAaZ5BcprHc9upWfC8wNjvncT8y/ueVaX9jCUvRTrX+om4Ib2kxF/6nFvV?= =?us-ascii?Q?GrTxpEpgiB/E1vCEjXQSyjEa9an7sDRwebDwR+q1RxWMVcP2c9TPybCpUMvL?= =?us-ascii?Q?uowT7fAz4541wM9wLyyDEerxDDvnDqSCXFchMyX5BUqPbx7W9peY90y35IjC?= =?us-ascii?Q?gea9gytHaWn/xgxviQWWMhC1lOirWpkLN+uFUC4pgqyuKczZkAGcxkjvqPlK?= =?us-ascii?Q?yhI+m86P4HBiyahDZ/6cw5ICYTS6tdlinvcu5DivJI5uERTElTRzpSnz0x0C?= =?us-ascii?Q?AhhQ24zQcL4Pb9Rf1yTq+5rpU4V6w7SSnOcvyjKBFfdyDcRl+DaCooXRWePO?= =?us-ascii?Q?UVUV09qm569W3E4pFtZNqsYR3yuRwrxLtGxMJDqPd?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0706; 6:hywU1Cm4wLvk+D7Ml98E4/43bkrYY1/Pn1KoDlTASa/QTdVEVX/q9lmzOa/0qnzLyKs7i9W1h5hYYCiSPAZBdCBWqcoXhG6Uue89/CFBbNC1jeGAjEYDrQuvOVO9XhJ3ov+VICwHqg/uYJS42EfqdRY02N3Z0VX02CVU+1sc86cUQE3EsgTfUcHSPxvi6rKQVhZrvZWbqXkRVr0uRXgEP6rn3g6g/+aMkHp2MhBQAWXrQiqG0YO4YCJgkwJ0sPvs873Kygfb+25k4KhY/XjGHNeSWIxtGtAJsNsF1lnIQfI=; 5:C+NKj5zmK9BOnPvNaMu4bAcZSnOqDhtCrkPC1IKLUO+y8h17BR28PN6mgC44IcrQB/lrVr0CNiOS+slC6HiCvwv9SbxutIm7gUoI3qeXSlh3ECzGI06aDZxMk4f9jo8M8AFEh2kA10y5Cf+5Ikw4QVkl1VJRPx+1XNgQSqxujD8=; 24:u30C97OTPLfAmQXm2TLX7rC9OjPO/CXU3A9N9DYcKyc7QY08zlhTJ/LnPPE+SkmboO2YrFegN6F1XfnS9wM4v+zdCcX5YA8KSJk/3n44lzY=; 7:g7AZ6JMW7OS9xEJafl5YRvJgm73HKpMo9ZPGvOAwYVRBVKfEh+9hKlIveEF3CkS+OuzgEENsFuq4gDP+Bfa1p/8cRUe7xEQnNGXhoR2kJz9OFC1cmTWR0jSnVbIVgi4Ai+nVjLYCJMd0esuw0aheDX34yNuFYsZwJLkxPgdx+RKmgoZvDNTCZd9D+VYToNpA4SzwrmnekMFvT4BJiTA4poMVYWvuTWEd1HBN0NHT/LY9eOB8yVegmNI/91ZZAZzOLBZXFFbhzy4/VhWulg1hwEd23EYwUnBQehVqM5GYiut7PnN5461VIUifTulhIORT SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2016 03:27:39.9205 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0301MB0706 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: balbi@kernel.org, gregkh@linuxfoundation.org, xiaobo.xie@nxp.com, linux-kernel@vger.kernel.org, pku.leo@gmail.com, linuxppc-dev@lists.ozlabs.org, Zhao Qiang Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" QE was supported on PowerPC, and dependent on PPC, Now it is supported on other platforms. so remove PPCisms. Signed-off-by: Zhao Qiang --- Changes for v2: - na Changes for v3: - add NO_IRQ Changes for v4: - modify spin_event_timeout to opencoded timeout loop - remove NO_IRQ - modify virq_to_hw to opencoed code Changes for v5: - modify commit msg - modify depends of QUICC_ENGINE - add kerneldoc header for qe_issue_cmd Changes for v6: - add dependency on FSL_SOC and PPC32 for drivers depending on QUICC_ENGING but not available on ARM Changes for v7: - split qeic part to another patch - rebase drivers/net/ethernet/freescale/Kconfig | 10 ++--- drivers/soc/fsl/qe/Kconfig | 2 +- drivers/soc/fsl/qe/qe.c | 80 ++++++++++++++++++++-------------- drivers/soc/fsl/qe/qe_io.c | 42 ++++++++---------- drivers/soc/fsl/qe/qe_tdm.c | 8 ++-- drivers/soc/fsl/qe/ucc.c | 10 ++--- drivers/soc/fsl/qe/ucc_fast.c | 68 ++++++++++++++--------------- drivers/tty/serial/Kconfig | 2 +- drivers/usb/gadget/udc/Kconfig | 2 +- drivers/usb/host/Kconfig | 2 +- include/soc/fsl/qe/qe.h | 1 - 11 files changed, 118 insertions(+), 109 deletions(-) diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig index d1ca45f..6677aff 100644 --- a/drivers/net/ethernet/freescale/Kconfig +++ b/drivers/net/ethernet/freescale/Kconfig @@ -5,10 +5,10 @@ config NET_VENDOR_FREESCALE bool "Freescale devices" default y - depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \ - M523x || M527x || M5272 || M528x || M520x || M532x || \ - ARCH_MXC || ARCH_MXS || (PPC_MPC52xx && PPC_BESTCOMM) || \ - ARCH_LAYERSCAPE + depends on FSL_SOC || (QUICC_ENGINE && PPC32) || CPM1 || CPM2 || \ + PPC_MPC512x || M523x || M527x || M5272 || M528x || M520x || \ + M532x || ARCH_MXC || ARCH_MXS || \ + (PPC_MPC52xx && PPC_BESTCOMM) || ARCH_LAYERSCAPE ---help--- If you have a network (Ethernet) card belonging to this class, say Y. @@ -72,7 +72,7 @@ config FSL_XGMAC_MDIO config UCC_GETH tristate "Freescale QE Gigabit Ethernet" - depends on QUICC_ENGINE + depends on QUICC_ENGINE && FSL_SOC && PPC32 select FSL_PQ_MDIO select PHYLIB ---help--- diff --git a/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig index 73a2e08..b26b643 100644 --- a/drivers/soc/fsl/qe/Kconfig +++ b/drivers/soc/fsl/qe/Kconfig @@ -4,7 +4,7 @@ config QUICC_ENGINE bool "Freescale QUICC Engine (QE) Support" - depends on FSL_SOC && PPC32 + depends on OF && HAS_IOMEM select GENERIC_ALLOCATOR select CRC32 help diff --git a/drivers/soc/fsl/qe/qe.c b/drivers/soc/fsl/qe/qe.c index 2707a82..2b53e85 100644 --- a/drivers/soc/fsl/qe/qe.c +++ b/drivers/soc/fsl/qe/qe.c @@ -33,8 +33,6 @@ #include #include #include -#include -#include static void qe_snums_init(void); static int qe_sdma_init(void); @@ -109,15 +107,27 @@ void qe_reset(void) panic("sdma init failed!"); } +/* issue commands to QE, return 0 on success while -EIO on error + * + * @cmd: the command code, should be QE_INIT_TX_RX, QE_STOP_TX and so on + * @device: which sub-block will run the command, QE_CR_SUBBLOCK_UCCFAST1 - 8 + * , QE_CR_SUBBLOCK_UCCSLOW1 - 8, QE_CR_SUBBLOCK_MCC1 - 3, + * QE_CR_SUBBLOCK_IDMA1 - 4 and such on. + * @mcn_protocol: specifies mode for the command for non-MCC, should be + * QE_CR_PROTOCOL_HDLC_TRANSPARENT, QE_CR_PROTOCOL_QMC, QE_CR_PROTOCOL_UART + * and such on. + * @cmd_input: command related data. + */ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input) { unsigned long flags; u8 mcn_shift = 0, dev_shift = 0; - u32 ret; + int ret; + int i; spin_lock_irqsave(&qe_lock, flags); if (cmd == QE_RESET) { - out_be32(&qe_immr->cp.cecr, (u32) (cmd | QE_CR_FLG)); + iowrite32be((cmd | QE_CR_FLG), &qe_immr->cp.cecr); } else { if (cmd == QE_ASSIGN_PAGE) { /* Here device is the SNUM, not sub-block */ @@ -134,20 +144,26 @@ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input) mcn_shift = QE_CR_MCN_NORMAL_SHIFT; } - out_be32(&qe_immr->cp.cecdr, cmd_input); - out_be32(&qe_immr->cp.cecr, - (cmd | QE_CR_FLG | ((u32) device << dev_shift) | (u32) - mcn_protocol << mcn_shift)); + iowrite32be(cmd_input, &qe_immr->cp.cecdr); + iowrite32be((cmd | QE_CR_FLG | ((u32)device << dev_shift) | + (u32)mcn_protocol << mcn_shift), &qe_immr->cp.cecr); } /* wait for the QE_CR_FLG to clear */ - ret = spin_event_timeout((in_be32(&qe_immr->cp.cecr) & QE_CR_FLG) == 0, - 100, 0); + ret = -EIO; + for (i = 0; i < 100; i++) { + if ((ioread32be(&qe_immr->cp.cecr) & QE_CR_FLG) == 0) { + ret = 0; + break; + } + udelay(1); + } + /* On timeout (e.g. failure), the expression will be false (ret == 0), otherwise it will be true (ret == 1). */ spin_unlock_irqrestore(&qe_lock, flags); - return ret == 1; + return ret; } EXPORT_SYMBOL(qe_issue_cmd); @@ -166,8 +182,8 @@ static unsigned int brg_clk = 0; unsigned int qe_get_brg_clk(void) { struct device_node *qe; - int size; - const u32 *prop; + u32 val; + int ret; if (brg_clk) return brg_clk; @@ -179,9 +195,9 @@ unsigned int qe_get_brg_clk(void) return brg_clk; } - prop = of_get_property(qe, "brg-frequency", &size); - if (prop && size == sizeof(*prop)) - brg_clk = *prop; + ret = of_property_read_u32(qe, "brg-frequency", &val); + if (!ret) + brg_clk = val; of_node_put(qe); @@ -221,7 +237,7 @@ int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier) tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) | QE_BRGC_ENABLE | div16; - out_be32(&qe_immr->brg.brgc[brg - QE_BRG1], tempval); + iowrite32be(tempval, &qe_immr->brg.brgc[brg - QE_BRG1]); return 0; } @@ -355,9 +371,9 @@ static int qe_sdma_init(void) return -ENOMEM; } - out_be32(&sdma->sdebcr, (u32) sdma_buf_offset & QE_SDEBCR_BA_MASK); - out_be32(&sdma->sdmr, (QE_SDMR_GLB_1_MSK | - (0x1 << QE_SDMR_CEN_SHIFT))); + iowrite32be((u32)sdma_buf_offset & QE_SDEBCR_BA_MASK, &sdma->sdebcr); + iowrite32be((QE_SDMR_GLB_1_MSK | (0x1 << QE_SDMR_CEN_SHIFT)), + &sdma->sdmr); return 0; } @@ -395,14 +411,14 @@ static void qe_upload_microcode(const void *base, "uploading microcode '%s'\n", ucode->id); /* Use auto-increment */ - out_be32(&qe_immr->iram.iadd, be32_to_cpu(ucode->iram_offset) | - QE_IRAM_IADD_AIE | QE_IRAM_IADD_BADDR); + iowrite32be(be32_to_cpu(ucode->iram_offset) | QE_IRAM_IADD_AIE | + QE_IRAM_IADD_BADDR, &qe_immr->iram.iadd); for (i = 0; i < be32_to_cpu(ucode->count); i++) - out_be32(&qe_immr->iram.idata, be32_to_cpu(code[i])); + iowrite32be(be32_to_cpu(code[i]), &qe_immr->iram.idata); /* Set I-RAM Ready Register */ - out_be32(&qe_immr->iram.iready, be32_to_cpu(QE_IRAM_READY)); + iowrite32be(be32_to_cpu(QE_IRAM_READY), &qe_immr->iram.iready); } /* @@ -487,7 +503,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware) * If the microcode calls for it, split the I-RAM. */ if (!firmware->split) - setbits16(&qe_immr->cp.cercr, QE_CP_CERCR_CIR); + qe_setbits16(&qe_immr->cp.cercr, QE_CP_CERCR_CIR); if (firmware->soc.model) printk(KERN_INFO @@ -521,11 +537,11 @@ int qe_upload_firmware(const struct qe_firmware *firmware) u32 trap = be32_to_cpu(ucode->traps[j]); if (trap) - out_be32(&qe_immr->rsp[i].tibcr[j], trap); + iowrite32be(trap, &qe_immr->rsp[i].tibcr[j]); } /* Enable traps */ - out_be32(&qe_immr->rsp[i].eccr, be32_to_cpu(ucode->eccr)); + iowrite32be(be32_to_cpu(ucode->eccr), &qe_immr->rsp[i].eccr); } qe_firmware_uploaded = 1; @@ -644,9 +660,9 @@ EXPORT_SYMBOL(qe_get_num_of_risc); unsigned int qe_get_num_of_snums(void) { struct device_node *qe; - int size; unsigned int num_of_snums; - const u32 *prop; + u32 val; + int ret; num_of_snums = 28; /* The default number of snum for threads is 28 */ qe = of_find_compatible_node(NULL, NULL, "fsl,qe"); @@ -660,9 +676,9 @@ unsigned int qe_get_num_of_snums(void) return num_of_snums; } - prop = of_get_property(qe, "fsl,qe-num-snums", &size); - if (prop && size == sizeof(*prop)) { - num_of_snums = *prop; + ret = of_property_read_u32(qe, "fsl,qe-num-snums", &val); + if (!ret) { + num_of_snums = val; if ((num_of_snums < 28) || (num_of_snums > QE_NUM_OF_SNUM)) { /* No QE ever has fewer than 28 SNUMs */ pr_err("QE: number of snum is invalid\n"); diff --git a/drivers/soc/fsl/qe/qe_io.c b/drivers/soc/fsl/qe/qe_io.c index 7ae59ab..8966e8b 100644 --- a/drivers/soc/fsl/qe/qe_io.c +++ b/drivers/soc/fsl/qe/qe_io.c @@ -22,8 +22,6 @@ #include #include -#include -#include #undef DEBUG @@ -61,16 +59,16 @@ void __par_io_config_pin(struct qe_pio_regs __iomem *par_io, u8 pin, int dir, pin_mask1bit = (u32) (1 << (QE_PIO_PINS - (pin + 1))); /* Set open drain, if required */ - tmp_val = in_be32(&par_io->cpodr); + tmp_val = ioread32be(&par_io->cpodr); if (open_drain) - out_be32(&par_io->cpodr, pin_mask1bit | tmp_val); + iowrite32be(pin_mask1bit | tmp_val, &par_io->cpodr); else - out_be32(&par_io->cpodr, ~pin_mask1bit & tmp_val); + iowrite32be(~pin_mask1bit & tmp_val, &par_io->cpodr); /* define direction */ tmp_val = (pin > (QE_PIO_PINS / 2) - 1) ? - in_be32(&par_io->cpdir2) : - in_be32(&par_io->cpdir1); + ioread32be(&par_io->cpdir2) : + ioread32be(&par_io->cpdir1); /* get all bits mask for 2 bit per port */ pin_mask2bits = (u32) (0x3 << (QE_PIO_PINS - @@ -82,34 +80,30 @@ void __par_io_config_pin(struct qe_pio_regs __iomem *par_io, u8 pin, int dir, /* clear and set 2 bits mask */ if (pin > (QE_PIO_PINS / 2) - 1) { - out_be32(&par_io->cpdir2, - ~pin_mask2bits & tmp_val); + iowrite32be(~pin_mask2bits & tmp_val, &par_io->cpdir2); tmp_val &= ~pin_mask2bits; - out_be32(&par_io->cpdir2, new_mask2bits | tmp_val); + iowrite32be(new_mask2bits | tmp_val, &par_io->cpdir2); } else { - out_be32(&par_io->cpdir1, - ~pin_mask2bits & tmp_val); + iowrite32be(~pin_mask2bits & tmp_val, &par_io->cpdir1); tmp_val &= ~pin_mask2bits; - out_be32(&par_io->cpdir1, new_mask2bits | tmp_val); + iowrite32be(new_mask2bits | tmp_val, &par_io->cpdir1); } /* define pin assignment */ tmp_val = (pin > (QE_PIO_PINS / 2) - 1) ? - in_be32(&par_io->cppar2) : - in_be32(&par_io->cppar1); + ioread32be(&par_io->cppar2) : + ioread32be(&par_io->cppar1); new_mask2bits = (u32) (assignment << (QE_PIO_PINS - (pin % (QE_PIO_PINS / 2) + 1) * 2)); /* clear and set 2 bits mask */ if (pin > (QE_PIO_PINS / 2) - 1) { - out_be32(&par_io->cppar2, - ~pin_mask2bits & tmp_val); + iowrite32be(~pin_mask2bits & tmp_val, &par_io->cppar2); tmp_val &= ~pin_mask2bits; - out_be32(&par_io->cppar2, new_mask2bits | tmp_val); + iowrite32be(new_mask2bits | tmp_val, &par_io->cppar2); } else { - out_be32(&par_io->cppar1, - ~pin_mask2bits & tmp_val); + iowrite32be(~pin_mask2bits & tmp_val, &par_io->cppar1); tmp_val &= ~pin_mask2bits; - out_be32(&par_io->cppar1, new_mask2bits | tmp_val); + iowrite32be(new_mask2bits | tmp_val, &par_io->cppar1); } } EXPORT_SYMBOL(__par_io_config_pin); @@ -137,12 +131,12 @@ int par_io_data_set(u8 port, u8 pin, u8 val) /* calculate pin location */ pin_mask = (u32) (1 << (QE_PIO_PINS - 1 - pin)); - tmp_val = in_be32(&par_io[port].cpdata); + tmp_val = ioread32be(&par_io[port].cpdata); if (val == 0) /* clear */ - out_be32(&par_io[port].cpdata, ~pin_mask & tmp_val); + iowrite32be(~pin_mask & tmp_val, &par_io[port].cpdata); else /* set */ - out_be32(&par_io[port].cpdata, pin_mask | tmp_val); + iowrite32be(pin_mask | tmp_val, &par_io[port].cpdata); return 0; } diff --git a/drivers/soc/fsl/qe/qe_tdm.c b/drivers/soc/fsl/qe/qe_tdm.c index a1048b4..818e679 100644 --- a/drivers/soc/fsl/qe/qe_tdm.c +++ b/drivers/soc/fsl/qe/qe_tdm.c @@ -227,10 +227,10 @@ void ucc_tdm_init(struct ucc_tdm *utdm, struct ucc_tdm_info *ut_info) &siram[siram_entry_id * 32 + 0x200 + i]); } - setbits16(&siram[(siram_entry_id * 32) + (utdm->num_of_ts - 1)], - SIR_LAST); - setbits16(&siram[(siram_entry_id * 32) + 0x200 + (utdm->num_of_ts - 1)], - SIR_LAST); + qe_setbits16(&siram[(siram_entry_id * 32) + (utdm->num_of_ts - 1)], + SIR_LAST); + qe_setbits16(&siram[(siram_entry_id * 32) + 0x200 + + (utdm->num_of_ts - 1)], SIR_LAST); /* Set SIxMR register */ sixmr = SIMR_SAD(siram_entry_id); diff --git a/drivers/soc/fsl/qe/ucc.c b/drivers/soc/fsl/qe/ucc.c index c646d87..bc64b83 100644 --- a/drivers/soc/fsl/qe/ucc.c +++ b/drivers/soc/fsl/qe/ucc.c @@ -39,7 +39,7 @@ int ucc_set_qe_mux_mii_mng(unsigned int ucc_num) return -EINVAL; spin_lock_irqsave(&cmxgcr_lock, flags); - clrsetbits_be32(&qe_immr->qmx.cmxgcr, QE_CMXGCR_MII_ENET_MNG, + qe_clrsetbits32(&qe_immr->qmx.cmxgcr, QE_CMXGCR_MII_ENET_MNG, ucc_num << QE_CMXGCR_MII_ENET_MNG_SHIFT); spin_unlock_irqrestore(&cmxgcr_lock, flags); @@ -84,7 +84,7 @@ int ucc_set_type(unsigned int ucc_num, enum ucc_speed_type speed) return -EINVAL; } - clrsetbits_8(guemr, UCC_GUEMR_MODE_MASK, + qe_clrsetbits8(guemr, UCC_GUEMR_MODE_MASK, UCC_GUEMR_SET_RESERVED3 | speed); return 0; @@ -113,9 +113,9 @@ int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask) get_cmxucr_reg(ucc_num, &cmxucr, ®_num, &shift); if (set) - setbits32(cmxucr, mask << shift); + qe_setbits32(cmxucr, mask << shift); else - clrbits32(cmxucr, mask << shift); + qe_clrbits32(cmxucr, mask << shift); return 0; } @@ -211,7 +211,7 @@ int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock, if (mode == COMM_DIR_RX) shift += 4; - clrsetbits_be32(cmxucr, QE_CMXUCR_TX_CLK_SRC_MASK << shift, + qe_clrsetbits32(cmxucr, QE_CMXUCR_TX_CLK_SRC_MASK << shift, clock_bits << shift); return 0; diff --git a/drivers/soc/fsl/qe/ucc_fast.c b/drivers/soc/fsl/qe/ucc_fast.c index 83d8d16..3a0224c 100644 --- a/drivers/soc/fsl/qe/ucc_fast.c +++ b/drivers/soc/fsl/qe/ucc_fast.c @@ -33,41 +33,41 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf) printk(KERN_INFO "Base address: 0x%p\n", uccf->uf_regs); printk(KERN_INFO "gumr : addr=0x%p, val=0x%08x\n", - &uccf->uf_regs->gumr, in_be32(&uccf->uf_regs->gumr)); + &uccf->uf_regs->gumr, ioread32be(&uccf->uf_regs->gumr)); printk(KERN_INFO "upsmr : addr=0x%p, val=0x%08x\n", - &uccf->uf_regs->upsmr, in_be32(&uccf->uf_regs->upsmr)); + &uccf->uf_regs->upsmr, ioread32be(&uccf->uf_regs->upsmr)); printk(KERN_INFO "utodr : addr=0x%p, val=0x%04x\n", - &uccf->uf_regs->utodr, in_be16(&uccf->uf_regs->utodr)); + &uccf->uf_regs->utodr, ioread16be(&uccf->uf_regs->utodr)); printk(KERN_INFO "udsr : addr=0x%p, val=0x%04x\n", - &uccf->uf_regs->udsr, in_be16(&uccf->uf_regs->udsr)); + &uccf->uf_regs->udsr, ioread16be(&uccf->uf_regs->udsr)); printk(KERN_INFO "ucce : addr=0x%p, val=0x%08x\n", - &uccf->uf_regs->ucce, in_be32(&uccf->uf_regs->ucce)); + &uccf->uf_regs->ucce, ioread32be(&uccf->uf_regs->ucce)); printk(KERN_INFO "uccm : addr=0x%p, val=0x%08x\n", - &uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm)); + &uccf->uf_regs->uccm, ioread32be(&uccf->uf_regs->uccm)); printk(KERN_INFO "uccs : addr=0x%p, val=0x%02x\n", - &uccf->uf_regs->uccs, in_8(&uccf->uf_regs->uccs)); + &uccf->uf_regs->uccs, ioread8(&uccf->uf_regs->uccs)); printk(KERN_INFO "urfb : addr=0x%p, val=0x%08x\n", - &uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb)); + &uccf->uf_regs->urfb, ioread32be(&uccf->uf_regs->urfb)); printk(KERN_INFO "urfs : addr=0x%p, val=0x%04x\n", - &uccf->uf_regs->urfs, in_be16(&uccf->uf_regs->urfs)); + &uccf->uf_regs->urfs, ioread16be(&uccf->uf_regs->urfs)); printk(KERN_INFO "urfet : addr=0x%p, val=0x%04x\n", - &uccf->uf_regs->urfet, in_be16(&uccf->uf_regs->urfet)); + &uccf->uf_regs->urfet, ioread16be(&uccf->uf_regs->urfet)); printk(KERN_INFO "urfset: addr=0x%p, val=0x%04x\n", - &uccf->uf_regs->urfset, in_be16(&uccf->uf_regs->urfset)); + &uccf->uf_regs->urfset, ioread16be(&uccf->uf_regs->urfset)); printk(KERN_INFO "utfb : addr=0x%p, val=0x%08x\n", - &uccf->uf_regs->utfb, in_be32(&uccf->uf_regs->utfb)); + &uccf->uf_regs->utfb, ioread32be(&uccf->uf_regs->utfb)); printk(KERN_INFO "utfs : addr=0x%p, val=0x%04x\n", - &uccf->uf_regs->utfs, in_be16(&uccf->uf_regs->utfs)); + &uccf->uf_regs->utfs, ioread16be(&uccf->uf_regs->utfs)); printk(KERN_INFO "utfet : addr=0x%p, val=0x%04x\n", - &uccf->uf_regs->utfet, in_be16(&uccf->uf_regs->utfet)); + &uccf->uf_regs->utfet, ioread16be(&uccf->uf_regs->utfet)); printk(KERN_INFO "utftt : addr=0x%p, val=0x%04x\n", - &uccf->uf_regs->utftt, in_be16(&uccf->uf_regs->utftt)); + &uccf->uf_regs->utftt, ioread16be(&uccf->uf_regs->utftt)); printk(KERN_INFO "utpt : addr=0x%p, val=0x%04x\n", - &uccf->uf_regs->utpt, in_be16(&uccf->uf_regs->utpt)); + &uccf->uf_regs->utpt, ioread16be(&uccf->uf_regs->utpt)); printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n", - &uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry)); + &uccf->uf_regs->urtry, ioread32be(&uccf->uf_regs->urtry)); printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n", - &uccf->uf_regs->guemr, in_8(&uccf->uf_regs->guemr)); + &uccf->uf_regs->guemr, ioread8(&uccf->uf_regs->guemr)); } EXPORT_SYMBOL(ucc_fast_dump_regs); @@ -89,7 +89,7 @@ EXPORT_SYMBOL(ucc_fast_get_qe_cr_subblock); void ucc_fast_transmit_on_demand(struct ucc_fast_private * uccf) { - out_be16(&uccf->uf_regs->utodr, UCC_FAST_TOD); + iowrite16be(UCC_FAST_TOD, &uccf->uf_regs->utodr); } EXPORT_SYMBOL(ucc_fast_transmit_on_demand); @@ -101,7 +101,7 @@ void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode) uf_regs = uccf->uf_regs; /* Enable reception and/or transmission on this UCC. */ - gumr = in_be32(&uf_regs->gumr); + gumr = ioread32be(&uf_regs->gumr); if (mode & COMM_DIR_TX) { gumr |= UCC_FAST_GUMR_ENT; uccf->enabled_tx = 1; @@ -110,7 +110,7 @@ void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode) gumr |= UCC_FAST_GUMR_ENR; uccf->enabled_rx = 1; } - out_be32(&uf_regs->gumr, gumr); + iowrite32be(gumr, &uf_regs->gumr); } EXPORT_SYMBOL(ucc_fast_enable); @@ -122,7 +122,7 @@ void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode) uf_regs = uccf->uf_regs; /* Disable reception and/or transmission on this UCC. */ - gumr = in_be32(&uf_regs->gumr); + gumr = ioread32be(&uf_regs->gumr); if (mode & COMM_DIR_TX) { gumr &= ~UCC_FAST_GUMR_ENT; uccf->enabled_tx = 0; @@ -131,7 +131,7 @@ void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode) gumr &= ~UCC_FAST_GUMR_ENR; uccf->enabled_rx = 0; } - out_be32(&uf_regs->gumr, gumr); + iowrite32be(gumr, &uf_regs->gumr); } EXPORT_SYMBOL(ucc_fast_disable); @@ -263,7 +263,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc gumr |= uf_info->tenc; gumr |= uf_info->tcrc; gumr |= uf_info->mode; - out_be32(&uf_regs->gumr, gumr); + iowrite32be(gumr, &uf_regs->gumr); /* Allocate memory for Tx Virtual Fifo */ uccf->ucc_fast_tx_virtual_fifo_base_offset = @@ -290,15 +290,15 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc } /* Set Virtual Fifo registers */ - out_be16(&uf_regs->urfs, uf_info->urfs); - out_be16(&uf_regs->urfet, uf_info->urfet); - out_be16(&uf_regs->urfset, uf_info->urfset); - out_be16(&uf_regs->utfs, uf_info->utfs); - out_be16(&uf_regs->utfet, uf_info->utfet); - out_be16(&uf_regs->utftt, uf_info->utftt); + iowrite16be(uf_info->urfs, &uf_regs->urfs); + iowrite16be(uf_info->urfet, &uf_regs->urfet); + iowrite16be(uf_info->urfset, &uf_regs->urfset); + iowrite16be(uf_info->utfs, &uf_regs->utfs); + iowrite16be(uf_info->utfet, &uf_regs->utfet); + iowrite16be(uf_info->utftt, &uf_regs->utftt); /* utfb, urfb are offsets from MURAM base */ - out_be32(&uf_regs->utfb, uccf->ucc_fast_tx_virtual_fifo_base_offset); - out_be32(&uf_regs->urfb, uccf->ucc_fast_rx_virtual_fifo_base_offset); + iowrite32be(uccf->ucc_fast_tx_virtual_fifo_base_offset, &uf_regs->utfb); + iowrite32be(uccf->ucc_fast_rx_virtual_fifo_base_offset, &uf_regs->urfb); /* Mux clocking */ /* Grant Support */ @@ -366,14 +366,14 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc } /* Set interrupt mask register at UCC level. */ - out_be32(&uf_regs->uccm, uf_info->uccm_mask); + iowrite32be(uf_info->uccm_mask, &uf_regs->uccm); /* First, clear anything pending at UCC level, * otherwise, old garbage may come through * as soon as the dam is opened. */ /* Writing '1' clears */ - out_be32(&uf_regs->ucce, 0xffffffff); + iowrite32be(0xffffffff, &uf_regs->ucce); *uccf_ret = uccf; return 0; diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 518db24a..d436c5d 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1153,7 +1153,7 @@ config SERIAL_LANTIQ config SERIAL_QE tristate "Freescale QUICC Engine serial port support" - depends on QUICC_ENGINE + depends on QUICC_ENGINE && FSL_SOC && PPC32 select SERIAL_CORE select FW_LOADER default n diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig index 658b8da..e18168c 100644 --- a/drivers/usb/gadget/udc/Kconfig +++ b/drivers/usb/gadget/udc/Kconfig @@ -277,7 +277,7 @@ config USB_AMD5536UDC config USB_FSL_QE tristate "Freescale QE/CPM USB Device Controller" - depends on FSL_SOC && (QUICC_ENGINE || CPM) + depends on (FSL_SOC && QUICC_ENGINE && PPC32) || (FSL_SOC && CPM) help Some of Freescale PowerPC processors have a Full Speed QE/CPM2 USB controller, which support device mode with 4 diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 2e710a4..24019cc 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -638,7 +638,7 @@ config USB_UHCI_BIG_ENDIAN_DESC config USB_FHCI_HCD tristate "Freescale QE USB Host Controller support" - depends on OF_GPIO && QE_GPIO && QUICC_ENGINE + depends on OF_GPIO && QE_GPIO && QUICC_ENGINE && FSL_SOC && PPC32 select FSL_GTM select QE_USB help diff --git a/include/soc/fsl/qe/qe.h b/include/soc/fsl/qe/qe.h index 70339d7..f7a14f2 100644 --- a/include/soc/fsl/qe/qe.h +++ b/include/soc/fsl/qe/qe.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include