Skip to content

L
linux
Commit 23bae78e authored by Guochun Mao's avatar Guochun Mao Committed by Cyrille Pitchen
Browse files
Options

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: default avatarGuochun Mao <guochun.mao@mediatek.com>
Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@wedev4u.fr>
parent a6e4836d
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 120 deletions
drivers/mtd/spi-nor/mtk-quadspi.c
View file @ 23bae78e
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
#define MTK_NOR_PRG_REG(n) (MTK_NOR_PRGDATA0_REG + 4 * (n)) #define MTK_NOR_PRG_REG(n) (MTK_NOR_PRGDATA0_REG + 4 * (n))
#define MTK_NOR_SHREG(n) (MTK_NOR_SHREG0_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 spi_nor nor;
struct device *dev; struct device *dev;
void __iomem *base; /* nor flash base address */ void __iomem *base; /* nor flash base address */
...@@ -118,48 +118,48 @@ struct mt8173_nor { ...@@ -118,48 +118,48 @@ struct mt8173_nor {
struct clk *nor_clk; 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) { switch (nor->read_proto) {
case SNOR_PROTO_1_1_1: case SNOR_PROTO_1_1_1:
writeb(nor->read_opcode, mt8173_nor->base + writeb(nor->read_opcode, mtk_nor->base +
MTK_NOR_PRGDATA3_REG); MTK_NOR_PRGDATA3_REG);
writeb(MTK_NOR_FAST_READ, mt8173_nor->base + writeb(MTK_NOR_FAST_READ, mtk_nor->base +
MTK_NOR_CFG1_REG); MTK_NOR_CFG1_REG);
break; break;
case SNOR_PROTO_1_1_2: case SNOR_PROTO_1_1_2:
writeb(nor->read_opcode, mt8173_nor->base + writeb(nor->read_opcode, mtk_nor->base +
MTK_NOR_PRGDATA3_REG); 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); MTK_NOR_DUAL_REG);
break; break;
case SNOR_PROTO_1_1_4: case SNOR_PROTO_1_1_4:
writeb(nor->read_opcode, mt8173_nor->base + writeb(nor->read_opcode, mtk_nor->base +
MTK_NOR_PRGDATA4_REG); 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); MTK_NOR_DUAL_REG);
break; break;
default: default:
writeb(MTK_NOR_DUAL_DISABLE, mt8173_nor->base + writeb(MTK_NOR_DUAL_DISABLE, mtk_nor->base +
MTK_NOR_DUAL_REG); MTK_NOR_DUAL_REG);
break; 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; int reg;
u8 val = cmdval & 0x1f; u8 val = cmdval & 0x1f;
writeb(cmdval, mt8173_nor->base + MTK_NOR_CMD_REG); writeb(cmdval, mtk_nor->base + MTK_NOR_CMD_REG);
return readl_poll_timeout(mt8173_nor->base + MTK_NOR_CMD_REG, reg, return readl_poll_timeout(mtk_nor->base + MTK_NOR_CMD_REG, reg,
!(reg & val), 100, 10000); !(reg & val), 100, 10000);
} }
static int mt8173_nor_do_tx_rx(struct mt8173_nor *mt8173_nor, u8 op, static int mtk_nor_do_tx_rx(struct mtk_nor *mtk_nor, u8 op,
u8 *tx, int txlen, u8 *rx, int rxlen) u8 *tx, int txlen, u8 *rx, int rxlen)
{ {
int len = 1 + txlen + rxlen; int len = 1 + txlen + rxlen;
int i, ret, idx; int i, ret, idx;
...@@ -167,26 +167,26 @@ static int mt8173_nor_do_tx_rx(struct mt8173_nor *mt8173_nor, u8 op, ...@@ -167,26 +167,26 @@ static int mt8173_nor_do_tx_rx(struct mt8173_nor *mt8173_nor, u8 op,
if (len > MTK_NOR_MAX_SHIFT) if (len > MTK_NOR_MAX_SHIFT)
return -EINVAL; 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 */ /* start at PRGDATA5, go down to PRGDATA0 */
idx = MTK_NOR_MAX_RX_TX_SHIFT - 1; idx = MTK_NOR_MAX_RX_TX_SHIFT - 1;
/* opcode */ /* opcode */
writeb(op, mt8173_nor->base + MTK_NOR_PRG_REG(idx)); writeb(op, mtk_nor->base + MTK_NOR_PRG_REG(idx));
idx--; idx--;
/* program TX data */ /* program TX data */
for (i = 0; i < txlen; i++, idx--) 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 */ /* clear out rest of TX registers */
while (idx >= 0) { while (idx >= 0) {
writeb(0, mt8173_nor->base + MTK_NOR_PRG_REG(idx)); writeb(0, mtk_nor->base + MTK_NOR_PRG_REG(idx));
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) if (ret)
return ret; return ret;
...@@ -195,20 +195,20 @@ static int mt8173_nor_do_tx_rx(struct mt8173_nor *mt8173_nor, u8 op, ...@@ -195,20 +195,20 @@ static int mt8173_nor_do_tx_rx(struct mt8173_nor *mt8173_nor, u8 op,
/* read out RX data */ /* read out RX data */
for (i = 0; i < rxlen; i++, idx--) 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; return 0;
} }
/* Do a WRSR (Write Status Register) command */ /* 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(sr, mtk_nor->base + MTK_NOR_PRGDATA5_REG);
writeb(8, mt8173_nor->base + MTK_NOR_CNT_REG); writeb(8, mtk_nor->base + MTK_NOR_CNT_REG);
return mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_WRSR_CMD); 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; u8 reg;
...@@ -216,27 +216,27 @@ static int mt8173_nor_write_buffer_enable(struct mt8173_nor *mt8173_nor) ...@@ -216,27 +216,27 @@ static int mt8173_nor_write_buffer_enable(struct mt8173_nor *mt8173_nor)
* 0: pre-fetch buffer use for read * 0: pre-fetch buffer use for read
* 1: pre-fetch buffer use for page program * 1: pre-fetch buffer use for page program
*/ */
writel(MTK_NOR_WR_BUF_ENABLE, mt8173_nor->base + MTK_NOR_CFG2_REG); writel(MTK_NOR_WR_BUF_ENABLE, mtk_nor->base + MTK_NOR_CFG2_REG);
return readb_poll_timeout(mt8173_nor->base + MTK_NOR_CFG2_REG, reg, return readb_poll_timeout(mtk_nor->base + MTK_NOR_CFG2_REG, reg,
0x01 == (reg & 0x01), 100, 10000); 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; u8 reg;
writel(MTK_NOR_WR_BUF_DISABLE, mt8173_nor->base + MTK_NOR_CFG2_REG); writel(MTK_NOR_WR_BUF_DISABLE, mtk_nor->base + MTK_NOR_CFG2_REG);
return readb_poll_timeout(mt8173_nor->base + MTK_NOR_CFG2_REG, reg, return readb_poll_timeout(mtk_nor->base + MTK_NOR_CFG2_REG, reg,
MTK_NOR_WR_BUF_DISABLE == (reg & 0x1), 100, MTK_NOR_WR_BUF_DISABLE == (reg & 0x1), 100,
10000); 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; 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) { switch (nor->addr_width) {
case 3: case 3:
...@@ -246,115 +246,115 @@ static void mt8173_nor_set_addr_width(struct mt8173_nor *mt8173_nor) ...@@ -246,115 +246,115 @@ static void mt8173_nor_set_addr_width(struct mt8173_nor *mt8173_nor)
val |= MTK_NOR_4B_ADDR_EN; val |= MTK_NOR_4B_ADDR_EN;
break; break;
default: default:
dev_warn(mt8173_nor->dev, "Unexpected address width %u.\n", dev_warn(mtk_nor->dev, "Unexpected address width %u.\n",
nor->addr_width); nor->addr_width);
break; 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; int i;
mt8173_nor_set_addr_width(mt8173_nor); mtk_nor_set_addr_width(mtk_nor);
for (i = 0; i < 3; i++) { 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; addr >>= 8;
} }
/* Last register is non-contiguous */ /* 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, static ssize_t mtk_nor_read(struct spi_nor *nor, loff_t from, size_t length,
u_char *buffer) u_char *buffer)
{ {
int i, ret; int i, ret;
int addr = (int)from; int addr = (int)from;
u8 *buf = (u8 *)buffer; 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 */ /* set mode for fast read mode ,dual mode or quad mode */
mt8173_nor_set_read_mode(mt8173_nor); mtk_nor_set_read_mode(mtk_nor);
mt8173_nor_set_addr(mt8173_nor, addr); mtk_nor_set_addr(mtk_nor, addr);
for (i = 0; i < length; i++) { 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) if (ret < 0)
return ret; return ret;
buf[i] = readb(mt8173_nor->base + MTK_NOR_RDATA_REG); buf[i] = readb(mtk_nor->base + MTK_NOR_RDATA_REG);
} }
return length; return length;
} }
static int mt8173_nor_write_single_byte(struct mt8173_nor *mt8173_nor, static int mtk_nor_write_single_byte(struct mtk_nor *mtk_nor,
int addr, int length, u8 *data) int addr, int length, u8 *data)
{ {
int i, ret; int i, ret;
mt8173_nor_set_addr(mt8173_nor, addr); mtk_nor_set_addr(mtk_nor, addr);
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
writeb(*data++, mt8173_nor->base + MTK_NOR_WDATA_REG); writeb(*data++, mtk_nor->base + MTK_NOR_WDATA_REG);
ret = mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_PIO_WR_CMD); ret = mtk_nor_execute_cmd(mtk_nor, MTK_NOR_PIO_WR_CMD);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
return 0; return 0;
} }
static int mt8173_nor_write_buffer(struct mt8173_nor *mt8173_nor, int addr, static int mtk_nor_write_buffer(struct mtk_nor *mtk_nor, int addr,
const u8 *buf) const u8 *buf)
{ {
int i, bufidx, data; int i, bufidx, data;
mt8173_nor_set_addr(mt8173_nor, addr); mtk_nor_set_addr(mtk_nor, addr);
bufidx = 0; bufidx = 0;
for (i = 0; i < SFLASH_WRBUF_SIZE; i += 4) { for (i = 0; i < SFLASH_WRBUF_SIZE; i += 4) {
data = buf[bufidx + 3]<<24 | buf[bufidx + 2]<<16 | data = buf[bufidx + 3]<<24 | buf[bufidx + 2]<<16 |
buf[bufidx + 1]<<8 | buf[bufidx]; buf[bufidx + 1]<<8 | buf[bufidx];
bufidx += 4; 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, static ssize_t mtk_nor_write(struct spi_nor *nor, loff_t to, size_t len,
const u_char *buf) const u_char *buf)
{ {
int ret; int ret;
struct mt8173_nor *mt8173_nor = nor->priv; struct mtk_nor *mtk_nor = nor->priv;
size_t i; size_t i;
ret = mt8173_nor_write_buffer_enable(mt8173_nor); ret = mtk_nor_write_buffer_enable(mtk_nor);
if (ret < 0) { 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; return ret;
} }
for (i = 0; i + SFLASH_WRBUF_SIZE <= len; i += SFLASH_WRBUF_SIZE) { 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) { if (ret < 0) {
dev_err(mt8173_nor->dev, "write buffer failed!\n"); dev_err(mtk_nor->dev, "write buffer failed!\n");
return ret; return ret;
} }
to += SFLASH_WRBUF_SIZE; to += SFLASH_WRBUF_SIZE;
buf += 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) { 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; return ret;
} }
if (i < len) { if (i < len) {
ret = mt8173_nor_write_single_byte(mt8173_nor, to, ret = mtk_nor_write_single_byte(mtk_nor, to,
(int)(len - i), (u8 *)buf); (int)(len - i), (u8 *)buf);
if (ret < 0) { 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; return ret;
} }
} }
...@@ -362,72 +362,72 @@ static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len, ...@@ -362,72 +362,72 @@ static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len,
return len; 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; int ret;
struct mt8173_nor *mt8173_nor = nor->priv; struct mtk_nor *mtk_nor = nor->priv;
switch (opcode) { switch (opcode) {
case SPINOR_OP_RDSR: 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) if (ret < 0)
return ret; return ret;
if (len == 1) if (len == 1)
*buf = readb(mt8173_nor->base + MTK_NOR_RDSR_REG); *buf = readb(mtk_nor->base + MTK_NOR_RDSR_REG);
else 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; break;
default: 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; break;
} }
return ret; return ret;
} }
static int mt8173_nor_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, static int mtk_nor_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf,
int len) int len)
{ {
int ret; int ret;
struct mt8173_nor *mt8173_nor = nor->priv; struct mtk_nor *mtk_nor = nor->priv;
switch (opcode) { switch (opcode) {
case SPINOR_OP_WRSR: case SPINOR_OP_WRSR:
/* We only handle 1 byte */ /* We only handle 1 byte */
ret = mt8173_nor_wr_sr(mt8173_nor, *buf); ret = mtk_nor_wr_sr(mtk_nor, *buf);
break; break;
default: 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) if (ret)
dev_warn(mt8173_nor->dev, "write reg failure!\n"); dev_warn(mtk_nor->dev, "write reg failure!\n");
break; break;
} }
return ret; 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(mtk_nor->spi_clk);
clk_disable_unprepare(mt8173_nor->nor_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; int ret;
ret = clk_prepare_enable(mt8173_nor->spi_clk); ret = clk_prepare_enable(mtk_nor->spi_clk);
if (ret) if (ret)
return ret; return ret;
ret = clk_prepare_enable(mt8173_nor->nor_clk); ret = clk_prepare_enable(mtk_nor->nor_clk);
if (ret) { if (ret) {
clk_disable_unprepare(mt8173_nor->spi_clk); clk_disable_unprepare(mtk_nor->spi_clk);
return ret; return ret;
} }
return 0; 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) struct device_node *flash_node)
{ {
const struct spi_nor_hwcaps hwcaps = { const struct spi_nor_hwcaps hwcaps = {
...@@ -439,18 +439,18 @@ static int mtk_nor_init(struct mt8173_nor *mt8173_nor, ...@@ -439,18 +439,18 @@ static int mtk_nor_init(struct mt8173_nor *mt8173_nor,
struct spi_nor *nor; struct spi_nor *nor;
/* initialize controller to accept commands */ /* 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 = &mtk_nor->nor;
nor->dev = mt8173_nor->dev; nor->dev = mtk_nor->dev;
nor->priv = mt8173_nor; nor->priv = mtk_nor;
spi_nor_set_flash_node(nor, flash_node); spi_nor_set_flash_node(nor, flash_node);
/* fill the hooks to spi nor */ /* fill the hooks to spi nor */
nor->read = mt8173_nor_read; nor->read = mtk_nor_read;
nor->read_reg = mt8173_nor_read_reg; nor->read_reg = mtk_nor_read_reg;
nor->write = mt8173_nor_write; nor->write = mtk_nor_write;
nor->write_reg = mt8173_nor_write_reg; nor->write_reg = mtk_nor_write_reg;
nor->mtd.name = "mtk_nor"; nor->mtd.name = "mtk_nor";
/* initialized with NULL */ /* initialized with NULL */
ret = spi_nor_scan(nor, NULL, &hwcaps); ret = spi_nor_scan(nor, NULL, &hwcaps);
...@@ -465,34 +465,34 @@ static int mtk_nor_drv_probe(struct platform_device *pdev) ...@@ -465,34 +465,34 @@ static int mtk_nor_drv_probe(struct platform_device *pdev)
struct device_node *flash_np; struct device_node *flash_np;
struct resource *res; struct resource *res;
int ret; int ret;
struct mt8173_nor *mt8173_nor; struct mtk_nor *mtk_nor;
if (!pdev->dev.of_node) { if (!pdev->dev.of_node) {
dev_err(&pdev->dev, "No DT found\n"); dev_err(&pdev->dev, "No DT found\n");
return -EINVAL; return -EINVAL;
} }
mt8173_nor = devm_kzalloc(&pdev->dev, sizeof(*mt8173_nor), GFP_KERNEL); mtk_nor = devm_kzalloc(&pdev->dev, sizeof(*mtk_nor), GFP_KERNEL);
if (!mt8173_nor) if (!mtk_nor)
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(pdev, mt8173_nor); platform_set_drvdata(pdev, mtk_nor);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mt8173_nor->base = devm_ioremap_resource(&pdev->dev, res); mtk_nor->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(mt8173_nor->base)) if (IS_ERR(mtk_nor->base))
return PTR_ERR(mt8173_nor->base); return PTR_ERR(mtk_nor->base);
mt8173_nor->spi_clk = devm_clk_get(&pdev->dev, "spi"); mtk_nor->spi_clk = devm_clk_get(&pdev->dev, "spi");
if (IS_ERR(mt8173_nor->spi_clk)) if (IS_ERR(mtk_nor->spi_clk))
return PTR_ERR(mt8173_nor->spi_clk); return PTR_ERR(mtk_nor->spi_clk);
mt8173_nor->nor_clk = devm_clk_get(&pdev->dev, "sf"); mtk_nor->nor_clk = devm_clk_get(&pdev->dev, "sf");
if (IS_ERR(mt8173_nor->nor_clk)) if (IS_ERR(mtk_nor->nor_clk))
return PTR_ERR(mt8173_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) if (ret)
return ret; return ret;
...@@ -503,20 +503,20 @@ static int mtk_nor_drv_probe(struct platform_device *pdev) ...@@ -503,20 +503,20 @@ static int mtk_nor_drv_probe(struct platform_device *pdev)
ret = -ENODEV; ret = -ENODEV;
goto nor_free; goto nor_free;
} }
ret = mtk_nor_init(mt8173_nor, flash_np); ret = mtk_nor_init(mtk_nor, flash_np);
nor_free: nor_free:
if (ret) if (ret)
mt8173_nor_disable_clk(mt8173_nor); mtk_nor_disable_clk(mtk_nor);
return ret; return ret;
} }
static int mtk_nor_drv_remove(struct platform_device *pdev) 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; return 0;
} }
...@@ -524,18 +524,18 @@ static int mtk_nor_drv_remove(struct platform_device *pdev) ...@@ -524,18 +524,18 @@ static int mtk_nor_drv_remove(struct platform_device *pdev)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int mtk_nor_suspend(struct device *dev) 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; return 0;
} }
static int mtk_nor_resume(struct device *dev) 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 = { static const struct dev_pm_ops mtk_nor_dev_pm_ops = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7