diff --git a/drivers/ufs/host/ufs-exynos.c b/drivers/ufs/host/ufs-exynos.c index 5a4b13db29..4eadca2fe3 100644 --- a/drivers/ufs/host/ufs-exynos.c +++ b/drivers/ufs/host/ufs-exynos.c @@ -244,15 +244,6 @@ static int gs101_ufs_drv_init(struct exynos_ufs *ufs) /* Enable clock gating and hibern8 */ hba->caps |= UFSHCD_CAP_CLK_GATING | UFSHCD_CAP_HIBERN8_WITH_CLK_GATING; - /* set ACG to be controlled by UFS_ACG_DISABLE */ - reg = hci_readl(ufs, HCI_IOP_ACG_DISABLE); - hci_writel(ufs, reg & (~HCI_IOP_ACG_DISABLE_EN), HCI_IOP_ACG_DISABLE); - - return exynos_ufs_shareability(ufs); -} - -static int gs201_ufs_drv_init(struct exynos_ufs *ufs) -{ /* * gs101_ufs_suspend() asserts the device reset, so the link can't * stay in Hibern8 across system suspend: at the default level the @@ -261,9 +252,13 @@ static int gs201_ufs_drv_init(struct exynos_ufs *ufs) * link off instead, which resumes through a full re-init, as the * downstream driver does. */ - ufs->hba->spm_lvl = UFS_PM_LVL_5; + hba->spm_lvl = UFS_PM_LVL_5; - return gs101_ufs_drv_init(ufs); + /* set ACG to be controlled by UFS_ACG_DISABLE */ + reg = hci_readl(ufs, HCI_IOP_ACG_DISABLE); + hci_writel(ufs, reg & (~HCI_IOP_ACG_DISABLE_EN), HCI_IOP_ACG_DISABLE); + + return exynos_ufs_shareability(ufs); } static int zuma_ufs_drv_init(struct exynos_ufs *ufs) @@ -2550,7 +2545,7 @@ static const struct exynos_ufs_drv_data gs201_ufs_drvs = { EXYNOS_UFS_OPT_UFSPR_SECURE | EXYNOS_UFS_OPT_TIMER_TICK_SELECT, .iocc_mask = UFS_GS101_SHARABLE, - .drv_init = gs201_ufs_drv_init, + .drv_init = gs101_ufs_drv_init, .pre_link = gs201_ufs_pre_link, .post_link = gs101_ufs_post_link, .pre_pwr_change = gs101_ufs_pre_pwr_change,