[U-Boot] [PATCH v6 41/76] mtd: dataflash: Drop sf_internal.h

Jagan Teki
2016-02-14T20:48:40Z

Drop using sf_internal.h and get the RDID from spi-nor.h

Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: York Sun <york.sun@nxp.com>
Cc: Haikun Wang <haikun.wang@freescale.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
drivers/mtd/spi-nor/sf_dataflash.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/spi-nor/sf_dataflash.c b/drivers/mtd/spi-nor/sf_dataflash.c
index 525af0a..9943560 100644
--- a/drivers/mtd/spi-nor/sf_dataflash.c
+++ b/drivers/mtd/spi-nor/sf_dataflash.c
@@ -17,8 +17,7 @@
#include <linux/err.h>
#include <linux/math64.h>
#include <linux/mtd/mtd.h>
-
-#include "sf_internal.h"
+#include <linux/mtd/spi-nor.h>

/* reads can bypass the buffers */
#define OP_READ_CONTINUOUS 0xE8
@@ -519,7 +518,7 @@ static struct flash_info *jedec_probe(struct spi_slave *spi)
uint8_t id[5];
uint32_t jedec;
struct flash_info *info;
- u8 cmd = CMD_READ_ID;
+ u8 cmd = SNOR_OP_RDID;
int status;

/*
--
1.9.1