Commit 5ebd0542 authored by Harin Lee's avatar Harin Lee Committed by Takashi Iwai
Browse files

ALSA: ctxfi: Add hw parameter to daio_mgr_dao_init() 



Add a hw parameter to the daio_mgr_dao_init() function to provide
access to model-specific information. This is necessary for proper
configuration of S/PDIF and I2S output ports on different hardware
variants.

Signed-off-by: default avatarHarin Lee <me@harin.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20251124180501.2760421-2-me@harin.net
parent a748e1db

sound/pci/ctxfi/ctdaio.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int dao_rsc_init(struct dao *dao, 
	hw->daio_mgr_commit_write(hw, mgr->mgr.ctrl_blk);



	conf = (desc->msr & 0x7) | (desc->passthru << 3);

	hw->daio_mgr_dao_init(mgr->mgr.ctrl_blk,

	hw->daio_mgr_dao_init(hw, mgr->mgr.ctrl_blk,

			daio_device_index(dao->daio.type, hw), conf);

	hw->daio_mgr_enb_dao(mgr->mgr.ctrl_blk,

			daio_device_index(dao->daio.type, hw));

sound/pci/ctxfi/cthardware.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct hw { 
	int (*daio_mgr_dsb_dai)(void *blk, unsigned int idx);

	int (*daio_mgr_enb_dao)(void *blk, unsigned int idx);

	int (*daio_mgr_dsb_dao)(void *blk, unsigned int idx);

	int (*daio_mgr_dao_init)(void *blk, unsigned int idx,

	int (*daio_mgr_dao_init)(struct hw *hw, void *blk, unsigned int idx,

						unsigned int conf);

	int (*daio_mgr_set_imaparc)(void *blk, unsigned int slot);

	int (*daio_mgr_set_imapnxt)(void *blk, unsigned int next);

sound/pci/ctxfi/cthw20k1.c

+1 −1
Original line number Diff line number Diff line
@@ -1031,7 +1031,7 @@ static int daio_mgr_dsb_dao(void *blk, unsigned int idx) 
	return 0;

}



static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf)

static int daio_mgr_dao_init(struct hw *hw __maybe_unused, void *blk, unsigned int idx, unsigned int conf)

{

	struct daio_mgr_ctrl_blk *ctl = blk;

sound/pci/ctxfi/cthw20k2.c

+1 −1
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ static int daio_mgr_dsb_dao(void *blk, unsigned int idx) 
	return 0;

}



static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf)

static int daio_mgr_dao_init(struct hw *hw __maybe_unused, void *blk, unsigned int idx, unsigned int conf)

{

	struct daio_mgr_ctrl_blk *ctl = blk;