64b53247c4
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
554 lines
17 KiB
Diff
554 lines
17 KiB
Diff
From 4dab73d46eb58c142b5d2e7039f12e4e5df357ad Mon Sep 17 00:00:00 2001
|
|
From: Guochun Mao <guochun.mao@mediatek.com>
|
|
Date: Mon, 18 Dec 2017 09:47:35 +0800
|
|
Subject: [PATCH 196/224] mtd: mtk-nor: modify functions' name more generally
|
|
|
|
Since more and more Mediatek's SoC can use this driver to
|
|
control spi-nor flash, functions' name with "mt8173_" is
|
|
no longer properly. Replacing "mt8173_" with "mtk_" will
|
|
be more accurate to describe these functions' usable scope.
|
|
|
|
Signed-off-by: Guochun Mao <guochun.mao@mediatek.com>
|
|
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
|
|
---
|
|
drivers/mtd/spi-nor/mtk-quadspi.c | 240 +++++++++++++++++++-------------------
|
|
1 file changed, 120 insertions(+), 120 deletions(-)
|
|
|
|
--- a/drivers/mtd/spi-nor/mtk-quadspi.c
|
|
+++ b/drivers/mtd/spi-nor/mtk-quadspi.c
|
|
@@ -110,7 +110,7 @@
|
|
#define MTK_NOR_PRG_REG(n) (MTK_NOR_PRGDATA0_REG + 4 * (n))
|
|
#define MTK_NOR_SHREG(n) (MTK_NOR_SHREG0_REG + 4 * (n))
|
|
|
|
-struct mt8173_nor {
|
|
+struct mtk_nor {
|
|
struct spi_nor nor;
|
|
struct device *dev;
|
|
void __iomem *base; /* nor flash base address */
|
|
@@ -118,48 +118,48 @@ struct mt8173_nor {
|
|
struct clk *nor_clk;
|
|
};
|
|
|
|
-static void mt8173_nor_set_read_mode(struct mt8173_nor *mt8173_nor)
|
|
+static void mtk_nor_set_read_mode(struct mtk_nor *mtk_nor)
|
|
{
|
|
- struct spi_nor *nor = &mt8173_nor->nor;
|
|
+ struct spi_nor *nor = &mtk_nor->nor;
|
|
|
|
switch (nor->read_proto) {
|
|
case SNOR_PROTO_1_1_1:
|
|
- writeb(nor->read_opcode, mt8173_nor->base +
|
|
+ writeb(nor->read_opcode, mtk_nor->base +
|
|
MTK_NOR_PRGDATA3_REG);
|
|
- writeb(MTK_NOR_FAST_READ, mt8173_nor->base +
|
|
+ writeb(MTK_NOR_FAST_READ, mtk_nor->base +
|
|
MTK_NOR_CFG1_REG);
|
|
break;
|
|
case SNOR_PROTO_1_1_2:
|
|
- writeb(nor->read_opcode, mt8173_nor->base +
|
|
+ writeb(nor->read_opcode, mtk_nor->base +
|
|
MTK_NOR_PRGDATA3_REG);
|
|
- writeb(MTK_NOR_DUAL_READ_EN, mt8173_nor->base +
|
|
+ writeb(MTK_NOR_DUAL_READ_EN, mtk_nor->base +
|
|
MTK_NOR_DUAL_REG);
|
|
break;
|
|
case SNOR_PROTO_1_1_4:
|
|
- writeb(nor->read_opcode, mt8173_nor->base +
|
|
+ writeb(nor->read_opcode, mtk_nor->base +
|
|
MTK_NOR_PRGDATA4_REG);
|
|
- writeb(MTK_NOR_QUAD_READ_EN, mt8173_nor->base +
|
|
+ writeb(MTK_NOR_QUAD_READ_EN, mtk_nor->base +
|
|
MTK_NOR_DUAL_REG);
|
|
break;
|
|
default:
|
|
- writeb(MTK_NOR_DUAL_DISABLE, mt8173_nor->base +
|
|
+ writeb(MTK_NOR_DUAL_DISABLE, mtk_nor->base +
|
|
MTK_NOR_DUAL_REG);
|
|
break;
|
|
}
|
|
}
|
|
|
|
-static int mt8173_nor_execute_cmd(struct mt8173_nor *mt8173_nor, u8 cmdval)
|
|
+static int mtk_nor_execute_cmd(struct mtk_nor *mtk_nor, u8 cmdval)
|
|
{
|
|
int reg;
|
|
u8 val = cmdval & 0x1f;
|
|
|
|
- writeb(cmdval, mt8173_nor->base + MTK_NOR_CMD_REG);
|
|
- return readl_poll_timeout(mt8173_nor->base + MTK_NOR_CMD_REG, reg,
|
|
+ writeb(cmdval, mtk_nor->base + MTK_NOR_CMD_REG);
|
|
+ return readl_poll_timeout(mtk_nor->base + MTK_NOR_CMD_REG, reg,
|
|
!(reg & val), 100, 10000);
|
|
}
|
|
|
|
-static int mt8173_nor_do_tx_rx(struct mt8173_nor *mt8173_nor, u8 op,
|
|
- u8 *tx, int txlen, u8 *rx, int rxlen)
|
|
+static int mtk_nor_do_tx_rx(struct mtk_nor *mtk_nor, u8 op,
|
|
+ u8 *tx, int txlen, u8 *rx, int rxlen)
|
|
{
|
|
int len = 1 + txlen + rxlen;
|
|
int i, ret, idx;
|
|
@@ -167,26 +167,26 @@ static int mt8173_nor_do_tx_rx(struct mt
|
|
if (len > MTK_NOR_MAX_SHIFT)
|
|
return -EINVAL;
|
|
|
|
- writeb(len * 8, mt8173_nor->base + MTK_NOR_CNT_REG);
|
|
+ writeb(len * 8, mtk_nor->base + MTK_NOR_CNT_REG);
|
|
|
|
/* start at PRGDATA5, go down to PRGDATA0 */
|
|
idx = MTK_NOR_MAX_RX_TX_SHIFT - 1;
|
|
|
|
/* opcode */
|
|
- writeb(op, mt8173_nor->base + MTK_NOR_PRG_REG(idx));
|
|
+ writeb(op, mtk_nor->base + MTK_NOR_PRG_REG(idx));
|
|
idx--;
|
|
|
|
/* program TX data */
|
|
for (i = 0; i < txlen; i++, idx--)
|
|
- writeb(tx[i], mt8173_nor->base + MTK_NOR_PRG_REG(idx));
|
|
+ writeb(tx[i], mtk_nor->base + MTK_NOR_PRG_REG(idx));
|
|
|
|
/* clear out rest of TX registers */
|
|
while (idx >= 0) {
|
|
- writeb(0, mt8173_nor->base + MTK_NOR_PRG_REG(idx));
|
|
+ writeb(0, mtk_nor->base + MTK_NOR_PRG_REG(idx));
|
|
idx--;
|
|
}
|
|
|
|
- ret = mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_PRG_CMD);
|
|
+ ret = mtk_nor_execute_cmd(mtk_nor, MTK_NOR_PRG_CMD);
|
|
if (ret)
|
|
return ret;
|
|
|
|
@@ -195,20 +195,20 @@ static int mt8173_nor_do_tx_rx(struct mt
|
|
|
|
/* read out RX data */
|
|
for (i = 0; i < rxlen; i++, idx--)
|
|
- rx[i] = readb(mt8173_nor->base + MTK_NOR_SHREG(idx));
|
|
+ rx[i] = readb(mtk_nor->base + MTK_NOR_SHREG(idx));
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Do a WRSR (Write Status Register) command */
|
|
-static int mt8173_nor_wr_sr(struct mt8173_nor *mt8173_nor, u8 sr)
|
|
+static int mtk_nor_wr_sr(struct mtk_nor *mtk_nor, u8 sr)
|
|
{
|
|
- writeb(sr, mt8173_nor->base + MTK_NOR_PRGDATA5_REG);
|
|
- writeb(8, mt8173_nor->base + MTK_NOR_CNT_REG);
|
|
- return mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_WRSR_CMD);
|
|
+ writeb(sr, mtk_nor->base + MTK_NOR_PRGDATA5_REG);
|
|
+ writeb(8, mtk_nor->base + MTK_NOR_CNT_REG);
|
|
+ return mtk_nor_execute_cmd(mtk_nor, MTK_NOR_WRSR_CMD);
|
|
}
|
|
|
|
-static int mt8173_nor_write_buffer_enable(struct mt8173_nor *mt8173_nor)
|
|
+static int mtk_nor_write_buffer_enable(struct mtk_nor *mtk_nor)
|
|
{
|
|
u8 reg;
|
|
|
|
@@ -216,27 +216,27 @@ static int mt8173_nor_write_buffer_enabl
|
|
* 0: pre-fetch buffer use for read
|
|
* 1: pre-fetch buffer use for page program
|
|
*/
|
|
- writel(MTK_NOR_WR_BUF_ENABLE, mt8173_nor->base + MTK_NOR_CFG2_REG);
|
|
- return readb_poll_timeout(mt8173_nor->base + MTK_NOR_CFG2_REG, reg,
|
|
+ writel(MTK_NOR_WR_BUF_ENABLE, mtk_nor->base + MTK_NOR_CFG2_REG);
|
|
+ return readb_poll_timeout(mtk_nor->base + MTK_NOR_CFG2_REG, reg,
|
|
0x01 == (reg & 0x01), 100, 10000);
|
|
}
|
|
|
|
-static int mt8173_nor_write_buffer_disable(struct mt8173_nor *mt8173_nor)
|
|
+static int mtk_nor_write_buffer_disable(struct mtk_nor *mtk_nor)
|
|
{
|
|
u8 reg;
|
|
|
|
- writel(MTK_NOR_WR_BUF_DISABLE, mt8173_nor->base + MTK_NOR_CFG2_REG);
|
|
- return readb_poll_timeout(mt8173_nor->base + MTK_NOR_CFG2_REG, reg,
|
|
+ writel(MTK_NOR_WR_BUF_DISABLE, mtk_nor->base + MTK_NOR_CFG2_REG);
|
|
+ return readb_poll_timeout(mtk_nor->base + MTK_NOR_CFG2_REG, reg,
|
|
MTK_NOR_WR_BUF_DISABLE == (reg & 0x1), 100,
|
|
10000);
|
|
}
|
|
|
|
-static void mt8173_nor_set_addr_width(struct mt8173_nor *mt8173_nor)
|
|
+static void mtk_nor_set_addr_width(struct mtk_nor *mtk_nor)
|
|
{
|
|
u8 val;
|
|
- struct spi_nor *nor = &mt8173_nor->nor;
|
|
+ struct spi_nor *nor = &mtk_nor->nor;
|
|
|
|
- val = readb(mt8173_nor->base + MTK_NOR_DUAL_REG);
|
|
+ val = readb(mtk_nor->base + MTK_NOR_DUAL_REG);
|
|
|
|
switch (nor->addr_width) {
|
|
case 3:
|
|
@@ -246,115 +246,115 @@ static void mt8173_nor_set_addr_width(st
|
|
val |= MTK_NOR_4B_ADDR_EN;
|
|
break;
|
|
default:
|
|
- dev_warn(mt8173_nor->dev, "Unexpected address width %u.\n",
|
|
+ dev_warn(mtk_nor->dev, "Unexpected address width %u.\n",
|
|
nor->addr_width);
|
|
break;
|
|
}
|
|
|
|
- writeb(val, mt8173_nor->base + MTK_NOR_DUAL_REG);
|
|
+ writeb(val, mtk_nor->base + MTK_NOR_DUAL_REG);
|
|
}
|
|
|
|
-static void mt8173_nor_set_addr(struct mt8173_nor *mt8173_nor, u32 addr)
|
|
+static void mtk_nor_set_addr(struct mtk_nor *mtk_nor, u32 addr)
|
|
{
|
|
int i;
|
|
|
|
- mt8173_nor_set_addr_width(mt8173_nor);
|
|
+ mtk_nor_set_addr_width(mtk_nor);
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
- writeb(addr & 0xff, mt8173_nor->base + MTK_NOR_RADR0_REG + i * 4);
|
|
+ writeb(addr & 0xff, mtk_nor->base + MTK_NOR_RADR0_REG + i * 4);
|
|
addr >>= 8;
|
|
}
|
|
/* Last register is non-contiguous */
|
|
- writeb(addr & 0xff, mt8173_nor->base + MTK_NOR_RADR3_REG);
|
|
+ writeb(addr & 0xff, mtk_nor->base + MTK_NOR_RADR3_REG);
|
|
}
|
|
|
|
-static ssize_t mt8173_nor_read(struct spi_nor *nor, loff_t from, size_t length,
|
|
- u_char *buffer)
|
|
+static ssize_t mtk_nor_read(struct spi_nor *nor, loff_t from, size_t length,
|
|
+ u_char *buffer)
|
|
{
|
|
int i, ret;
|
|
int addr = (int)from;
|
|
u8 *buf = (u8 *)buffer;
|
|
- struct mt8173_nor *mt8173_nor = nor->priv;
|
|
+ struct mtk_nor *mtk_nor = nor->priv;
|
|
|
|
/* set mode for fast read mode ,dual mode or quad mode */
|
|
- mt8173_nor_set_read_mode(mt8173_nor);
|
|
- mt8173_nor_set_addr(mt8173_nor, addr);
|
|
+ mtk_nor_set_read_mode(mtk_nor);
|
|
+ mtk_nor_set_addr(mtk_nor, addr);
|
|
|
|
for (i = 0; i < length; i++) {
|
|
- ret = mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_PIO_READ_CMD);
|
|
+ ret = mtk_nor_execute_cmd(mtk_nor, MTK_NOR_PIO_READ_CMD);
|
|
if (ret < 0)
|
|
return ret;
|
|
- buf[i] = readb(mt8173_nor->base + MTK_NOR_RDATA_REG);
|
|
+ buf[i] = readb(mtk_nor->base + MTK_NOR_RDATA_REG);
|
|
}
|
|
return length;
|
|
}
|
|
|
|
-static int mt8173_nor_write_single_byte(struct mt8173_nor *mt8173_nor,
|
|
- int addr, int length, u8 *data)
|
|
+static int mtk_nor_write_single_byte(struct mtk_nor *mtk_nor,
|
|
+ int addr, int length, u8 *data)
|
|
{
|
|
int i, ret;
|
|
|
|
- mt8173_nor_set_addr(mt8173_nor, addr);
|
|
+ mtk_nor_set_addr(mtk_nor, addr);
|
|
|
|
for (i = 0; i < length; i++) {
|
|
- writeb(*data++, mt8173_nor->base + MTK_NOR_WDATA_REG);
|
|
- ret = mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_PIO_WR_CMD);
|
|
+ writeb(*data++, mtk_nor->base + MTK_NOR_WDATA_REG);
|
|
+ ret = mtk_nor_execute_cmd(mtk_nor, MTK_NOR_PIO_WR_CMD);
|
|
if (ret < 0)
|
|
return ret;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
-static int mt8173_nor_write_buffer(struct mt8173_nor *mt8173_nor, int addr,
|
|
- const u8 *buf)
|
|
+static int mtk_nor_write_buffer(struct mtk_nor *mtk_nor, int addr,
|
|
+ const u8 *buf)
|
|
{
|
|
int i, bufidx, data;
|
|
|
|
- mt8173_nor_set_addr(mt8173_nor, addr);
|
|
+ mtk_nor_set_addr(mtk_nor, addr);
|
|
|
|
bufidx = 0;
|
|
for (i = 0; i < SFLASH_WRBUF_SIZE; i += 4) {
|
|
data = buf[bufidx + 3]<<24 | buf[bufidx + 2]<<16 |
|
|
buf[bufidx + 1]<<8 | buf[bufidx];
|
|
bufidx += 4;
|
|
- writel(data, mt8173_nor->base + MTK_NOR_PP_DATA_REG);
|
|
+ writel(data, mtk_nor->base + MTK_NOR_PP_DATA_REG);
|
|
}
|
|
- return mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_WR_CMD);
|
|
+ return mtk_nor_execute_cmd(mtk_nor, MTK_NOR_WR_CMD);
|
|
}
|
|
|
|
-static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len,
|
|
- const u_char *buf)
|
|
+static ssize_t mtk_nor_write(struct spi_nor *nor, loff_t to, size_t len,
|
|
+ const u_char *buf)
|
|
{
|
|
int ret;
|
|
- struct mt8173_nor *mt8173_nor = nor->priv;
|
|
+ struct mtk_nor *mtk_nor = nor->priv;
|
|
size_t i;
|
|
|
|
- ret = mt8173_nor_write_buffer_enable(mt8173_nor);
|
|
+ ret = mtk_nor_write_buffer_enable(mtk_nor);
|
|
if (ret < 0) {
|
|
- dev_warn(mt8173_nor->dev, "write buffer enable failed!\n");
|
|
+ dev_warn(mtk_nor->dev, "write buffer enable failed!\n");
|
|
return ret;
|
|
}
|
|
|
|
for (i = 0; i + SFLASH_WRBUF_SIZE <= len; i += SFLASH_WRBUF_SIZE) {
|
|
- ret = mt8173_nor_write_buffer(mt8173_nor, to, buf);
|
|
+ ret = mtk_nor_write_buffer(mtk_nor, to, buf);
|
|
if (ret < 0) {
|
|
- dev_err(mt8173_nor->dev, "write buffer failed!\n");
|
|
+ dev_err(mtk_nor->dev, "write buffer failed!\n");
|
|
return ret;
|
|
}
|
|
to += SFLASH_WRBUF_SIZE;
|
|
buf += SFLASH_WRBUF_SIZE;
|
|
}
|
|
- ret = mt8173_nor_write_buffer_disable(mt8173_nor);
|
|
+ ret = mtk_nor_write_buffer_disable(mtk_nor);
|
|
if (ret < 0) {
|
|
- dev_warn(mt8173_nor->dev, "write buffer disable failed!\n");
|
|
+ dev_warn(mtk_nor->dev, "write buffer disable failed!\n");
|
|
return ret;
|
|
}
|
|
|
|
if (i < len) {
|
|
- ret = mt8173_nor_write_single_byte(mt8173_nor, to,
|
|
- (int)(len - i), (u8 *)buf);
|
|
+ ret = mtk_nor_write_single_byte(mtk_nor, to,
|
|
+ (int)(len - i), (u8 *)buf);
|
|
if (ret < 0) {
|
|
- dev_err(mt8173_nor->dev, "write single byte failed!\n");
|
|
+ dev_err(mtk_nor->dev, "write single byte failed!\n");
|
|
return ret;
|
|
}
|
|
}
|
|
@@ -362,72 +362,72 @@ static ssize_t mt8173_nor_write(struct s
|
|
return len;
|
|
}
|
|
|
|
-static int mt8173_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)
|
|
+static int mtk_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)
|
|
{
|
|
int ret;
|
|
- struct mt8173_nor *mt8173_nor = nor->priv;
|
|
+ struct mtk_nor *mtk_nor = nor->priv;
|
|
|
|
switch (opcode) {
|
|
case SPINOR_OP_RDSR:
|
|
- ret = mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_RDSR_CMD);
|
|
+ ret = mtk_nor_execute_cmd(mtk_nor, MTK_NOR_RDSR_CMD);
|
|
if (ret < 0)
|
|
return ret;
|
|
if (len == 1)
|
|
- *buf = readb(mt8173_nor->base + MTK_NOR_RDSR_REG);
|
|
+ *buf = readb(mtk_nor->base + MTK_NOR_RDSR_REG);
|
|
else
|
|
- dev_err(mt8173_nor->dev, "len should be 1 for read status!\n");
|
|
+ dev_err(mtk_nor->dev, "len should be 1 for read status!\n");
|
|
break;
|
|
default:
|
|
- ret = mt8173_nor_do_tx_rx(mt8173_nor, opcode, NULL, 0, buf, len);
|
|
+ ret = mtk_nor_do_tx_rx(mtk_nor, opcode, NULL, 0, buf, len);
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
-static int mt8173_nor_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf,
|
|
- int len)
|
|
+static int mtk_nor_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf,
|
|
+ int len)
|
|
{
|
|
int ret;
|
|
- struct mt8173_nor *mt8173_nor = nor->priv;
|
|
+ struct mtk_nor *mtk_nor = nor->priv;
|
|
|
|
switch (opcode) {
|
|
case SPINOR_OP_WRSR:
|
|
/* We only handle 1 byte */
|
|
- ret = mt8173_nor_wr_sr(mt8173_nor, *buf);
|
|
+ ret = mtk_nor_wr_sr(mtk_nor, *buf);
|
|
break;
|
|
default:
|
|
- ret = mt8173_nor_do_tx_rx(mt8173_nor, opcode, buf, len, NULL, 0);
|
|
+ ret = mtk_nor_do_tx_rx(mtk_nor, opcode, buf, len, NULL, 0);
|
|
if (ret)
|
|
- dev_warn(mt8173_nor->dev, "write reg failure!\n");
|
|
+ dev_warn(mtk_nor->dev, "write reg failure!\n");
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
-static void mt8173_nor_disable_clk(struct mt8173_nor *mt8173_nor)
|
|
+static void mtk_nor_disable_clk(struct mtk_nor *mtk_nor)
|
|
{
|
|
- clk_disable_unprepare(mt8173_nor->spi_clk);
|
|
- clk_disable_unprepare(mt8173_nor->nor_clk);
|
|
+ clk_disable_unprepare(mtk_nor->spi_clk);
|
|
+ clk_disable_unprepare(mtk_nor->nor_clk);
|
|
}
|
|
|
|
-static int mt8173_nor_enable_clk(struct mt8173_nor *mt8173_nor)
|
|
+static int mtk_nor_enable_clk(struct mtk_nor *mtk_nor)
|
|
{
|
|
int ret;
|
|
|
|
- ret = clk_prepare_enable(mt8173_nor->spi_clk);
|
|
+ ret = clk_prepare_enable(mtk_nor->spi_clk);
|
|
if (ret)
|
|
return ret;
|
|
|
|
- ret = clk_prepare_enable(mt8173_nor->nor_clk);
|
|
+ ret = clk_prepare_enable(mtk_nor->nor_clk);
|
|
if (ret) {
|
|
- clk_disable_unprepare(mt8173_nor->spi_clk);
|
|
+ clk_disable_unprepare(mtk_nor->spi_clk);
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
-static int mtk_nor_init(struct mt8173_nor *mt8173_nor,
|
|
+static int mtk_nor_init(struct mtk_nor *mtk_nor,
|
|
struct device_node *flash_node)
|
|
{
|
|
const struct spi_nor_hwcaps hwcaps = {
|
|
@@ -439,18 +439,18 @@ static int mtk_nor_init(struct mt8173_no
|
|
struct spi_nor *nor;
|
|
|
|
/* initialize controller to accept commands */
|
|
- writel(MTK_NOR_ENABLE_SF_CMD, mt8173_nor->base + MTK_NOR_WRPROT_REG);
|
|
+ writel(MTK_NOR_ENABLE_SF_CMD, mtk_nor->base + MTK_NOR_WRPROT_REG);
|
|
|
|
- nor = &mt8173_nor->nor;
|
|
- nor->dev = mt8173_nor->dev;
|
|
- nor->priv = mt8173_nor;
|
|
+ nor = &mtk_nor->nor;
|
|
+ nor->dev = mtk_nor->dev;
|
|
+ nor->priv = mtk_nor;
|
|
spi_nor_set_flash_node(nor, flash_node);
|
|
|
|
/* fill the hooks to spi nor */
|
|
- nor->read = mt8173_nor_read;
|
|
- nor->read_reg = mt8173_nor_read_reg;
|
|
- nor->write = mt8173_nor_write;
|
|
- nor->write_reg = mt8173_nor_write_reg;
|
|
+ nor->read = mtk_nor_read;
|
|
+ nor->read_reg = mtk_nor_read_reg;
|
|
+ nor->write = mtk_nor_write;
|
|
+ nor->write_reg = mtk_nor_write_reg;
|
|
nor->mtd.name = "mtk_nor";
|
|
/* initialized with NULL */
|
|
ret = spi_nor_scan(nor, NULL, &hwcaps);
|
|
@@ -465,34 +465,34 @@ static int mtk_nor_drv_probe(struct plat
|
|
struct device_node *flash_np;
|
|
struct resource *res;
|
|
int ret;
|
|
- struct mt8173_nor *mt8173_nor;
|
|
+ struct mtk_nor *mtk_nor;
|
|
|
|
if (!pdev->dev.of_node) {
|
|
dev_err(&pdev->dev, "No DT found\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
- mt8173_nor = devm_kzalloc(&pdev->dev, sizeof(*mt8173_nor), GFP_KERNEL);
|
|
- if (!mt8173_nor)
|
|
+ mtk_nor = devm_kzalloc(&pdev->dev, sizeof(*mtk_nor), GFP_KERNEL);
|
|
+ if (!mtk_nor)
|
|
return -ENOMEM;
|
|
- platform_set_drvdata(pdev, mt8173_nor);
|
|
+ platform_set_drvdata(pdev, mtk_nor);
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
- mt8173_nor->base = devm_ioremap_resource(&pdev->dev, res);
|
|
- if (IS_ERR(mt8173_nor->base))
|
|
- return PTR_ERR(mt8173_nor->base);
|
|
+ mtk_nor->base = devm_ioremap_resource(&pdev->dev, res);
|
|
+ if (IS_ERR(mtk_nor->base))
|
|
+ return PTR_ERR(mtk_nor->base);
|
|
|
|
- mt8173_nor->spi_clk = devm_clk_get(&pdev->dev, "spi");
|
|
- if (IS_ERR(mt8173_nor->spi_clk))
|
|
- return PTR_ERR(mt8173_nor->spi_clk);
|
|
+ mtk_nor->spi_clk = devm_clk_get(&pdev->dev, "spi");
|
|
+ if (IS_ERR(mtk_nor->spi_clk))
|
|
+ return PTR_ERR(mtk_nor->spi_clk);
|
|
|
|
- mt8173_nor->nor_clk = devm_clk_get(&pdev->dev, "sf");
|
|
- if (IS_ERR(mt8173_nor->nor_clk))
|
|
- return PTR_ERR(mt8173_nor->nor_clk);
|
|
+ mtk_nor->nor_clk = devm_clk_get(&pdev->dev, "sf");
|
|
+ if (IS_ERR(mtk_nor->nor_clk))
|
|
+ return PTR_ERR(mtk_nor->nor_clk);
|
|
|
|
- mt8173_nor->dev = &pdev->dev;
|
|
+ mtk_nor->dev = &pdev->dev;
|
|
|
|
- ret = mt8173_nor_enable_clk(mt8173_nor);
|
|
+ ret = mtk_nor_enable_clk(mtk_nor);
|
|
if (ret)
|
|
return ret;
|
|
|
|
@@ -503,20 +503,20 @@ static int mtk_nor_drv_probe(struct plat
|
|
ret = -ENODEV;
|
|
goto nor_free;
|
|
}
|
|
- ret = mtk_nor_init(mt8173_nor, flash_np);
|
|
+ ret = mtk_nor_init(mtk_nor, flash_np);
|
|
|
|
nor_free:
|
|
if (ret)
|
|
- mt8173_nor_disable_clk(mt8173_nor);
|
|
+ mtk_nor_disable_clk(mtk_nor);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int mtk_nor_drv_remove(struct platform_device *pdev)
|
|
{
|
|
- struct mt8173_nor *mt8173_nor = platform_get_drvdata(pdev);
|
|
+ struct mtk_nor *mtk_nor = platform_get_drvdata(pdev);
|
|
|
|
- mt8173_nor_disable_clk(mt8173_nor);
|
|
+ mtk_nor_disable_clk(mtk_nor);
|
|
|
|
return 0;
|
|
}
|
|
@@ -524,18 +524,18 @@ static int mtk_nor_drv_remove(struct pla
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static int mtk_nor_suspend(struct device *dev)
|
|
{
|
|
- struct mt8173_nor *mt8173_nor = dev_get_drvdata(dev);
|
|
+ struct mtk_nor *mtk_nor = dev_get_drvdata(dev);
|
|
|
|
- mt8173_nor_disable_clk(mt8173_nor);
|
|
+ mtk_nor_disable_clk(mtk_nor);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mtk_nor_resume(struct device *dev)
|
|
{
|
|
- struct mt8173_nor *mt8173_nor = dev_get_drvdata(dev);
|
|
+ struct mtk_nor *mtk_nor = dev_get_drvdata(dev);
|
|
|
|
- return mt8173_nor_enable_clk(mt8173_nor);
|
|
+ return mtk_nor_enable_clk(mtk_nor);
|
|
}
|
|
|
|
static const struct dev_pm_ops mtk_nor_dev_pm_ops = {
|