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

Commit 7616ee95 authored by David Vrabel's avatar David Vrabel Committed by Pierre Ossman
Browse files

sdio: add SDIO_FBR_BASE(f) macro 



Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent e6f918bf

drivers/mmc/core/sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int sdio_read_fbr(struct sdio_func *func) 
	unsigned char data;



	ret = mmc_io_rw_direct(func->card, 0, 0,

		func->num * 0x100 + SDIO_FBR_STD_IF, 0, &data);

		SDIO_FBR_BASE(func->num) + SDIO_FBR_STD_IF, 0, &data);

	if (ret)

		goto out;
@@ -38,7 +38,7 @@ static int sdio_read_fbr(struct sdio_func *func) 


	if (data == 0x0f) {

		ret = mmc_io_rw_direct(func->card, 0, 0,

			func->num * 0x100 + SDIO_FBR_STD_IF_EXT, 0, &data);

			SDIO_FBR_BASE(func->num) + SDIO_FBR_STD_IF_EXT, 0, &data);

		if (ret)

			goto out;

	}

drivers/mmc/core/sdio_cis.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func) 
			fn = 0;



		ret = mmc_io_rw_direct(card, 0, 0,

				       fn * 0x100 + SDIO_FBR_CIS + i, 0, &x);

			SDIO_FBR_BASE(fn) + SDIO_FBR_CIS + i, 0, &x);

		if (ret)

			return ret;

		ptr |= x << (i * 8);

include/linux/mmc/sdio.h

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ 
 * Function Basic Registers (FBR)

 */



#define SDIO_FBR_BASE(f)	((f) * 0x100) /* base of function f's FBRs */



#define SDIO_FBR_STD_IF		0x00



#define  SDIO_FBR_SUPPORTS_CSA	0x40	/* supports Code Storage Area */