Unverified Commit 3d324898 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: catpt: Cleanup after power routines streamlining 



With LPT switching to WPT-based power on/off routines, functions that
have been previously used by it are rendered redundant so remove them.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20201116133332.8530-6-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c440c724

sound/soc/intel/catpt/core.h

+0 −4
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ struct catpt_spec { 
	u32 d3srampgd_bit;

	u32 d3pgd_bit;

	void (*pll_shutdown)(struct catpt_dev *cdev, bool enable);

	int (*power_up)(struct catpt_dev *cdev);

	int (*power_down)(struct catpt_dev *cdev);

};



struct catpt_dev {
@@ -128,8 +126,6 @@ int catpt_dma_memcpy_fromdsp(struct catpt_dev *cdev, struct dma_chan *chan, 


void lpt_dsp_pll_shutdown(struct catpt_dev *cdev, bool enable);

void wpt_dsp_pll_shutdown(struct catpt_dev *cdev, bool enable);

int lpt_dsp_power_up(struct catpt_dev *cdev);

int lpt_dsp_power_down(struct catpt_dev *cdev);

int catpt_dsp_power_up(struct catpt_dev *cdev);

int catpt_dsp_power_down(struct catpt_dev *cdev);

int catpt_dsp_stall(struct catpt_dev *cdev, bool stall);

sound/soc/intel/catpt/dsp.c

+0 −46
Original line number Diff line number Diff line
@@ -341,52 +341,6 @@ static void catpt_dsp_set_regs_defaults(struct catpt_dev *cdev) 
	}

}



int lpt_dsp_power_down(struct catpt_dev *cdev)

{

	catpt_dsp_reset(cdev, true);



	/* set 24Mhz clock for both SSPs */

	catpt_updatel_shim(cdev, CS1, CATPT_CS_SBCS(0) | CATPT_CS_SBCS(1),

			   CATPT_CS_SBCS(0) | CATPT_CS_SBCS(1));

	catpt_dsp_select_lpclock(cdev, true, false);



	/* DRAM power gating all */

	catpt_dsp_set_srampge(cdev, &cdev->dram, cdev->spec->dram_mask,

			      cdev->spec->dram_mask);

	catpt_dsp_set_srampge(cdev, &cdev->iram, cdev->spec->iram_mask,

			      cdev->spec->iram_mask);



	catpt_updatel_pci(cdev, PMCS, PCI_PM_CTRL_STATE_MASK, PCI_D3hot);

	/* give hw time to drop off */

	udelay(50);



	return 0;

}



int lpt_dsp_power_up(struct catpt_dev *cdev)

{

	/* SRAM power gating none */

	catpt_dsp_set_srampge(cdev, &cdev->dram, cdev->spec->dram_mask, 0);

	catpt_dsp_set_srampge(cdev, &cdev->iram, cdev->spec->iram_mask, 0);



	catpt_updatel_pci(cdev, PMCS, PCI_PM_CTRL_STATE_MASK, PCI_D0);

	/* give hw time to wake up */

	udelay(100);



	catpt_dsp_select_lpclock(cdev, false, false);

	catpt_updatel_shim(cdev, CS1,

			   CATPT_CS_SBCS(0) | CATPT_CS_SBCS(1),

			   CATPT_CS_SBCS(0) | CATPT_CS_SBCS(1));

	/* stagger DSP reset after clock selection */

	udelay(50);



	catpt_dsp_reset(cdev, false);

	/* generate int deassert msg to fix inversed int logic */

	catpt_updatel_shim(cdev, IMC, CATPT_IMC_IPCDB | CATPT_IMC_IPCCD, 0);



	return 0;

}



int catpt_dsp_power_down(struct catpt_dev *cdev)

{

	u32 mask, val;

CRA Git | Maintained and supported by SUSTech CRA and CCSE