Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allwinner v3.0 android v2 merge sun4i/sun5i nand driver #65

Closed
wants to merge 3 commits into from
Closed

Allwinner v3.0 android v2 merge sun4i/sun5i nand driver #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcca69c
block: sun4i-nand, sun5i-nand: Move to shared sun4i/sun5i nand part 1
EnJens Aug 12, 2012
00eea7b
block: sunxi-nand: Fix config options, defines and Makefiles
EnJens Aug 12, 2012
38a95e6
block: sunxi: Update defconfigs to match sun4/5i_nand->sunxi_nand
EnJens Aug 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/arm/configs/a12_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
CONFIG_SUN5I_NANDFLASH=y
CONFIG_SUNXI_NANDFLASH=y
# CONFIG_SENSORS_LIS3LV02D is not set
# CONFIG_MISC_DEVICES is not set
CONFIG_HAVE_IDE=y
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/a13_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
CONFIG_SUN5I_NANDFLASH=y
CONFIG_SUNXI_NANDFLASH=y
# CONFIG_SENSORS_LIS3LV02D is not set
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/sun4i_crane_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_BLK_DEV_RBD is not set
CONFIG_SUN4I_NANDFLASH=y
CONFIG_SUNXI_NANDFLASH=y
# CONFIG_SENSORS_LIS3LV02D is not set
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/sun4i_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
CONFIG_SUN4I_NANDFLASH=y
CONFIG_SUNXI_NANDFLASH=y
# CONFIG_SENSORS_LIS3LV02D is not set
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/sun5i_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
CONFIG_SUN5I_NANDFLASH=y
CONFIG_SUNXI_NANDFLASH=y
# CONFIG_SENSORS_LIS3LV02D is not set
# CONFIG_MISC_DEVICES is not set
CONFIG_HAVE_IDE=y
Expand Down
22 changes: 14 additions & 8 deletions drivers/block/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,18 +539,24 @@ config SUN3I_NANDFLASH_TEST
---help---
Nand flash test driver for SUN3I

config SUN4I_NANDFLASH
depends on BLOCK && ARCH_SUN4I
tristate "SUN4I Nandflash Driver"
config SUNXI_NANDFLASH
depends on BLOCK && (ARCH_SUN4I || ARCH_SUN5I)
tristate "SUNXI Nandflash Driver"
---help---
Nand flash driver for SUN4I
Nand flash driver for SUN4I/SUN5I

# Compat options

config SUN4I_NANDFLASH
depends on BLOCK && ARCH_SUN4I
tristate
select SUNXI_NANDFLASH

config SUN5I_NANDFLASH
depends on BLOCK && ARCH_SUN5I
tristate "Nandflash Driver for A12/A13"
---help---
Nand flash driver for A12/A13

tristate
default n
select SUNXI_NANDFLASH


endif # BLK_DEV
3 changes: 1 addition & 2 deletions drivers/block/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
obj-$(CONFIG_BLK_DEV_DRBD) += drbd/
obj-$(CONFIG_BLK_DEV_RBD) += rbd.o
obj-$(CONFIG_SUN3I_NANDFLASH) += sun3i_nand/
obj-$(CONFIG_SUN4I_NANDFLASH) += sun4i_nand/
obj-$(CONFIG_SUN5I_NANDFLASH) += sun5i_nand/
obj-$(CONFIG_SUNXI_NANDFLASH) += sunxi_nand/


swim_mod-y := swim.o swim_asm.o
2 changes: 0 additions & 2 deletions drivers/block/sun4i_nand/Makefile
View file
Open in desktop

This file was deleted.

95 changes: 0 additions & 95 deletions drivers/block/sun4i_nand/include/sunii.h
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions drivers/block/sun4i_nand/nandtest/Makefile
View file
Open in desktop

This file was deleted.