Blackfin NFC Driver updates
Subsystems (2)
cover Blackfin NFC Driver updates
Hi folks,
Here are 3 bug fixing patches for Blackfin NFC driver.
Thanks
-Bryan
PATCH 1/3 Blackfin NFC Driver: do not clobber DMAC1_PERIMUX
From: Mike Frysinger <[email protected]>
only set DMAC1_PERIMUX once we have requested and been granted the dma channel to prevent breaking other peripherals in the error case
Signed-off-by Mike Frysinger <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
--- drivers/mtd/nand/bf5xx_nand.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
drivers/mtd/nand/bf5xx_nand.c +6 -8
@@ -552,7 +552,6 @@ static void bf5xx_nand_dma_write_buf(struct mtd_info *mtd,static int bf5xx_nand_dma_init (struct bf5xx_nand_info *info) {int ret; -unsigned short val;/* Do not use dma */ if (!hardware_ecc)
@@ -560,13 +559,6 @@ static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info)init_completion (&info->dma_completion); -#ifdef CONFIG_BF54x -/* Setup DMAC1 channel mux for NFC which shared with SDH */ - val =bfin_read_DMAC1_PERIMUX (); - val &=0xFFFE ; -bfin_write_DMAC1_PERIMUX (val); -SSYNC (); -#endif /* Request NFC DMA channel */ ret =request_dma (CH_NFC ,"BF5XX NFC driver" );if (ret <0 ) {
@@ -574,6 +566,12 @@ static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info)return ret; } +#ifdef CONFIG_BF54x +/* Setup DMAC1 channel mux for NFC which shared with SDH */ +bfin_write_DMAC1_PERIMUX (bfin_read_DMAC1_PERIMUX () & ~1 ); +SSYNC (); +#endif +set_dma_callback (CH_NFC , (void *) bf5xx_nand_dma_irq, (void *) info);/* Turn off the DMA channel first */
Signature · 1 line
1.5.6
PATCH 2/3 Blackfin NFC Driver: mark bf5xx_nand_add_partition() as __devinit
In reply to Bryan WuFrom: Mike Frysinger <[email protected]>
the bf5xx_nand_add_partition() func is only called by __devinit functions, so put it into the __devinit section as well
Signed-off-by Mike Frysinger <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
--- drivers/mtd/nand/bf5xx_nand.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mtd/nand/bf5xx_nand.c +1 -1
@@ -630,7 +630,7 @@ static int bf5xx_nand_hw_init(struct bf5xx_nand_info *info)/* * Device management interface */ -static int bf5xx_nand_add_partition (struct bf5xx_nand_info *info) +static int __devinit bf5xx_nand_add_partition (struct bf5xx_nand_info *info) {struct mtd_info *mtd = &info->mtd;
Signature · 1 line
1.5.6
PATCH 3/3 Blackfin NFC Driver: drop pointless casts with set_dma_callback()
In reply to Bryan WuFrom: Mike Frysinger <[email protected]>
Signed-off-by Mike Frysinger <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
--- drivers/mtd/nand/bf5xx_nand.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mtd/nand/bf5xx_nand.c +1 -1
@@ -572,7 +572,7 @@ static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info)SSYNC ();#endif -set_dma_callback (CH_NFC , (void *) bf5xx_nand_dma_irq, (void *) info); +set_dma_callback (CH_NFC , bf5xx_nand_dma_irq, info);/* Turn off the DMA channel first */ disable_dma (CH_NFC );
Signature · 1 line
1.5.6