tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao.
* tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
Revert "blackfin: dma: current count mmr is read only"
bf533: fix build error: add linux/gpio.h
+10
-9
+1
-1
arch/blackfin/configs/BF526-EZBRD_defconfig
+1
-1
arch/blackfin/configs/BF526-EZBRD_defconfig
···
53
53
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
54
54
# CONFIG_FW_LOADER is not set
55
55
CONFIG_MTD=y
56
-
CONFIG_MTD_CHAR=y
57
56
CONFIG_MTD_BLOCK=y
58
57
CONFIG_MTD_CFI=y
59
58
CONFIG_MTD_CFI_INTELEXT=y
···
62
63
CONFIG_MTD_PHYSMAP=y
63
64
CONFIG_MTD_M25P80=y
64
65
CONFIG_MTD_NAND=m
66
+
CONFIG_MTD_SPI_NOR=y
65
67
CONFIG_BLK_DEV_RAM=y
66
68
CONFIG_SCSI=y
67
69
# CONFIG_SCSI_PROC_FS is not set
+1
-1
arch/blackfin/configs/BF527-EZKIT-V2_defconfig
+1
-1
arch/blackfin/configs/BF527-EZKIT-V2_defconfig
···
58
58
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
59
59
# CONFIG_FW_LOADER is not set
60
60
CONFIG_MTD=y
61
-
CONFIG_MTD_CHAR=m
62
61
CONFIG_MTD_BLOCK=y
63
62
CONFIG_MTD_JEDECPROBE=m
64
63
CONFIG_MTD_RAM=y
···
65
66
CONFIG_MTD_COMPLEX_MAPPINGS=y
66
67
CONFIG_MTD_M25P80=y
67
68
CONFIG_MTD_NAND=m
69
+
CONFIG_MTD_SPI_NOR=y
68
70
CONFIG_BLK_DEV_RAM=y
69
71
CONFIG_SCSI=y
70
72
# CONFIG_SCSI_PROC_FS is not set
+1
-1
arch/blackfin/configs/BF527-EZKIT_defconfig
+1
-1
arch/blackfin/configs/BF527-EZKIT_defconfig
···
57
57
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
58
58
# CONFIG_FW_LOADER is not set
59
59
CONFIG_MTD=y
60
-
CONFIG_MTD_CHAR=m
61
60
CONFIG_MTD_BLOCK=y
62
61
CONFIG_MTD_JEDECPROBE=m
63
62
CONFIG_MTD_RAM=y
···
64
65
CONFIG_MTD_COMPLEX_MAPPINGS=y
65
66
CONFIG_MTD_M25P80=y
66
67
CONFIG_MTD_NAND=m
68
+
CONFIG_MTD_SPI_NOR=y
67
69
CONFIG_BLK_DEV_RAM=y
68
70
CONFIG_SCSI=y
69
71
# CONFIG_SCSI_PROC_FS is not set
+1
-1
arch/blackfin/configs/BF548-EZKIT_defconfig
+1
-1
arch/blackfin/configs/BF548-EZKIT_defconfig
···
64
64
CONFIG_FW_LOADER=m
65
65
CONFIG_MTD=y
66
66
CONFIG_MTD_CMDLINE_PARTS=y
67
-
CONFIG_MTD_CHAR=y
68
67
CONFIG_MTD_BLOCK=y
69
68
CONFIG_MTD_CFI=y
70
69
CONFIG_MTD_CFI_INTELEXT=y
···
74
75
CONFIG_MTD_NAND=y
75
76
CONFIG_MTD_NAND_BF5XX=y
76
77
# CONFIG_MTD_NAND_BF5XX_HWECC is not set
78
+
CONFIG_MTD_SPI_NOR=y
77
79
CONFIG_BLK_DEV_RAM=y
78
80
# CONFIG_SCSI_PROC_FS is not set
79
81
CONFIG_BLK_DEV_SD=y
+1
-1
arch/blackfin/configs/BF609-EZKIT_defconfig
+1
-1
arch/blackfin/configs/BF609-EZKIT_defconfig
···
57
57
CONFIG_FW_LOADER=m
58
58
CONFIG_MTD=y
59
59
CONFIG_MTD_CMDLINE_PARTS=y
60
-
CONFIG_MTD_CHAR=y
61
60
CONFIG_MTD_BLOCK=y
62
61
CONFIG_MTD_CFI=y
63
62
CONFIG_MTD_CFI_INTELEXT=y
···
64
65
CONFIG_MTD_COMPLEX_MAPPINGS=y
65
66
CONFIG_MTD_PHYSMAP=y
66
67
CONFIG_MTD_M25P80=y
68
+
CONFIG_MTD_SPI_NOR=y
67
69
CONFIG_MTD_UBI=m
68
70
CONFIG_SCSI=y
69
71
CONFIG_BLK_DEV_SD=y
+1
-2
arch/blackfin/configs/BlackStamp_defconfig
+1
-2
arch/blackfin/configs/BlackStamp_defconfig
···
45
45
# CONFIG_FW_LOADER is not set
46
46
CONFIG_MTD=y
47
47
CONFIG_MTD_CMDLINE_PARTS=y
48
-
CONFIG_MTD_CHAR=m
49
48
CONFIG_MTD_BLOCK=y
50
49
CONFIG_MTD_CFI=m
51
50
CONFIG_MTD_CFI_AMDSTD=m
···
52
53
CONFIG_MTD_ROM=m
53
54
CONFIG_MTD_COMPLEX_MAPPINGS=y
54
55
CONFIG_MTD_M25P80=y
55
-
# CONFIG_M25PXX_USE_FAST_READ is not set
56
+
CONFIG_MTD_SPI_NOR=y
56
57
CONFIG_BLK_DEV_LOOP=y
57
58
CONFIG_BLK_DEV_NBD=y
58
59
CONFIG_BLK_DEV_RAM=y
+1
-2
arch/blackfin/configs/H8606_defconfig
+1
-2
arch/blackfin/configs/H8606_defconfig
···
36
36
# CONFIG_WIRELESS is not set
37
37
# CONFIG_FW_LOADER is not set
38
38
CONFIG_MTD=y
39
-
CONFIG_MTD_CHAR=y
40
39
CONFIG_MTD_BLOCK=y
41
40
CONFIG_MTD_RAM=y
42
41
CONFIG_MTD_ROM=y
43
42
CONFIG_MTD_COMPLEX_MAPPINGS=y
44
43
CONFIG_MTD_M25P80=y
45
-
# CONFIG_M25PXX_USE_FAST_READ is not set
44
+
CONFIG_MTD_SPI_NOR=y
46
45
CONFIG_BLK_DEV_RAM=y
47
46
CONFIG_MISC_DEVICES=y
48
47
CONFIG_EEPROM_AT25=y
+2
arch/blackfin/include/asm/dma.h
+2
arch/blackfin/include/asm/dma.h
···
316
316
}
317
317
static inline void enable_dma(unsigned int channel)
318
318
{
319
+
dma_ch[channel].regs->curr_x_count = 0;
320
+
dma_ch[channel].regs->curr_y_count = 0;
319
321
dma_ch[channel].regs->cfg |= DMAEN;
320
322
}
321
323
int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data);