Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad54c3e7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'gpmc-omap-for-v4.15-pt2' of https://github.com/rogerq/linux into next/drivers 

Pull "OMAP-GPMC: driver updates for v4.15, part 2" from Roger Quadros:

* get rid of unused function gpmc_update_nand_reg().

* tag 'gpmc-omap-for-v4.15-pt2' of https://github.com/rogerq/linux:
  memory: omap-gpmc: Remove deprecated gpmc_update_nand_reg()
parents 5b143d2a a622c641

drivers/memory/omap-gpmc.c

+24 −29
Original line number Diff line number Diff line
@@ -1075,10 +1075,33 @@ int gpmc_configure(int cmd, int wval) 
}

EXPORT_SYMBOL(gpmc_configure);



void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs)

static bool gpmc_nand_writebuffer_empty(void)

{

	if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS)

		return true;



	return false;

}



static struct gpmc_nand_ops nand_ops = {

	.nand_writebuffer_empty = gpmc_nand_writebuffer_empty,

};



/**

 * gpmc_omap_get_nand_ops - Get the GPMC NAND interface

 * @regs: the GPMC NAND register map exclusive for NAND use.

 * @cs: GPMC chip select number on which the NAND sits. The

 *      register map returned will be specific to this chip select.

 *

 * Returns NULL on error e.g. invalid cs.

 */

struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs)

{

	int i;



	if (cs >= gpmc_cs_num)

		return NULL;



	reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET +

				GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs;

	reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET +
@@ -1110,34 +1133,6 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) 
		reg->gpmc_bch_result6[i] = gpmc_base + GPMC_ECC_BCH_RESULT_6 +

					   i * GPMC_BCH_SIZE;

	}

}



static bool gpmc_nand_writebuffer_empty(void)

{

	if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS)

		return true;



	return false;

}



static struct gpmc_nand_ops nand_ops = {

	.nand_writebuffer_empty = gpmc_nand_writebuffer_empty,

};



/**

 * gpmc_omap_get_nand_ops - Get the GPMC NAND interface

 * @regs: the GPMC NAND register map exclusive for NAND use.

 * @cs: GPMC chip select number on which the NAND sits. The

 *      register map returned will be specific to this chip select.

 *

 * Returns NULL on error e.g. invalid cs.

 */

struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs)

{

	if (cs >= gpmc_cs_num)

		return NULL;



	gpmc_update_nand_reg(reg, cs);



	return &nand_ops;

}

include/linux/omap-gpmc.h

+0 −12
Original line number Diff line number Diff line
@@ -36,18 +36,6 @@ static inline struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs 
}

#endif /* CONFIG_OMAP_GPMC */



/*--------------------------------*/



/* deprecated APIs */

#if IS_ENABLED(CONFIG_OMAP_GPMC)

void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs);

#else

static inline void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs)

{

}

#endif /* CONFIG_OMAP_GPMC */

/*--------------------------------*/



extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t,

			     struct gpmc_settings *gpmc_s,

			     struct gpmc_device_timings *dev_t);