mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 03:35:32 -04:00
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v7.2-rc[n] into the next branch, to allow them to get tested together with the pmdomain changes that are targeted for the next release. Signed-off-by: Ulf Hansson <ulfh@kernel.org>
This commit is contained in:
@@ -491,16 +491,8 @@ static int scpsys_ctl_pwrseq_on(struct scpsys_domain *pd)
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (pd->data->rtff_type == SCPSYS_RTFF_TYPE_PCIE_PHY)
|
||||
regmap_set_bits(scpsys->base, pd->data->ctl_offs, PWR_RTFF_CLK_DIS);
|
||||
|
||||
regmap_clear_bits(scpsys->base, pd->data->ctl_offs, PWR_CLK_DIS_BIT);
|
||||
regmap_clear_bits(scpsys->base, pd->data->ctl_offs, PWR_ISO_BIT);
|
||||
|
||||
/* Wait for RTFF HW to sync buck isolation state if this is PCIe PHY RTFF */
|
||||
if (pd->data->rtff_type == SCPSYS_RTFF_TYPE_PCIE_PHY)
|
||||
udelay(5);
|
||||
|
||||
regmap_set_bits(scpsys->base, pd->data->ctl_offs, PWR_RST_B_BIT);
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user