Commit b9dd56e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soundwire-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire 

Pull soundwire updates from Vinod Koul:

 - cleanup and conversion for soundwire sysfs groups

 - intel support for ace2x bits, auxdevice pm improvements

 - qcom multi link device support

* tag 'soundwire-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire: (33 commits)
  soundwire: intel_ace2.x: add support for DOAISE property
  soundwire: intel_ace2.x: add support for DODSE property
  soundwire: intel_ace2x: use DOAIS and DODS settings from firmware
  soundwire: intel_ace2x: cleanup DOAIS/DODS settings
  soundwire: intel_ace2x: simplify check_wake()
  soundwire: intel_ace2x: fix wakeup handling
  soundwire: intel_init: resume all devices on exit.
  soundwire: intel: export intel_resume_child_device
  soundwire: intel_auxdevice: use pm_runtime_resume() instead of pm_request_resume()
  ASoC: SOF: Intel: hda: disable SoundWire interrupt later
  soundwire: qcom: allow multi-link on newer devices
  soundwire: intel_ace2x: use legacy formula for intel_alh_id
  soundwire: reconcile dp0_prop and dpn_prop
  soundwire: intel_ace2x: set the clock source
  soundwire: intel_ace2.x: power-up first before setting SYNCPRD
  soundwire: intel_ace2x: move and extend clock selection
  soundwire: intel: add support for MeteorLake additional clocks
  soundwire: intel: add more values for SYNCPRD
  soundwire: bus: extend base clock checks to 96 MHz
  soundwire: cadence: show the bus frequency and frame shape
  ...
parents 8053d2ff a0df7e04

drivers/soundwire/amd_init.c

+16 −20
Original line number Diff line number Diff line
@@ -17,42 +17,38 @@ 


#define ACP_PAD_PULLDOWN_CTRL				0x0001448

#define ACP_SW_PAD_KEEPER_EN				0x0001454

#define AMD_SDW_PAD_PULLDOWN_CTRL_ENABLE_MASK		0x7f9a

#define AMD_SDW0_PAD_PULLDOWN_CTRL_ENABLE_MASK		0x7f9f

#define AMD_SDW1_PAD_PULLDOWN_CTRL_ENABLE_MASK		0x7ffa

#define AMD_SDW0_PAD_EN_MASK				1

#define AMD_SDW1_PAD_EN_MASK				0x10

#define AMD_SDW_PAD_EN_MASK	(AMD_SDW0_PAD_EN_MASK | AMD_SDW1_PAD_EN_MASK)

#define AMD_SDW0_PAD_CTRL_MASK				0x60

#define AMD_SDW1_PAD_CTRL_MASK				5

#define AMD_SDW_PAD_CTRL_MASK		(AMD_SDW0_PAD_CTRL_MASK | AMD_SDW1_PAD_CTRL_MASK)

#define AMD_SDW0_PAD_EN					1

#define AMD_SDW1_PAD_EN					0x10

#define AMD_SDW_PAD_EN			(AMD_SDW0_PAD_EN | AMD_SDW1_PAD_EN)



static int amd_enable_sdw_pads(void __iomem *mmio, u32 link_mask, struct device *dev)

{

	u32 val;

	u32 pad_keeper_en_mask, pad_pulldown_ctrl_mask;

	u32 pad_keeper_en, pad_pulldown_ctrl_mask;



	switch (link_mask) {

	case 1:

		pad_keeper_en_mask = AMD_SDW0_PAD_EN_MASK;

		pad_pulldown_ctrl_mask = AMD_SDW0_PAD_PULLDOWN_CTRL_ENABLE_MASK;

		pad_keeper_en = AMD_SDW0_PAD_EN;

		pad_pulldown_ctrl_mask = AMD_SDW0_PAD_CTRL_MASK;

		break;

	case 2:

		pad_keeper_en_mask = AMD_SDW1_PAD_EN_MASK;

		pad_pulldown_ctrl_mask = AMD_SDW1_PAD_PULLDOWN_CTRL_ENABLE_MASK;

		pad_keeper_en = AMD_SDW1_PAD_EN;

		pad_pulldown_ctrl_mask = AMD_SDW1_PAD_CTRL_MASK;

		break;

	case 3:

		pad_keeper_en_mask = AMD_SDW_PAD_EN_MASK;

		pad_pulldown_ctrl_mask = AMD_SDW_PAD_PULLDOWN_CTRL_ENABLE_MASK;

		pad_keeper_en = AMD_SDW_PAD_EN;

		pad_pulldown_ctrl_mask = AMD_SDW_PAD_CTRL_MASK;

		break;

	default:

		dev_err(dev, "No SDW Links are enabled\n");

		return -ENODEV;

	}



	val = readl(mmio + ACP_SW_PAD_KEEPER_EN);

	val |= pad_keeper_en_mask;

	writel(val, mmio + ACP_SW_PAD_KEEPER_EN);

	val = readl(mmio + ACP_PAD_PULLDOWN_CTRL);

	val &= pad_pulldown_ctrl_mask;

	writel(val, mmio + ACP_PAD_PULLDOWN_CTRL);

	amd_updatel(mmio, ACP_SW_PAD_KEEPER_EN, pad_keeper_en, pad_keeper_en);

	amd_updatel(mmio, ACP_PAD_PULLDOWN_CTRL, pad_pulldown_ctrl_mask, 0);



	return 0;

}

drivers/soundwire/amd_init.h

+8 −0
Original line number Diff line number Diff line
@@ -10,4 +10,12 @@ 


int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager);



static inline void amd_updatel(void __iomem *mmio, int offset, u32 mask, u32 val)

{

	u32 tmp;



	tmp = readl(mmio + offset);

	tmp = (tmp & ~mask) | val;

	writel(tmp, mmio + offset);

}

#endif

drivers/soundwire/amd_manager.c

+6 −7
Original line number Diff line number Diff line
@@ -89,9 +89,8 @@ static void amd_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager) 
	u32 val;



	mutex_lock(amd_manager->acp_sdw_lock);

	val = readl(amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(amd_manager->instance));

	val |= sdw_manager_reg_mask_array[amd_manager->instance];

	writel(val, amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(amd_manager->instance));

	val = sdw_manager_reg_mask_array[amd_manager->instance];

	amd_updatel(amd_manager->acp_mmio, ACP_EXTERNAL_INTR_CNTL(amd_manager->instance), val, val);

	mutex_unlock(amd_manager->acp_sdw_lock);



	writel(AMD_SDW_IRQ_MASK_0TO7, amd_manager->mmio +
@@ -103,12 +102,12 @@ static void amd_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager) 


static void amd_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager)

{

	u32 val;

	u32 irq_mask;



	mutex_lock(amd_manager->acp_sdw_lock);

	val = readl(amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(amd_manager->instance));

	val &= ~sdw_manager_reg_mask_array[amd_manager->instance];

	writel(val, amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(amd_manager->instance));

	irq_mask = sdw_manager_reg_mask_array[amd_manager->instance];

	amd_updatel(amd_manager->acp_mmio, ACP_EXTERNAL_INTR_CNTL(amd_manager->instance),

		    irq_mask, 0);

	mutex_unlock(amd_manager->acp_sdw_lock);



	writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7);

drivers/soundwire/bus.c

+7 −7
Original line number Diff line number Diff line
@@ -1312,18 +1312,18 @@ static int sdw_slave_set_frequency(struct sdw_slave *slave) 
	if (!(19200000 % mclk_freq)) {

		mclk_freq = 19200000;

		base = SDW_SCP_BASE_CLOCK_19200000_HZ;

	} else if (!(24000000 % mclk_freq)) {

		mclk_freq = 24000000;

		base = SDW_SCP_BASE_CLOCK_24000000_HZ;

	} else if (!(24576000 % mclk_freq)) {

		mclk_freq = 24576000;

		base = SDW_SCP_BASE_CLOCK_24576000_HZ;

	} else if (!(22579200 % mclk_freq)) {

		mclk_freq = 22579200;

		base = SDW_SCP_BASE_CLOCK_22579200_HZ;

	} else if (!(24576000 % mclk_freq)) {

		mclk_freq = 24576000;

		base = SDW_SCP_BASE_CLOCK_24576000_HZ;

	} else if (!(32000000 % mclk_freq)) {

		mclk_freq = 32000000;

		base = SDW_SCP_BASE_CLOCK_32000000_HZ;

	} else if (!(96000000 % mclk_freq)) {

		mclk_freq = 24000000;

		base = SDW_SCP_BASE_CLOCK_24000000_HZ;

	} else {

		dev_err(&slave->dev,

			"Unsupported clock base, mclk %d\n",
@@ -1474,7 +1474,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status) 
	}



	do {

		clear = status & ~SDW_DP0_INTERRUPTS;

		clear = status & ~(SDW_DP0_INTERRUPTS | SDW_DP0_SDCA_CASCADE);



		if (status & SDW_DP0_INT_TEST_FAIL) {

			dev_err(&slave->dev, "Test fail for port 0\n");

drivers/soundwire/bus_type.c

+3 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ static int sdw_drv_probe(struct device *dev) 
	if (slave->prop.use_domain_irq)

		sdw_irq_create_mapping(slave);



	/* init the sysfs as we have properties now */

	ret = sdw_slave_sysfs_init(slave);

	/* init the dynamic sysfs attributes we need */

	ret = sdw_slave_sysfs_dpn_init(slave);

	if (ret < 0)

		dev_warn(dev, "Slave sysfs init failed:%d\n", ret);
@@ -221,6 +221,7 @@ int __sdw_register_driver(struct sdw_driver *drv, struct module *owner) 
	drv->driver.probe = sdw_drv_probe;

	drv->driver.remove = sdw_drv_remove;

	drv->driver.shutdown = sdw_drv_shutdown;

	drv->driver.dev_groups = sdw_attr_groups;



	return driver_register(&drv->driver);

}