From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758928AbcAUIC2 (ORCPT ); Thu, 21 Jan 2016 03:02:28 -0500 Received: from mail-by2on0110.outbound.protection.outlook.com ([207.46.100.110]:52544 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751037AbcAUICR (ORCPT ); Thu, 21 Jan 2016 03:02:17 -0500 Authentication-Results: spf=permerror (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=freescale.com; From: Yuan Yao To: , , CC: , , Subject: [PATCH v3 1/3] mtd: spi-nor: fsl-quadspi: add big-endian support Date: Thu, 21 Jan 2016 15:53:54 +0800 Message-ID: <1453362836-44377-2-git-send-email-yao.yuan@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1453362836-44377-1-git-send-email-yao.yuan@freescale.com> References: <1453362836-44377-1-git-send-email-yao.yuan@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD028;1:HTFJrk1nT0WBbroH55z39VvKhJRNeR1DAE7+EQhZgwhN1AGzufGAELwVY3mI5QL7pVm09laYahtEGvZRyz6+OTjJyHv1tUo5sKdahonaGZZOhiSuL3o7ka9GRqjH9OP9tQ/ARms9+Dc8t7+wuNYG4D6c/DGd5S415l5M6t879JHOwCManJW4hJRPuix0ScCERP8kPVfRELoDLQRVK2hJFlWWChmmivr2rzGpv1xNmm+y/zQ/jlQXXckEAQOtj5jTVJmQFylUKjYorrObjteDo8x8oiKNzXx2Wgw+uUQXLiDqtXtfxb+vjtH3gOqL5xW5EbCoWi+tBFc4BfzvXyI/p0XX1NEKY5VnpKWNW/CQx6eM7jmdXtqksC0uuFjR99Tgvs7gSZKbj9L5lxB3jl6GfiOkuZ/Wivn1K+G2D9JUFUQrO/dP1u4HSZwUDpFgyv+lNStMbTaiuCDo0TFLFalSVA== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(448002)(199003)(479174004)(189002)(586003)(2950100001)(189998001)(50986999)(5008740100001)(104016004)(6806005)(97736004)(19580405001)(19580395003)(76176999)(5001770100001)(50466002)(85326001)(47776003)(4001450100002)(48376002)(5001960100002)(229853001)(92566002)(87936001)(1096002)(86362001)(575784001)(106466001)(81156007)(1220700001)(77096005)(2906002)(5003940100001)(2201001)(36756003)(33646002)(11100500001)(4326007)(50226001)(7059030);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR03MB065;H:tx30smr01.am.freescale.net;FPR:;SPF:PermError;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 7383bca2-8d85-4275-295f-08d322392bce X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB065;2:l4lECaZCnZOjx9JU7jofXljMxX4Hj299mK+IIXoTfvTjSTsoA+4jQKiqO68sPzrGV5jSj/QJDxaze0TOTAmHCViB205NZtOd9MvLHGGWIWayFiyM5Duc7S97JDOOwZKymVr7IcL8WNmry6BkWga7XI62UWd4+1SbosuX7wqXJ7E/NBf1DOzhYFoJ+dpmsWq+;3:IsKrmtsxK28WNjuqExIi9nQt8jhbFi1p/OtJ4zYkhKCppuRXYKdhFjENbtp7SR4ZwoD0JVGIwYfxmdSgNitX8oddWS+2b/InJZHT7o4nIssbaZuWgAveXpcBLvTdm8vV/Qb/gGUITDbnN5dh9VXLJq6PLgvSEfktt+eCaQnhLii3/6dV3KwJvcpytfEb6j9Xt3i53/YURSiTQcTkk2LcPsHqZIF093WptiYZoW1LZdo=;25:b1VziInrGpJMwRQgdIT2XF46ng6WH8U+PSgGiA0W90xl/Uf/PuMQnhnZyptiqse42RDfTpuoERL3EVmCesnrdN05Yu7ZsNa4zEk65xtz2q0fk1VgxlmMgIz8SCz3dlI/WdjGU51OqXobEUg5SqZNnnYnhqHWYM2Bk+X4ZLNRCRDQMUwWjLKb9gQENfANUJ//Zq6kfVco8eo2SnoETjZ9jZ5ZS0KpiRf8SQGD40lI4cM2/TBxebZ94Hbgubx+S/p/ X-Exchange-Antispam-Report-Test: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB065;UriScan:(185117386973197)(101931422205132); X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB065;20:Df/H3mpmlUd2lmPYpxqaftFytrHt4gR4ROWEk2EsYuT+rKR5QIRAFCY88ulQum+WpXNDg4OpHVSgnn+QLxueeml33KJdH7CdlVXVqgFi+82auctkz+Wb4DIObngd6yatmnOwsDNav64P+yVt/yJn9xfPz4ALPq6JXRVNh9HNWXglBD9iKtZP20NMTjb3ViLuFCpqjLj+goS648dSs6yM61XQUftj0qGJGGSFeN4PPcHglIjCYOLZc5E6xKgclnlsiryV+hi7Xm0TXT41xs1Z5Z5ehVCyZj9BKRCemLXAuuPqSThHFkABh4m1J3L+IngQUxVym2G383x8k4PuLXaKFfW/kyTrtACGG1ATWMqWf03S7REPOoO26bNpJcL42VA0TzTnxGaMMougywvQ8V5cgVpfyQWjsR4lKqb+owE4W5GEOLLOC+/N1N2enO72D+E9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13024025)(8121501046)(520078)(13018025)(13015025)(13017025)(13023025)(5005006)(3002001)(10201501046);SRVR:BLUPR03MB065;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB065; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB065;4:xShNl/1ZjuoarmJdbVbtsOrKhAlDcat7dRr8XK3Tv7KLwI72X/HR4CqvLC2yr9es5p9Srdn9kM2T4Jqqs3R0GuXqGhTYKZ9DbVmolVth7qlas2piNJUKgQDtUH1ce/oq1vkIc+HjkMu2WRrolKyS+C40sU5AHAt6DMt4Rjd5vNRehQi1z5setyPZ0GGdqy6JeOX16afQl7T1FO7LgZ1AUp3DuYeZcFUkdmiGsOwdjMwQIQhS7Rkeldw8VQF4fZufElbZEV/Q2jstSvg2/kGMpHFZspZtaTih4R6w+fkHqjhvsF8rTQ6hBYzWNiNG43sacmwkhSww9Iqtdw3BAD4uwQIOkBIO4Rhk8wWKk/gINnqYG7eI7d99IYedMQtB+2ggiV/WQv5KGwUni9pksCPpQi8Auur58VZf7AmRGeggqMF4dBMfNfBGnWD0veNWb+QkOCsIZgCP1cHT4cnIacMshnTXgQjCuPu7DD6yUG8zOH/57Hm2HksgoAWSsypfKqbJAVN/bikyF/k+0zkBWsKK5tf7eK5wRON3oN/O11ocyOSz9n6P0xtz5DN2qatp8QAh X-Forefront-PRVS: 08286A0BE2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR03MB065;23:PHOpE64FXhOIXZCDuHvtopaEM9hdZYkBpduWJNuyQW?= =?us-ascii?Q?aAPMon/zjNgSTMR7MLK3WKzcQEk3IKEjcV+3Ec7yF67/G73P/EoSKUoDiSrW?= =?us-ascii?Q?n+gnG1LEilovYZpeZw2z4t/0YNlVLbhSp4qErygaUo18ZzKtjCyyhG33Sq1V?= =?us-ascii?Q?EV1QR05LL5Rdmd5iSa/zQ5n0zgpSmnZ8PcBspzKsiLd42pJ+/vtDUrlHeNqO?= =?us-ascii?Q?NgYCNQjOP2egZuEGDKv7o22JoT/b1deD36aNZKCYhCUAAynKSZK6XqgViOQZ?= =?us-ascii?Q?xy8G69f58TvdhUfRHbsSgSJWO95B5O6D3nQT+mw17M9ee7D6hXBQE4kn1xJn?= =?us-ascii?Q?7iyDKGr9xJwChy5HsMrNRr19qb5/INoc0l4FgjBf6Q/ZhDR3SHagrvWWjgRb?= =?us-ascii?Q?Zt1rgYMt/tXemmB7CK33m5TFGclRYPx3s7HLO/EIT2hM/oKexbWItT64c+1s?= =?us-ascii?Q?kcLsdocsJ9iYuEUQUKZIXPPnDsTmx9ehiLqdkxA4o8y+xNXu/E+KKtrMZtAE?= =?us-ascii?Q?hTqS2DgWNdRNzgAi0FhF+oMSLHsT152Td9//hDctV9P1EHm0ERExKRggnI/S?= =?us-ascii?Q?V4pnk0JFxj9AvYil8MAXxrJjySU8l9K4jdiJ75g4CpWfTfDXcKwLeSwZP1mX?= =?us-ascii?Q?DzwRkw897smVJR0EdKt6BStvOoSfvqfblNEep7SDo/9PEPDx87GoZHFoZzDy?= =?us-ascii?Q?ccMkorDOrj60bybvaGxvexyTdE8HebMmil2fkd4Emm+FCDDvN/vmLsW736Ng?= =?us-ascii?Q?JRUYEAfHL6GuMlYiMFY6WCYItwvS6tvuJoOIW4juLhsJaO/s+gdhBozP3RBU?= =?us-ascii?Q?sK3Iiw+hVE69j1HdJAyxAvG4vyVp2AXeYCjJ1pro7vkVYhkhSf3oMKSqGXfe?= =?us-ascii?Q?w5DyghNAQpM4FiDuqAwmcSgyLRgRaXhElU62YZzABnljPH8CN3179AjlEL3v?= =?us-ascii?Q?1GnB+hL+sw87rvRNrVAKcyw+UdDTaw9pBfF7RGQNDZJMejcmBfhq4VMuYBtC?= =?us-ascii?Q?cQraPpnDeZf34EQJBfN7g0UzxOMZjkn7AFljOXU5YtMgobxPmBP7SYWfAzTV?= =?us-ascii?Q?HYalj56STUxw21IXB/BlEBzbZgnyPbUAbJqfhGmhgddF00i9VGeiPg3N7ZPi?= =?us-ascii?Q?/sney4CNI1bHremwBRgCrlLVtHNQ7q?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB065;5:NgJf9gUy8Fg4TY6B2/Hndcw30Yw/50NeVrOK78pemy/APotPUeQ/zXwUKzKX7LG3Dqm5AQbG0AlXsq9D8NasHAf4ekcHOzVnHc3X0UO7qYJlGMcaIe9PdqtwePSSkUwBMYF9Q4zJDZWZKPq/YXLNfg==;24:Oywh/0WHpAriwrvDAOmzlEzEztqHuOQ382HOKt1fGk6eZ9j+SKkLI7Jak66/BpvR33NFtXibWqv9FXvvKuA/TYUz/nELDuKYX9AKUSUWe9A= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2016 08:02:11.0007 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB065 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add R/W functions for big- or little-endian registers: The qSPI controller's endian is independent of the CPU core's endian. So far, the qSPI have two versions for big-endian and little-endian. Signed-off-by: Yuan Yao Acked-by: Han xu --- Changed in v3: Update my email to Changed in v2: Rebase to the lastest code. --- drivers/mtd/spi-nor/fsl-quadspi.c | 157 +++++++++++++++++++++++--------------- 1 file changed, 97 insertions(+), 60 deletions(-) diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index 54640f1..04e8a93 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -275,6 +275,7 @@ struct fsl_qspi { u32 clk_rate; unsigned int chip_base_addr; /* We may support two chips. */ bool has_second_chip; + bool big_endian; struct mutex lock; struct pm_qos_request pm_qos_req; }; @@ -300,6 +301,28 @@ static inline int needs_wakeup_wait_mode(struct fsl_qspi *q) } /* + * R/W functions for big- or little-endian registers: + * The qSPI controller's endian is independent of the CPU core's endian. + * So far, although the CPU core is little-endian but the qSPI have two + * versions for big-endian and little-endian. + */ +static void qspi_writel(struct fsl_qspi *q, u32 val, void __iomem *addr) +{ + if (q->big_endian) + iowrite32be(val, addr); + else + iowrite32(val, addr); +} + +static u32 qspi_readl(struct fsl_qspi *q, void __iomem *addr) +{ + if (q->big_endian) + return ioread32be(addr); + else + return ioread32(addr); +} + +/* * An IC bug makes us to re-arrange the 32-bit data. * The following chips, such as IMX6SLX, have fixed this bug. */ @@ -310,14 +333,14 @@ static inline u32 fsl_qspi_endian_xchg(struct fsl_qspi *q, u32 a) static inline void fsl_qspi_unlock_lut(struct fsl_qspi *q) { - writel(QUADSPI_LUTKEY_VALUE, q->iobase + QUADSPI_LUTKEY); - writel(QUADSPI_LCKER_UNLOCK, q->iobase + QUADSPI_LCKCR); + qspi_writel(q, QUADSPI_LUTKEY_VALUE, q->iobase + QUADSPI_LUTKEY); + qspi_writel(q, QUADSPI_LCKER_UNLOCK, q->iobase + QUADSPI_LCKCR); } static inline void fsl_qspi_lock_lut(struct fsl_qspi *q) { - writel(QUADSPI_LUTKEY_VALUE, q->iobase + QUADSPI_LUTKEY); - writel(QUADSPI_LCKER_LOCK, q->iobase + QUADSPI_LCKCR); + qspi_writel(q, QUADSPI_LUTKEY_VALUE, q->iobase + QUADSPI_LUTKEY); + qspi_writel(q, QUADSPI_LCKER_LOCK, q->iobase + QUADSPI_LCKCR); } static irqreturn_t fsl_qspi_irq_handler(int irq, void *dev_id) @@ -326,8 +349,8 @@ static irqreturn_t fsl_qspi_irq_handler(int irq, void *dev_id) u32 reg; /* clear interrupt */ - reg = readl(q->iobase + QUADSPI_FR); - writel(reg, q->iobase + QUADSPI_FR); + reg = qspi_readl(q, q->iobase + QUADSPI_FR); + qspi_writel(q, reg, q->iobase + QUADSPI_FR); if (reg & QUADSPI_FR_TFF_MASK) complete(&q->c); @@ -348,7 +371,7 @@ static void fsl_qspi_init_lut(struct fsl_qspi *q) /* Clear all the LUT table */ for (i = 0; i < QUADSPI_LUT_NUM; i++) - writel(0, base + QUADSPI_LUT_BASE + i * 4); + qspi_writel(q, 0, base + QUADSPI_LUT_BASE + i * 4); /* Quad Read */ lut_base = SEQID_QUAD_READ * 4; @@ -364,14 +387,15 @@ static void fsl_qspi_init_lut(struct fsl_qspi *q) dummy = 8; } - writel(LUT0(CMD, PAD1, cmd) | LUT1(ADDR, PAD1, addrlen), + qspi_writel(q, LUT0(CMD, PAD1, cmd) | LUT1(ADDR, PAD1, addrlen), base + QUADSPI_LUT(lut_base)); - writel(LUT0(DUMMY, PAD1, dummy) | LUT1(FSL_READ, PAD4, rxfifo), + qspi_writel(q, LUT0(DUMMY, PAD1, dummy) | LUT1(FSL_READ, PAD4, rxfifo), base + QUADSPI_LUT(lut_base + 1)); /* Write enable */ lut_base = SEQID_WREN * 4; - writel(LUT0(CMD, PAD1, SPINOR_OP_WREN), base + QUADSPI_LUT(lut_base)); + qspi_writel(q, LUT0(CMD, PAD1, SPINOR_OP_WREN), + base + QUADSPI_LUT(lut_base)); /* Page Program */ lut_base = SEQID_PP * 4; @@ -385,13 +409,15 @@ static void fsl_qspi_init_lut(struct fsl_qspi *q) addrlen = ADDR32BIT; } - writel(LUT0(CMD, PAD1, cmd) | LUT1(ADDR, PAD1, addrlen), + qspi_writel(q, LUT0(CMD, PAD1, cmd) | LUT1(ADDR, PAD1, addrlen), base + QUADSPI_LUT(lut_base)); - writel(LUT0(FSL_WRITE, PAD1, 0), base + QUADSPI_LUT(lut_base + 1)); + qspi_writel(q, LUT0(FSL_WRITE, PAD1, 0), + base + QUADSPI_LUT(lut_base + 1)); /* Read Status */ lut_base = SEQID_RDSR * 4; - writel(LUT0(CMD, PAD1, SPINOR_OP_RDSR) | LUT1(FSL_READ, PAD1, 0x1), + qspi_writel(q, LUT0(CMD, PAD1, SPINOR_OP_RDSR) | + LUT1(FSL_READ, PAD1, 0x1), base + QUADSPI_LUT(lut_base)); /* Erase a sector */ @@ -400,40 +426,46 @@ static void fsl_qspi_init_lut(struct fsl_qspi *q) cmd = q->nor[0].erase_opcode; addrlen = q->nor_size <= SZ_16M ? ADDR24BIT : ADDR32BIT; - writel(LUT0(CMD, PAD1, cmd) | LUT1(ADDR, PAD1, addrlen), + qspi_writel(q, LUT0(CMD, PAD1, cmd) | LUT1(ADDR, PAD1, addrlen), base + QUADSPI_LUT(lut_base)); /* Erase the whole chip */ lut_base = SEQID_CHIP_ERASE * 4; - writel(LUT0(CMD, PAD1, SPINOR_OP_CHIP_ERASE), + qspi_writel(q, LUT0(CMD, PAD1, SPINOR_OP_CHIP_ERASE), base + QUADSPI_LUT(lut_base)); /* READ ID */ lut_base = SEQID_RDID * 4; - writel(LUT0(CMD, PAD1, SPINOR_OP_RDID) | LUT1(FSL_READ, PAD1, 0x8), + qspi_writel(q, LUT0(CMD, PAD1, SPINOR_OP_RDID) | + LUT1(FSL_READ, PAD1, 0x8), base + QUADSPI_LUT(lut_base)); /* Write Register */ lut_base = SEQID_WRSR * 4; - writel(LUT0(CMD, PAD1, SPINOR_OP_WRSR) | LUT1(FSL_WRITE, PAD1, 0x2), + qspi_writel(q, LUT0(CMD, PAD1, SPINOR_OP_WRSR) | + LUT1(FSL_WRITE, PAD1, 0x2), base + QUADSPI_LUT(lut_base)); /* Read Configuration Register */ lut_base = SEQID_RDCR * 4; - writel(LUT0(CMD, PAD1, SPINOR_OP_RDCR) | LUT1(FSL_READ, PAD1, 0x1), + qspi_writel(q, LUT0(CMD, PAD1, SPINOR_OP_RDCR) | + LUT1(FSL_READ, PAD1, 0x1), base + QUADSPI_LUT(lut_base)); /* Write disable */ lut_base = SEQID_WRDI * 4; - writel(LUT0(CMD, PAD1, SPINOR_OP_WRDI), base + QUADSPI_LUT(lut_base)); + qspi_writel(q, LUT0(CMD, PAD1, SPINOR_OP_WRDI), + base + QUADSPI_LUT(lut_base)); /* Enter 4 Byte Mode (Micron) */ lut_base = SEQID_EN4B * 4; - writel(LUT0(CMD, PAD1, SPINOR_OP_EN4B), base + QUADSPI_LUT(lut_base)); + qspi_writel(q, LUT0(CMD, PAD1, SPINOR_OP_EN4B), + base + QUADSPI_LUT(lut_base)); /* Enter 4 Byte Mode (Spansion) */ lut_base = SEQID_BRWR * 4; - writel(LUT0(CMD, PAD1, SPINOR_OP_BRWR), base + QUADSPI_LUT(lut_base)); + qspi_writel(q, LUT0(CMD, PAD1, SPINOR_OP_BRWR), + base + QUADSPI_LUT(lut_base)); fsl_qspi_lock_lut(q); } @@ -488,15 +520,16 @@ fsl_qspi_runcmd(struct fsl_qspi *q, u8 cmd, unsigned int addr, int len) q->chip_base_addr, addr, len, cmd); /* save the reg */ - reg = readl(base + QUADSPI_MCR); + reg = qspi_readl(q, base + QUADSPI_MCR); - writel(q->memmap_phy + q->chip_base_addr + addr, base + QUADSPI_SFAR); - writel(QUADSPI_RBCT_WMRK_MASK | QUADSPI_RBCT_RXBRD_USEIPS, + qspi_writel(q, q->memmap_phy + q->chip_base_addr + addr, + base + QUADSPI_SFAR); + qspi_writel(q, QUADSPI_RBCT_WMRK_MASK | QUADSPI_RBCT_RXBRD_USEIPS, base + QUADSPI_RBCT); - writel(reg | QUADSPI_MCR_CLR_RXF_MASK, base + QUADSPI_MCR); + qspi_writel(q, reg | QUADSPI_MCR_CLR_RXF_MASK, base + QUADSPI_MCR); do { - reg2 = readl(base + QUADSPI_SR); + reg2 = qspi_readl(q, base + QUADSPI_SR); if (reg2 & (QUADSPI_SR_IP_ACC_MASK | QUADSPI_SR_AHB_ACC_MASK)) { udelay(1); dev_dbg(q->dev, "The controller is busy, 0x%x\n", reg2); @@ -507,21 +540,22 @@ fsl_qspi_runcmd(struct fsl_qspi *q, u8 cmd, unsigned int addr, int len) /* trigger the LUT now */ seqid = fsl_qspi_get_seqid(q, cmd); - writel((seqid << QUADSPI_IPCR_SEQID_SHIFT) | len, base + QUADSPI_IPCR); + qspi_writel(q, (seqid << QUADSPI_IPCR_SEQID_SHIFT) | len, + base + QUADSPI_IPCR); /* Wait for the interrupt. */ if (!wait_for_completion_timeout(&q->c, msecs_to_jiffies(1000))) { dev_err(q->dev, "cmd 0x%.2x timeout, addr@%.8x, FR:0x%.8x, SR:0x%.8x\n", - cmd, addr, readl(base + QUADSPI_FR), - readl(base + QUADSPI_SR)); + cmd, addr, qspi_readl(q, base + QUADSPI_FR), + qspi_readl(q, base + QUADSPI_SR)); err = -ETIMEDOUT; } else { err = 0; } /* restore the MCR */ - writel(reg, base + QUADSPI_MCR); + qspi_writel(q, reg, base + QUADSPI_MCR); return err; } @@ -533,7 +567,7 @@ static void fsl_qspi_read_data(struct fsl_qspi *q, int len, u8 *rxbuf) int i = 0; while (len > 0) { - tmp = readl(q->iobase + QUADSPI_RBDR + i * 4); + tmp = qspi_readl(q, q->iobase + QUADSPI_RBDR + i * 4); tmp = fsl_qspi_endian_xchg(q, tmp); dev_dbg(q->dev, "chip addr:0x%.8x, rcv:0x%.8x\n", q->chip_base_addr, tmp); @@ -561,9 +595,9 @@ static inline void fsl_qspi_invalid(struct fsl_qspi *q) { u32 reg; - reg = readl(q->iobase + QUADSPI_MCR); + reg = qspi_readl(q, q->iobase + QUADSPI_MCR); reg |= QUADSPI_MCR_SWRSTHD_MASK | QUADSPI_MCR_SWRSTSD_MASK; - writel(reg, q->iobase + QUADSPI_MCR); + qspi_writel(q, reg, q->iobase + QUADSPI_MCR); /* * The minimum delay : 1 AHB + 2 SFCK clocks. @@ -572,7 +606,7 @@ static inline void fsl_qspi_invalid(struct fsl_qspi *q) udelay(1); reg &= ~(QUADSPI_MCR_SWRSTHD_MASK | QUADSPI_MCR_SWRSTSD_MASK); - writel(reg, q->iobase + QUADSPI_MCR); + qspi_writel(q, reg, q->iobase + QUADSPI_MCR); } static int fsl_qspi_nor_write(struct fsl_qspi *q, struct spi_nor *nor, @@ -586,20 +620,20 @@ static int fsl_qspi_nor_write(struct fsl_qspi *q, struct spi_nor *nor, q->chip_base_addr, to, count); /* clear the TX FIFO. */ - tmp = readl(q->iobase + QUADSPI_MCR); - writel(tmp | QUADSPI_MCR_CLR_TXF_MASK, q->iobase + QUADSPI_MCR); + tmp = qspi_readl(q, q->iobase + QUADSPI_MCR); + qspi_writel(q, tmp | QUADSPI_MCR_CLR_TXF_MASK, q->iobase + QUADSPI_MCR); /* fill the TX data to the FIFO */ for (j = 0, i = ((count + 3) / 4); j < i; j++) { tmp = fsl_qspi_endian_xchg(q, *txbuf); - writel(tmp, q->iobase + QUADSPI_TBDR); + qspi_writel(q, tmp, q->iobase + QUADSPI_TBDR); txbuf++; } /* fill the TXFIFO upto 16 bytes for i.MX7d */ if (needs_fill_txfifo(q)) for (; i < 4; i++) - writel(tmp, q->iobase + QUADSPI_TBDR); + qspi_writel(q, tmp, q->iobase + QUADSPI_TBDR); /* Trigger it */ ret = fsl_qspi_runcmd(q, opcode, to, count); @@ -615,10 +649,10 @@ static void fsl_qspi_set_map_addr(struct fsl_qspi *q) int nor_size = q->nor_size; void __iomem *base = q->iobase; - writel(nor_size + q->memmap_phy, base + QUADSPI_SFA1AD); - writel(nor_size * 2 + q->memmap_phy, base + QUADSPI_SFA2AD); - writel(nor_size * 3 + q->memmap_phy, base + QUADSPI_SFB1AD); - writel(nor_size * 4 + q->memmap_phy, base + QUADSPI_SFB2AD); + qspi_writel(q, nor_size + q->memmap_phy, base + QUADSPI_SFA1AD); + qspi_writel(q, nor_size * 2 + q->memmap_phy, base + QUADSPI_SFA2AD); + qspi_writel(q, nor_size * 3 + q->memmap_phy, base + QUADSPI_SFB1AD); + qspi_writel(q, nor_size * 4 + q->memmap_phy, base + QUADSPI_SFB2AD); } /* @@ -640,24 +674,26 @@ static void fsl_qspi_init_abh_read(struct fsl_qspi *q) int seqid; /* AHB configuration for access buffer 0/1/2 .*/ - writel(QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF0CR); - writel(QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF1CR); - writel(QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF2CR); + qspi_writel(q, QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF0CR); + qspi_writel(q, QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF1CR); + qspi_writel(q, QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF2CR); /* * Set ADATSZ with the maximum AHB buffer size to improve the * read performance. */ - writel(QUADSPI_BUF3CR_ALLMST_MASK | ((q->devtype_data->ahb_buf_size / 8) - << QUADSPI_BUF3CR_ADATSZ_SHIFT), base + QUADSPI_BUF3CR); + qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK | + ((q->devtype_data->ahb_buf_size / 8) + << QUADSPI_BUF3CR_ADATSZ_SHIFT), + base + QUADSPI_BUF3CR); /* We only use the buffer3 */ - writel(0, base + QUADSPI_BUF0IND); - writel(0, base + QUADSPI_BUF1IND); - writel(0, base + QUADSPI_BUF2IND); + qspi_writel(q, 0, base + QUADSPI_BUF0IND); + qspi_writel(q, 0, base + QUADSPI_BUF1IND); + qspi_writel(q, 0, base + QUADSPI_BUF2IND); /* Set the default lut sequence for AHB Read. */ seqid = fsl_qspi_get_seqid(q, q->nor[0].read_opcode); - writel(seqid << QUADSPI_BFGENCR_SEQID_SHIFT, + qspi_writel(q, seqid << QUADSPI_BFGENCR_SEQID_SHIFT, q->iobase + QUADSPI_BFGENCR); } @@ -713,7 +749,7 @@ static int fsl_qspi_nor_setup(struct fsl_qspi *q) return ret; /* Reset the module */ - writel(QUADSPI_MCR_SWRSTSD_MASK | QUADSPI_MCR_SWRSTHD_MASK, + qspi_writel(q, QUADSPI_MCR_SWRSTSD_MASK | QUADSPI_MCR_SWRSTHD_MASK, base + QUADSPI_MCR); udelay(1); @@ -721,24 +757,24 @@ static int fsl_qspi_nor_setup(struct fsl_qspi *q) fsl_qspi_init_lut(q); /* Disable the module */ - writel(QUADSPI_MCR_MDIS_MASK | QUADSPI_MCR_RESERVED_MASK, + qspi_writel(q, QUADSPI_MCR_MDIS_MASK | QUADSPI_MCR_RESERVED_MASK, base + QUADSPI_MCR); - reg = readl(base + QUADSPI_SMPR); - writel(reg & ~(QUADSPI_SMPR_FSDLY_MASK + reg = qspi_readl(q, base + QUADSPI_SMPR); + qspi_writel(q, reg & ~(QUADSPI_SMPR_FSDLY_MASK | QUADSPI_SMPR_FSPHS_MASK | QUADSPI_SMPR_HSENA_MASK | QUADSPI_SMPR_DDRSMP_MASK), base + QUADSPI_SMPR); /* Enable the module */ - writel(QUADSPI_MCR_RESERVED_MASK | QUADSPI_MCR_END_CFG_MASK, + qspi_writel(q, QUADSPI_MCR_RESERVED_MASK | QUADSPI_MCR_END_CFG_MASK, base + QUADSPI_MCR); /* clear all interrupt status */ - writel(0xffffffff, q->iobase + QUADSPI_FR); + qspi_writel(q, 0xffffffff, q->iobase + QUADSPI_FR); /* enable the interrupt */ - writel(QUADSPI_RSER_TFIE, q->iobase + QUADSPI_RSER); + qspi_writel(q, QUADSPI_RSER_TFIE, q->iobase + QUADSPI_RSER); return 0; } @@ -954,6 +990,7 @@ static int fsl_qspi_probe(struct platform_device *pdev) if (IS_ERR(q->iobase)) return PTR_ERR(q->iobase); + q->big_endian = of_property_read_bool(np, "big-endian"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "QuadSPI-memory"); if (!devm_request_mem_region(dev, res->start, resource_size(res), @@ -1101,8 +1138,8 @@ static int fsl_qspi_remove(struct platform_device *pdev) } /* disable the hardware */ - writel(QUADSPI_MCR_MDIS_MASK, q->iobase + QUADSPI_MCR); - writel(0x0, q->iobase + QUADSPI_RSER); + qspi_writel(q, QUADSPI_MCR_MDIS_MASK, q->iobase + QUADSPI_MCR); + qspi_writel(q, 0x0, q->iobase + QUADSPI_RSER); mutex_destroy(&q->lock); -- 2.1.0.27.g96db324