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

Commit 957af18f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.3-next-soc' of... 

Merge tag 'v5.3-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/drivers

cmdq helper:
reoder function parameter and change size of the parameters

* tag 'v5.3-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  soc: mediatek: cmdq: change the type of input parameter
  soc: mediatek: cmdq: reorder the parameter

Link: https://lore.kernel.org/r/8c860e37-3816-d75f-fc37-ce496905ba73@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2f7ce2aa 556030f0

drivers/soc/mediatek/mtk-cmdq-helper.c

+5 −5
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int cmdq_pkt_append_command(struct cmdq_pkt *pkt, enum cmdq_code code, 
	return 0;

}



int cmdq_pkt_write(struct cmdq_pkt *pkt, u32 value, u32 subsys, u32 offset)

int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value)

{

	u32 arg_a = (offset & CMDQ_ARG_A_WRITE_MASK) |

		    (subsys << CMDQ_SUBSYS_SHIFT);
@@ -145,8 +145,8 @@ int cmdq_pkt_write(struct cmdq_pkt *pkt, u32 value, u32 subsys, u32 offset) 
}

EXPORT_SYMBOL(cmdq_pkt_write);



int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u32 value,

			u32 subsys, u32 offset, u32 mask)

int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,

			u16 offset, u32 value, u32 mask)

{

	u32 offset_mask = offset;

	int err = 0;
@@ -161,7 +161,7 @@ int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u32 value, 
}

EXPORT_SYMBOL(cmdq_pkt_write_mask);



int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u32 event)

int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event)

{

	u32 arg_b;
@@ -181,7 +181,7 @@ int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u32 event) 
}

EXPORT_SYMBOL(cmdq_pkt_wfe);



int cmdq_pkt_clear_event(struct cmdq_pkt *pkt, u32 event)

int cmdq_pkt_clear_event(struct cmdq_pkt *pkt, u16 event)

{

	if (event >= CMDQ_MAX_EVENT)

		return -EINVAL;

include/linux/soc/mediatek/mtk-cmdq.h

+7 −7
Original line number Diff line number Diff line
@@ -63,26 +63,26 @@ void cmdq_pkt_destroy(struct cmdq_pkt *pkt); 
/**

 * cmdq_pkt_write() - append write command to the CMDQ packet

 * @pkt:	the CMDQ packet

 * @value:	the specified target register value

 * @subsys:	the CMDQ sub system code

 * @offset:	register offset from CMDQ sub system

 * @value:	the specified target register value

 *

 * Return: 0 for success; else the error code is returned

 */

int cmdq_pkt_write(struct cmdq_pkt *pkt, u32 value, u32 subsys, u32 offset);

int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value);



/**

 * cmdq_pkt_write_mask() - append write command with mask to the CMDQ packet

 * @pkt:	the CMDQ packet

 * @value:	the specified target register value

 * @subsys:	the CMDQ sub system code

 * @offset:	register offset from CMDQ sub system

 * @value:	the specified target register value

 * @mask:	the specified target register mask

 *

 * Return: 0 for success; else the error code is returned

 */

int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u32 value,

			u32 subsys, u32 offset, u32 mask);

int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,

			u16 offset, u32 value, u32 mask);



/**

 * cmdq_pkt_wfe() - append wait for event command to the CMDQ packet
@@ -91,7 +91,7 @@ int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u32 value, 
 *

 * Return: 0 for success; else the error code is returned

 */

int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u32 event);

int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event);



/**

 * cmdq_pkt_clear_event() - append clear event command to the CMDQ packet
@@ -100,7 +100,7 @@ int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u32 event); 
 *

 * Return: 0 for success; else the error code is returned

 */

int cmdq_pkt_clear_event(struct cmdq_pkt *pkt, u32 event);

int cmdq_pkt_clear_event(struct cmdq_pkt *pkt, u16 event);



/**

 * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ