From patchwork Mon Dec 5 04:56:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Zhao X-Patchwork-Id: 702568 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 [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tXCXR6LKxz9t1B for ; Mon, 5 Dec 2016 16:11:19 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tXCXR5VGDzDw5G for ; Mon, 5 Dec 2016 16:11:19 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0056.outbound.protection.outlook.com [104.47.36.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tXCWF5yFMzDvkB for ; Mon, 5 Dec 2016 16:10:17 +1100 (AEDT) Received: from BY2PR03CA039.namprd03.prod.outlook.com (10.141.249.12) by BY2PR0301MB0742.namprd03.prod.outlook.com (10.160.63.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13; Mon, 5 Dec 2016 05:10:12 +0000 Received: from BL2FFO11FD033.protection.gbl (2a01:111:f400:7c09::181) by BY2PR03CA039.outlook.office365.com (2a01:111:e400:2c5d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9 via Frontend Transport; Mon, 5 Dec 2016 05:10:12 +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 BL2FFO11FD033.mail.protection.outlook.com (10.173.161.129) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Mon, 5 Dec 2016 05:10:11 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:612; Count:8 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id uB55A7uU001435; Sun, 4 Dec 2016 22:10:07 -0700 From: Zhao Qiang To: Subject: [PATCH v9] QE: remove PPCisms for QE Date: Mon, 5 Dec 2016 12:56:49 +0800 Message-ID: <1480913809-23817-1-git-send-email-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-IncomingHeaderCount: 8 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131253882115280306; (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)(336004)(339900001)(199003)(189002)(39450400002)(39380400001)(39400400001)(39410400001)(38730400001)(85426001)(626004)(92566002)(68736007)(48376002)(50466002)(189998001)(39860400001)(39840400001)(39850400001)(77096006)(36756003)(86362001)(2906002)(305945005)(8936002)(105606002)(356003)(6666003)(6916009)(106466001)(110136003)(97736004)(8666005)(7846002)(47776003)(4326007)(81156014)(81166006)(2351001)(5660300001)(33646002)(50226002)(8676002)(5003940100001)(50986999)(104016004)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0742; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD033; 1:nq4i+IkP2ev5F6hzVbD55KKAi1QH1M9tDg5SgrEtn543oxNElDHElUeHAlVy6Hw+ulqFEN4X+lMeKrdFccxGzf7inFpk/gm6iUV3nAzroe8HDUlvS8fsvfb7vFcex/XGu3taMKbrPMoEF4ZOGrqyijcbDyynq9zw62w2WZMYri7+0+P7oQQxFptflR7a6vBLopOIgsE8hXmSqTjhA4YVQQSjV1iX6PEiaVMysP0Y4w7ECbl41zVsifKkKneaHiL8Nzv3pV4dsClYbXIn74JjSZQLrX9gMv0lTUfMQ3P0KZrBMRScOfWyQMDwkYZ83l6jw4hD8KMslNrp333XM6DcijCrH1gna+mgZhc9hL+yVjD4dOC6ZEP9XHBBgTgTZtLI4VIpiQd/2pMz8nEG8ASUEUfT41VHURivuUczW+S1lMdIpNGKrPVip9R6GvW9F+tDJUW18+mgRNnPnk3Q2c2YWo8GRcMrLwgL6438A0jviLHqkYeOpoh+4pKfUDxjD9nOvHiu8sWKMM11EoSSP/P/HtEF+B0Tq2sJWtvulDCq7nYm/0p+apcIho5C1iyGJYesNAY5MJgrGm+HAGBC7THhGhaCnYUrXz3BgI2e5ywVHAbn7+glC49i64B9phtzu6kidU3MRqCzfX3pfNoQG/dkoBTIih63ayj6MNdkXFaOIZw5uCRHH2pp2C+FULLxF3c1mvT3rg2WYxIjCh9d6DrJOcCo8E+mije22HUiQ/xNUbs= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 452c2f00-0e6e-427c-42b2-08d41cccfd43 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 3:4pyfTmTcuT763kfmdcQakSOkNNii41U/GTIv6cBUbvTZxK75uNXWWcorTdGLIBXEHrWkG7291gDMOei+6SjA028tm7sAhw0Io3kpG66MGrFn/oBrRdqS5/BGfMxjFQD2U7ZD/ODfXNtiyq7cH75D1iKPiCAE/6S84KNpTpOyTumimfhw0lNY06XUtaAzBEWfMmEBP5u+dYbfYxijgVMeIe/TsrGt84/lsYPwO6CMxzb4ShA4zBJksF7Qo+yG7OpbNXsKH0+pAoNNuT0LmiXxI2EW5ZWu1zWIzHq6hiuKIhmo/csz7Q9VL1p+McaaFkRdZA6RsyPbsbr1LJfnYAeXseWPpMx21Oz+/dtPYklJpeBh8CA4wLIfajhNEURvs7e+ X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 25:mMMCYxvl9B0IbAPoGLDLjzkhqsZSgZ+F4WC1j9sph2a6fp0K3EacIrmdAg2KvjXjzRHxd+LJ0VTJ0P3ds9/zgV/QNIXKXrbCit6jGrOC0M+8AlAWBItBVJpIAYXsIBMxDORPwKre6WrYFQOcTTLv/duYWfCfcQR1U/kbHh5nHv8oRtQ8npCnxHT2h5aDX3bGIsd4ByMhBboH/ozm42/lU57lYi5VNhrE8imnV52KtFHeJ59LWkWmBIcPihYmj3ewmLI+rzHCQ7FOPOuRsaNdV/X3lntgJjG8U3e7JFFCb1YHdeoqd2y8Tgj2Vio9nb3Er1EqWKwsih3YWgdMoj326Nhhy5v6fAyXTSZ+ZD++1TQCX/GBIvoDj1RnCIMQKYhFe4h1/p9OthgqQsY8+xo8/927NTQtoxTgk3ZoMeqVH1slwTBxX8/aseRnWNpTnGt6J1kGODKid/XyXwIG7X/XCppzFBJTODuECpsLbcEgRvVHqIotGat59LQxMVWjb8d9zKc68NQidv+O2lCeXUiwf+Bhk1v5kYMUZSaNAVdfRo/d4ZDiFmunUVWQ83+bUpYGP1GxjnjDvsLNC7VP+gElJnMhal/Q36rDL6xYNWB5st97jJDhL+x7OeqjxxCq/tzPJzuam7zx2ulxGaT/wykTd9IboYOKe5LOzWaqsJNAz4FXsocqd1gKB8KTUS4s5+ZroEzK/u33NBEl5nI5XdH6hVxCHCDBIvZ5Gqi5R0cTUO+gyWAViq6YKm+mmbg320mC X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 31:IghRzj9l6xtVFC8JxbZ7E8ftKUc6HXPihJhnHcakeFr7z0HyMEk7zzYaCJUKGI6+szchR8r79L28u3yDJ5HdwxtgEPCUrKH8kMRPL4ABqZMBmX5GT7VpOQjSng1WfALTjDLtRWnBwCOJsnhPSBbvWirHLHlVfWelmK+KrsI+XOutYXNpt/W6GhKqrYqDbGfg7d5NdTDmxyBGvLF9ZUWXzN+KXtlKJK7iqhIQq5G2pIGKhNI4uW3+ClZD0riNCr9kecU04vHzw6xzVWtkJJaZozzfJI12s+29gC0Y3T5Uew4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13017025)(13023025)(13015025)(13024025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123561025)(20161123559025)(20161123556025)(20161123563025); SRVR:BY2PR0301MB0742; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 4:0/kDr//YftujgtoQCxbO71ImHeLsmDNb/5VK1Xj83vPV77VvXxAgSqJ8LMARVtjLQ4qL/+zLpPgZ3jMFSy+gGPSDD1dgj/6FJkUR/ZG9suT8DaJUk1h4otbL+MUBmre9Na4Ti/h3wZSBjA8q0VF3H8DBdZg9TBSuHZ4/EzCZvqYwJA2AP3Fzcc5NNuwOD8hjq/Vfcym20pdMPrB20r/tgNPfLs83eWkUdLQdAYbOol07d5UdWQS917kqxmaOJXRgbpMABpBy+7QbDZmsdppyxrykYLWqyf/GFAA8nRnVLw+74NbGKerN2BUnQlCSp0sMWGdOC/ke75wLAeVyjQZ9hKPj34RZ4RgUYcNOGaXo8MBqNFeVwIW13RZiG4YhIt/iVnxO66AixVerGKq4unwvx4F5igavtFCqDSvkH+cEuXIUusFOIY6NzB3C6aPfk7lIR3BrmZmBBuwR7uGL2ZqcYqeNe6vf6B4MZ9P4No7whXnfbbhkcAF0j0N/fB3fKAX3hIkPiYcJsnc6YvT+rDJ+tg4H+d/eKYEsPj5o2ESTH9dPERKQ+GWW3CJ+9rvNIgjPP0jC+FHov/NgywKiR6ptC1nNUGEXsQqgpFwXHfPo0M0UJyRJNdD/+o3DuH1FCpx5ad8E/GeBChOAj+8wpSNu89m5GFD9/q/yw27IpRkc8qwFBoMeNmV8lzrYonzqpM1b4kDaJH03Ziv4knGgVeddtiakU8C6nIMEeW0d0pldGgxZHmNGmkWqrRAWay2mlAlu X-Forefront-PRVS: 0147E151B5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0742; 23:w4ITSU4oY2gsmw1BsfY2dD91G13hvCh3pr+Zawq?= =?us-ascii?Q?uMUPRkVKAO8QobEE53hmLO0kJEyo4O45QH0ZRSHJvGBlHGTYYc+H9N94ipH4?= =?us-ascii?Q?yvU63gLvFCtJn0oj0YyznzRB7RSv4h9CCtNeAia+gDZaARFnIwiUtoWiV855?= =?us-ascii?Q?Neu8e7sDsq1nGn8kfS7MnbAZ45hI2nVAYePSmjsbZlrMpTn1BXgZrRjiRm8g?= =?us-ascii?Q?zeffSCqvQ4AoWmFGxfvcR0M+9zrGjB3p1Y20f8xd6I+txGif/5cPKvoGeXb4?= =?us-ascii?Q?bB9mA6wOLptg3Y4C8l6A0dx6RPm0sPVCz7TY2wXCuDcr9E0QyFDR7QgmoUXE?= =?us-ascii?Q?WWM2TbtEQWn9b09RX4oyIXFIt3HbUZ7Hr4NNd0nuDaksDykTFDAAywrb9h50?= =?us-ascii?Q?ezFUPGbW6d07GfJa56VIuRP00321X3Srja+4cLuaf2AqkJImCiIQuUT+Qupc?= =?us-ascii?Q?A9lLST9zZVj9voppulDSvGgSHOFNkW8tqcC/y3z1wuIuga7trcU0IaOFq7Jp?= =?us-ascii?Q?1LQNiZ+buAiGmW3f3dMkK4c3CqSa7dW4Q6kwmP8lbvioyulINSG+b3BNj5+2?= =?us-ascii?Q?jjm6QT4nHyALGOyKrgqqTNfWKI33fqdO7jLbDzU0wKn6Q5vwQnyITz4MniNq?= =?us-ascii?Q?VQYQFFO26cZe/mzB1MktWIH7+fxEIF1op2YpyVryrNzxuxtuHWkwGQlpPwan?= =?us-ascii?Q?tyewlZ3QzBUyMZEE06N/TH58ist3B6EMZbwrXxawxV1jCb4l3rrXoYNwIY+O?= =?us-ascii?Q?7ZT28RH9tTWe5db1U/gpbEo+a7wBzs07LQkZJogqnV/mU54DB7JEd+O/cZ0t?= =?us-ascii?Q?4S6706zidbXqakx01jgwXr5ep/APjUpisFTw9NsDJVWutldudGMLPk8mZGlG?= =?us-ascii?Q?HoJ5P0DwotqSmGau0msVOPx7JeMUfZLH1joem7hBVevKzkGWOBTcHtX3cgsA?= =?us-ascii?Q?2yDHwD/OnixbLVC04O2eigm+PgSytzvbMFyhLUTB+MQDmWesH/W1VpjrNWJJ?= =?us-ascii?Q?CPTN86i20LgbTYcnQj2m90dXLv+Obnhi81fNdj87SZtROInew061HOahcaWA?= =?us-ascii?Q?K/Qii3vzpvwcKBV6Od2jIQjVAiIt0sN6qHSr1DvzdPs40wiE+JGRoxiJc+79?= =?us-ascii?Q?4gKldRFnnKblNWtaiAZgJ3aPk7WixvFhS27HDrX2WRZYWT2dsPr2BjAaCfnX?= =?us-ascii?Q?LiQicdzn89vpBvwsvUkKyMAz12oO+EHrzBHGGrEGC2zzARvKziGw/SP9eU7g?= =?us-ascii?Q?RMQAXBXsmebTmiD2pOEU=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 6:KINEOU5JeXyL15gByrPR0RA/g8whOx4grTItKcXOqOpyG3UL3z9zDmAAkuvZtnLKa3CDFzyiT9s/aujIt0kUEOI5/lRmSz8GLgYpmAa2P+q02HhFMoQRHXBNlAPC/RMXeF/FMzbb+kKPavzbEluXGpSku1aKDQRzOVGIsFzNIaAYwbbxPYQzNSLnhb6/yDFqcL9iCnxOWtDuLLWYq/HO9ZYjBuHnyZdrA38NBDKh59jE6cARqP50Q/1/HmP9ulGwlZxJRhuQYlu5lDvGVk1fSKELT657r78/6mjsx4taL65Unghn+zpETyFWHzsFDxksWuqXhNIwMXcwlCLlkAV9BUBVLFw+BD7pH0DCCAbufkQzLwCcBhvNTuEOSwzclu3/HQ9vmnrKprCp0tVzoDALhcO3BfImlO+/0XBuZGNpJH7mVJi/Pcy9sMDpJvwr0Abq; 5:oFFPOVpYOYpoEm0ac6jn4cGx6p1bMfBpwM0Pr/sn7YlmxOrkqCF+wejWYv41Q0qlwsvLZEJgCHbYT2jVWsjo1o5piC4DSxlNlXKfhbFImMtRKreWg5PSujpDJ63MV5mEp+QG/hRQ5cBRYT/jXpebMFlEzhIbIB7zBcVzvYwFhIyk1cmdJ1IiEzQC6CQJaZUD; 24:3HxPqqASo0HxRegMqAFDHidhiS9eAzPiPNkhQ2hWWk3mtAi+1t7hLqaxfonFGZeRbAnb4Mx9ajtoLLtNLYtpMg8RKiGDXjrPUPMeyJZsu9o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 7:/9rVmqaG0VqrZhkVhY/j7E1Ty7lpbHM4I4XUuSK2PmIhgSJCustCIKpIQuaS6KgG0dP2UM0fqZCxogmmLCkH1CLlJQbOiw8UHymWGgXSfYfak94CvAgESjTQRrSW+jtS9TeSwO85tlBhdk27LndvfYgBSHoIkt5DWeUa+WYgP9iQuKSuqffmzLaXHp8q+wAXm0nkjIxMfkaPhBvi4xfl0KpfjqiEMhK0jVZYPpuJP+p2fkEBh74WBKicDWKhU+b4mlNtNzlr6XDN7oXDtX3PoRcxo227YxXF7Cx2S3zvLH1379IF7F+KjsJs+oTjXBaex3AhJTiMzZCETLBhRTajEjLa7hNAncD9MQ3w4+yrQmFFKecA/5aby6XjyBkI9adH5ruCra3F0cvv5Fe70kcnCShn9JXTnssQ/CluPgMxMUQN8GfGJg9pR3YJPKZ7P5mqw5bs28FZHrOmMaAIT2FUrw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2016 05:10:11.2316 (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: BY2PR0301MB0742 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, 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 Changes for v8: - include in ucc_uart Changes for v9: - fix cast warning 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 | 74 ++++++++++++++++--------------- drivers/tty/serial/Kconfig | 2 +- drivers/tty/serial/ucc_uart.c | 1 + drivers/usb/gadget/udc/Kconfig | 2 +- drivers/usb/host/Kconfig | 2 +- include/soc/fsl/qe/qe.h | 1 - 12 files changed, 123 insertions(+), 111 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..5115e93 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,12 +263,13 @@ 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 = qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT); - if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) { + if (IS_ERR_VALUE((unsigned long)uccf-> + ucc_fast_tx_virtual_fifo_base_offset)) { printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n", __func__); uccf->ucc_fast_tx_virtual_fifo_base_offset = 0; @@ -281,7 +282,8 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc qe_muram_alloc(uf_info->urfs + UCC_FAST_RECEIVE_VIRTUAL_FIFO_SIZE_FUDGE_FACTOR, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT); - if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) { + if (IS_ERR_VALUE((unsigned long)uccf-> + ucc_fast_rx_virtual_fifo_base_offset)) { printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n", __func__); uccf->ucc_fast_rx_virtual_fifo_base_offset = 0; @@ -290,15 +292,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 +368,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/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index 481eb29..ee409fd 100644 --- a/drivers/tty/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c @@ -34,6 +34,7 @@ #include #include +#include #include /* 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