diff --git a/drivers/scsi/ufs/ufs-tegra.c b/drivers/scsi/ufs/ufs-tegra.c index 73c64e6b..839cc380 100644 --- a/drivers/scsi/ufs/ufs-tegra.c +++ b/drivers/scsi/ufs/ufs-tegra.c @@ -686,31 +686,6 @@ static void ufs_tegra_pwr_change_clk_boost(struct ufs_tegra_host *ufs_tegra) udelay(20); } -void ufs_tegra_disable_mphy_slcg(struct ufs_tegra_host *ufs_tegra) -{ - u32 val = 0, reg_cg_over, reg_vendor_0; - - if (ufs_tegra->soc->chip_id == TEGRA234) { - reg_cg_over = MPHY_TX_APB_TX_CG_OVR0_0_T234; - reg_vendor_0 = MPHY_TX_APB_TX_VENDOR0_0_T234; - } else { - reg_cg_over = MPHY_TX_APB_TX_CG_OVR0_0; - reg_vendor_0 = MPHY_TX_APB_TX_VENDOR0_0; - } - - val = (MPHY_TX_CLK_EN_SYMB | MPHY_TX_CLK_EN_SLOW | - MPHY_TX_CLK_EN_FIXED | MPHY_TX_CLK_EN_3X); - mphy_writel(ufs_tegra->mphy_l0_base, val, reg_cg_over); - mphy_writel(ufs_tegra->mphy_l0_base, MPHY_GO_BIT, reg_vendor_0); - - if (ufs_tegra->x2config) { - mphy_writel(ufs_tegra->mphy_l1_base, val, reg_cg_over); - mphy_writel(ufs_tegra->mphy_l1_base, MPHY_GO_BIT, reg_vendor_0); - } - -} - - static void ufs_tegra_mphy_rx_sync_capability(struct ufs_tegra_host *ufs_tegra) { u32 val_88_8b = 0; @@ -791,31 +766,7 @@ static void ufs_tegra_mphy_rx_sync_capability(struct ufs_tegra_host *ufs_tegra) } } -void ufs_tegra_mphy_tx_advgran(struct ufs_tegra_host *ufs_tegra) -{ - u32 val = 0, reg_vendor_0; - - if (ufs_tegra->soc->chip_id == TEGRA234) - reg_vendor_0 = MPHY_TX_APB_TX_VENDOR0_0_T234; - else - reg_vendor_0 = MPHY_TX_APB_TX_VENDOR0_0; - - val = (TX_ADVANCED_GRANULARITY | TX_ADVANCED_GRANULARITY_SETTINGS); - mphy_update(ufs_tegra->mphy_l0_base, val, - MPHY_TX_APB_TX_ATTRIBUTE_34_37_0); - mphy_writel(ufs_tegra->mphy_l0_base, MPHY_GO_BIT, - reg_vendor_0); - - if (ufs_tegra->x2config) { - mphy_update(ufs_tegra->mphy_l1_base, val, - MPHY_TX_APB_TX_ATTRIBUTE_34_37_0); - mphy_writel(ufs_tegra->mphy_l1_base, MPHY_GO_BIT, - reg_vendor_0); - } -} - - -void ufs_tegra_mphy_rx_advgran(struct ufs_tegra_host *ufs_tegra) +static void ufs_tegra_mphy_rx_advgran(struct ufs_tegra_host *ufs_tegra) { u32 val = 0, reg_vendor_2; @@ -852,26 +803,26 @@ void ufs_tegra_mphy_rx_advgran(struct ufs_tegra_host *ufs_tegra) } } -void ufs_tegra_ufs_aux_ref_clk_enable(struct ufs_tegra_host *ufs_tegra) +static void ufs_tegra_ufs_aux_ref_clk_enable(struct ufs_tegra_host *ufs_tegra) { ufs_aux_update(ufs_tegra->ufs_aux_base, UFSHC_DEV_CLK_EN, UFSHC_AUX_UFSHC_DEV_CTRL_0); } -void ufs_tegra_ufs_aux_ref_clk_disable(struct ufs_tegra_host *ufs_tegra) +static void ufs_tegra_ufs_aux_ref_clk_disable(struct ufs_tegra_host *ufs_tegra) { ufs_aux_clear_bits(ufs_tegra->ufs_aux_base, UFSHC_DEV_CLK_EN, UFSHC_AUX_UFSHC_DEV_CTRL_0); } -void ufs_tegra_aux_reset_enable(struct ufs_tegra_host *ufs_tegra) +static void ufs_tegra_aux_reset_enable(struct ufs_tegra_host *ufs_tegra) { ufs_aux_clear_bits(ufs_tegra->ufs_aux_base, UFSHC_DEV_RESET, UFSHC_AUX_UFSHC_DEV_CTRL_0); } -void ufs_tegra_ufs_aux_prog(struct ufs_tegra_host *ufs_tegra) +static void ufs_tegra_ufs_aux_prog(struct ufs_tegra_host *ufs_tegra) { /* diff --git a/include/uapi/scsi/ufs/ioctl.h b/include/uapi/scsi/ufs/ioctl.h index 25bb68c6..95f87112 100644 --- a/include/uapi/scsi/ufs/ioctl.h +++ b/include/uapi/scsi/ufs/ioctl.h @@ -63,4 +63,5 @@ struct ufs_ioc_combo_query_req { struct ufs_ioc_query_req *query; }; -#endif /* UAPI_SCSI_UFS_UFS_IOCTL_H_ */ \ No newline at end of file +#endif /* UAPI_SCSI_UFS_UFS_IOCTL_H_ */ +