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

Commit 9d08f10d authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

bcma: add set/mask macros for 16-bit register access 



The BCMA header only had definitions for 32-bit register access. Used
those as a template for the 16-bit flavour. Also changed them to inline
functions to be on the safe side. As offset parameter is used twice there
would be a problem when used like this: bcma_set32(core, offset++, val);

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ffb27565

include/linux/bcma/bcma.h

+26 −6
Original line number Diff line number Diff line
@@ -254,12 +254,32 @@ void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value) 
	core->bus->ops->awrite32(core, offset, value);

}



#define bcma_mask32(cc, offset, mask) \

	bcma_write32(cc, offset, bcma_read32(cc, offset) & (mask))

#define bcma_set32(cc, offset, set) \

	bcma_write32(cc, offset, bcma_read32(cc, offset) | (set))

#define bcma_maskset32(cc, offset, mask, set) \

	bcma_write32(cc, offset, (bcma_read32(cc, offset) & (mask)) | (set))

static inline void bcma_mask32(struct bcma_device *cc, u16 offset, u32 mask)

{

	bcma_write32(cc, offset, bcma_read32(cc, offset) & mask);

}

static inline void bcma_set32(struct bcma_device *cc, u16 offset, u32 set)

{

	bcma_write32(cc, offset, bcma_read32(cc, offset) | set);

}

static inline void bcma_maskset32(struct bcma_device *cc,

				  u16 offset, u32 mask, u32 set)

{

	bcma_write32(cc, offset, (bcma_read32(cc, offset) & mask) | set);

}

static inline void bcma_mask16(struct bcma_device *cc, u16 offset, u16 mask)

{

	bcma_write16(cc, offset, bcma_read16(cc, offset) & mask);

}

static inline void bcma_set16(struct bcma_device *cc, u16 offset, u16 set)

{

	bcma_write16(cc, offset, bcma_read16(cc, offset) | set);

}

static inline void bcma_maskset16(struct bcma_device *cc,

				  u16 offset, u16 mask, u16 set)

{

	bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set);

}



extern bool bcma_core_is_enabled(struct bcma_device *core);

extern void bcma_core_disable(struct bcma_device *core, u32 flags);