Skip to contentSkip to conversation

spi: Drop atmel_dataflash_spi.c

PATCH In review Jagan Teki 5 participants 7 messages May 23, 2017 – Jun 7, 2017

Subsystems (2)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 spi: Drop atmel_dataflash_spi.c

From: Jagan Teki <[email protected]>

Dropped drivers/spi/atmel_dataflash_spi.c becuase of
- No 'driver model' conversion
- Similar driver be there at mtd flash side
- Flash drivers shouldn't be part of spi area
- No response for prior mail in mailing-list

---
Note:
- https://lists.denx.de/pipermail/u-boot/2016-August/265107.html

 board/atmel/at91sam9260ek/partition.c |   1 -
 board/atmel/at91sam9261ek/partition.c |   1 -
 drivers/spi/Makefile                  |   1 -
 drivers/spi/atmel_dataflash_spi.c     | 184 ----------------------------------
 include/configs/at91sam9260ek.h       |  15 ---
 include/configs/at91sam9261ek.h       |  15 ---
 include/configs/pm9261.h              |   1 -
 scripts/config_whitelist.txt          |   4 -
 8 files changed, 222 deletions(-)
 delete mode 100644 drivers/spi/atmel_dataflash_spi.c
board/atmel/at91sam9260ek/partition.c +0 -1
index e41eefe..8617f48 100644
@@ -13,7 +13,6 @@ AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS];
 
 struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
 	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
-	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1, 1}
 };
 
 /*define the area offsets*/
board/atmel/at91sam9261ek/partition.c +0 -1
index ed97609..8617f48 100644
@@ -13,7 +13,6 @@ AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS];
 
 struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
 	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
-	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3, 3}
 };
 
 /*define the area offsets*/
drivers/spi/Makefile +0 -1
index c090562..ef48ee9 100644
@@ -17,7 +17,6 @@ endif
 
 obj-$(CONFIG_ALTERA_SPI) += altera_spi.o
 obj-$(CONFIG_ATH79_SPI) += ath79_spi.o
-obj-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o
 obj-$(CONFIG_ATMEL_SPI) += atmel_spi.o
 obj-$(CONFIG_CADENCE_QSPI) += cadence_qspi.o cadence_qspi_apb.o
 obj-$(CONFIG_CF_SPI) += cf_spi.o
drivers/spi/atmel_dataflash_spi.c deleted +0 -184

184 lines not on this page · raw message

include/configs/at91sam9260ek.h +0 -15
index 48d7f6a..4bd025c 100644
@@ -104,7 +104,6 @@
 #define CONFIG_HAS_DATAFLASH		1
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
-#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1	0xD0000000	/* CS1 */
 #define AT91_SPI_CLK			15000000
 #else
 /* Enable MMC. The MCCK is conflicted with DataFlash */
@@ -157,20 +156,6 @@
 				"mtdparts=atmel_nand:-(root) "		\
 				"rw rootfstype=jffs2"
 
-#elif CONFIG_SYS_USE_DATAFLASH_CS1
-
-/* bootstrap + u-boot + env + linux in dataflash on CS1 */
-#define CONFIG_ENV_IS_IN_DATAFLASH	1
-#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
-#define CONFIG_ENV_OFFSET		0x4200
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
-#define CONFIG_ENV_SIZE		0x4200
-#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
-#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
-				"root=/dev/mtdblock0 "			\
-				"mtdparts=atmel_nand:-(root) "		\
-				"rw rootfstype=jffs2"
-
 #elif defined(CONFIG_SYS_USE_NANDFLASH)
 
 /* bootstrap + u-boot + env + linux in nandflash */
include/configs/at91sam9261ek.h +0 -15
index 505f945..3715ba2 100644
@@ -88,7 +88,6 @@
 #define CONFIG_HAS_DATAFLASH
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
-#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3	0xD0000000	/* CS3 */
 #define AT91_SPI_CLK				15000000
 #define DATAFLASH_TCSS				(0x1a << 16)
 #define DATAFLASH_TCHS				(0x1 << 24)
@@ -150,20 +149,6 @@
 				"mtdparts=atmel_nand:-(root) "		\
 				"rw rootfstype=jffs2"
 
-#elif CONFIG_SYS_USE_DATAFLASH_CS3
-
-/* bootstrap + u-boot + env + linux in dataflash on CS3 */
-#define CONFIG_ENV_IS_IN_DATAFLASH
-#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
-#define CONFIG_ENV_OFFSET	0x4200
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
-#define CONFIG_ENV_SIZE		0x4200
-#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
-#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
-				"root=/dev/mtdblock0 "			\
-				"mtdparts=atmel_nand:-(root) "		\
-				"rw rootfstype=jffs2"
-
 #else /* CONFIG_SYS_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
include/configs/pm9261.h +0 -1
index b22a3b6..1b997b3 100644
@@ -185,7 +185,6 @@
 #define CONFIG_HAS_DATAFLASH
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS		1
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
-#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3	0xD0000000	/* CS3 */
 #define AT91_SPI_CLK				15000000
 #define DATAFLASH_TCSS				(0x1a << 16)
 #define DATAFLASH_TCHS				(0x1 << 24)
scripts/config_whitelist.txt +0 -4
index fa9c3fc..e462496 100644
@@ -192,7 +192,6 @@ CONFIG_ATA_ACPI
 CONFIG_ATI
 CONFIG_ATI_RADEON_FB
 CONFIG_ATM
-CONFIG_ATMEL_DATAFLASH_SPI
 CONFIG_ATMEL_LCD
 CONFIG_ATMEL_LCD_BGR555
 CONFIG_ATMEL_LCD_RGB565
@@ -3189,9 +3188,6 @@ CONFIG_SYS_DA850_PLL1_PLLM
 CONFIG_SYS_DA850_PLL1_POSTDIV
 CONFIG_SYS_DA850_SYSCFG_SUSPSRC
 CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0
-CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1
-CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS2
-CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3
 CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT
 CONFIG_SYS_DAVINCI_I2C_SLAVE
 CONFIG_SYS_DAVINCI_I2C_SLAVE1
Signature · 1 line
2.7.4
#1 lore raw
Quoted 13 lines · Jagannadha Sutradharudu Teki

From: Jagan Teki <[email protected]>

Dropped drivers/spi/atmel_dataflash_spi.c becuase of
- No 'driver model' conversion
- Similar driver be there at mtd flash side
- Flash drivers shouldn't be part of spi area
- No response for prior mail in mailing-list

---
Note:
- https://lists.denx.de/pipermail/u-boot/2016-August/265107.html

Quoted 10 lines
 board/atmel/at91sam9260ek/partition.c |   1 -
 board/atmel/at91sam9261ek/partition.c |   1 -
 drivers/spi/Makefile                  |   1 -
 drivers/spi/atmel_dataflash_spi.c     | 184 ----------------------------------
 include/configs/at91sam9260ek.h       |  15 ---
 include/configs/at91sam9261ek.h       |  15 ---
 include/configs/pm9261.h              |   1 -
 scripts/config_whitelist.txt          |   4 -
 8 files changed, 222 deletions(-)
 delete mode 100644 drivers/spi/atmel_dataflash_spi.c

The problem here is that you need to remove the boards in question as well. I see the baord maintainer was Cc'd on this email, so this is a bit stronger of a poke, as I guess we need to drop these boards.. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170605/4462657f/attachment.sig>
#2 lore raw

Hi everybody,

Quoted 3 lines

The problem here is that you need to remove the boards in question as well. I see the baord maintainer was Cc'd on this email, so this is a bit stronger of a poke, as I guess we need to drop these boards..

It looks like I'm still listed as the maintainer, although I haven't been involved in u-boot development for years...

I no longer have access to any AT91 board, so if someone wants to take over, it's ok to me. Otherwise, you can mark those boards as orphaned, or remove them from the tree.

Thanks,

Stelian.

Signature · 1 line
Stelian Pop <[email protected]>
#3 lore raw
Quoted 6 lines · Stelian Pop

Hi everybody,

Quoted 3 lines

The problem here is that you need to remove the boards in question as well. I see the baord maintainer was Cc'd on this email, so this is a bit stronger of a poke, as I guess we need to drop these boards..

Quoted 6 lines

It looks like I'm still listed as the maintainer, although I haven't been involved in u-boot development for years...

I no longer have access to any AT91 board, so if someone wants to take over, it's ok to me. Otherwise, you can mark those boards as orphaned, or remove them from the tree.

Thanks Stelian. Wenyou, you've done some changes to some of these boards recently, would you care to pick them up, or should I go ahead and remove them? Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170605/b489e7a9/attachment.sig>
#4 lore raw

Hi Tom,

Quoted 10 lines · Stelian Pop
Quoted 9 lines

Hi everybody,

Quoted 3 lines

The problem here is that you need to remove the boards in question as well. I see the baord maintainer was Cc'd on this email, so this is a bit stronger of a poke, as I guess we need to drop these boards..

It looks like I'm still listed as the maintainer, although I haven't been involved in u-boot development for years...

Quoted 6 lines
Quoted 3 lines

I no longer have access to any AT91 board, so if someone wants to take over, it's ok to me. Otherwise, you can mark those boards as orphaned, or remove them from the tree.

Thanks Stelian. Wenyou, you've done some changes to some of these boards recently, would you care to pick them up, or should I go ahead and remove them?

Please don't remove these boards.

We agree to drop atmel_dataflash_spi.c, and I will convert these boards by using the new dataflash driver.

Thank you.

Best Regards,
Wenyou Yang

#5 lore raw
Quoted 16 lines · Wenyou.Yang at microchip.com

Hi Tom,

Quoted 14 lines · Stelian Pop
Quoted 12 lines

Hi everybody,

Quoted 3 lines

The problem here is that you need to remove the boards in question as well. I see the baord maintainer was Cc'd on this email, so this is a bit stronger of a poke, as I guess we need to drop these boards..

It looks like I'm still listed as the maintainer, although I haven't been involved in u-boot development for years...

I no longer have access to any AT91 board, so if someone wants to take over, it's ok to me. Otherwise, you can mark those boards as orphaned, or remove them from the tree.

Quoted 7 lines
Quoted 2 lines

Thanks Stelian. Wenyou, you've done some changes to some of these boards recently, would you care to pick them up, or should I go ahead and remove them?

Please don't remove these boards.

We agree to drop atmel_dataflash_spi.c, and I will convert these boards by using the new dataflash driver.

Please do the conversion and then we can drop the old file (otherwise the build fails), and please send a patch updating the MAINTAINERS file soon, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170606/9619189f/attachment.sig>
#6 lore raw
Quoted 17 lines · Tom Rini
Quoted 16 lines · Wenyou.Yang at microchip.com

Hi Tom,

Quoted 14 lines · Stelian Pop
Quoted 11 lines

Hi everybody,

Quoted 3 lines

The problem here is that you need to remove the boards in question as well. I see the baord maintainer was Cc'd on this email, so this is a bit stronger of a poke, as I guess we need to drop these boards..

It looks like I'm still listed as the maintainer, although I haven't been involved in u-boot development for years...

I no longer have access to any AT91 board, so if someone wants to take over, it's ok to me. Otherwise, you can mark those boards as orphaned, or remove them from the tree.

Thanks Stelian. Wenyou, you've done some changes to some of these boards recently, would you care to pick them up, or should I go ahead and remove them?

Quoted 7 lines
Quoted 4 lines

Please don't remove these boards.

We agree to drop atmel_dataflash_spi.c, and I will convert these boards by using the new dataflash driver.

Please do the conversion and then we can drop the old file (otherwise the build fails), and please send a patch updating the MAINTAINERS file soon, thanks!

All right, thanks.

Quoted 6 lines

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

Best Regards,
Wenyou Yang