msm: Rename msmskunk and sdmbat to sdm845 and sdm830
Rename all cases of msmskunk and sdmbat to sdm845 and sdm830
respectively.
Change-Id: Ia0c9a5ed0e4ebad696a62817c967e9baa7885f0f
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
index e864e8b..f734b76 100644
--- a/drivers/clk/qcom/Kconfig
+++ b/drivers/clk/qcom/Kconfig
@@ -151,20 +151,20 @@
Say Y if you want to support multimedia devices such as display,
graphics, video encode/decode, camera, etc.
-config MSM_GCC_SKUNK
- tristate "MSMSKUNK Global Clock Controller"
+config MSM_GCC_SDM845
+ tristate "SDM845 Global Clock Controller"
depends on COMMON_CLK_QCOM
help
Support for the global clock controller on Qualcomm Technologies, Inc
- MSMskunk devices.
+ sdm845 devices.
Say Y if you want to use peripheral devices such as UART, SPI,
i2c, USB, UFS, SD/eMMC, PCIe, etc.
-config MSM_VIDEOCC_SKUNK
- tristate "MSMSKUNK Video Clock Controller"
+config MSM_VIDEOCC_SDM845
+ tristate "SDM845 Video Clock Controller"
depends on COMMON_CLK_QCOM
help
Support for the video clock controller on Qualcomm Technologies, Inc
- MSMskunk devices.
+ sdm845 devices.
Say Y if you want to support video devices and functionality such as
video encode/decode.
diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile
index c227967..62bdf21 100644
--- a/drivers/clk/qcom/Makefile
+++ b/drivers/clk/qcom/Makefile
@@ -26,8 +26,8 @@
obj-$(CONFIG_MSM_GCC_8960) += gcc-msm8960.o
obj-$(CONFIG_MSM_GCC_8974) += gcc-msm8974.o
obj-$(CONFIG_MSM_GCC_8996) += gcc-msm8996.o
-obj-$(CONFIG_MSM_GCC_SKUNK) += gcc-msmskunk.o
-obj-$(CONFIG_MSM_VIDEOCC_SKUNK) += videocc-msmskunk.o
+obj-$(CONFIG_MSM_GCC_SDM845) += gcc-sdm845.o
+obj-$(CONFIG_MSM_VIDEOCC_SDM845) += videocc-sdm845.o
obj-$(CONFIG_MSM_LCC_8960) += lcc-msm8960.o
obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8960.o
obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8974.o
diff --git a/drivers/clk/qcom/gcc-msmskunk.c b/drivers/clk/qcom/gcc-sdm845.c
similarity index 97%
rename from drivers/clk/qcom/gcc-msmskunk.c
rename to drivers/clk/qcom/gcc-sdm845.c
index 59eb0ec..92e0ffa 100644
--- a/drivers/clk/qcom/gcc-msmskunk.c
+++ b/drivers/clk/qcom/gcc-sdm845.c
@@ -23,7 +23,7 @@
#include <linux/regmap.h>
#include <linux/reset-controller.h>
-#include <dt-bindings/clock/qcom,gcc-skunk.h>
+#include <dt-bindings/clock/qcom,gcc-sdm845.h>
#include "common.h"
#include "clk-regmap.h"
@@ -32,7 +32,7 @@
#include "clk-branch.h"
#include "reset.h"
#include "clk-alpha-pll.h"
-#include "vdd-level-skunk.h"
+#include "vdd-level-sdm845.h"
#define GCC_APCS_CLOCK_SLEEP_ENA_VOTE_OFFSET 0x52008
#define CPUSS_AHB_CLK_SLEEP_ENA BIT(21)
@@ -3302,11 +3302,11 @@
},
};
-struct clk_hw *gcc_msmskunk_hws[] = {
+struct clk_hw *gcc_sdm845_hws[] = {
[GCC_XO] = &bi_tcxo.hw,
};
-static struct clk_regmap *gcc_msmskunk_clocks[] = {
+static struct clk_regmap *gcc_sdm845_clocks[] = {
[GCC_AGGRE_NOC_PCIE_TBU_CLK] = &gcc_aggre_noc_pcie_tbu_clk.clkr,
[GCC_AGGRE_UFS_CARD_AXI_CLK] = &gcc_aggre_ufs_card_axi_clk.clkr,
[GCC_AGGRE_UFS_PHY_AXI_CLK] = &gcc_aggre_ufs_phy_axi_clk.clkr,
@@ -3497,7 +3497,7 @@
[GPLL1] = &gpll1.clkr,
};
-static const struct qcom_reset_map gcc_msmskunk_resets[] = {
+static const struct qcom_reset_map gcc_sdm845_resets[] = {
[GCC_GPU_BCR] = { 0x71000 },
[GCC_MMSS_BCR] = { 0xb000 },
[GCC_PCIE_0_BCR] = { 0x6b000 },
@@ -3517,7 +3517,7 @@
[GCC_USB_PHY_CFG_AHB2PHY_BCR] = { 0x6a000 },
};
-static const struct regmap_config gcc_msmskunk_regmap_config = {
+static const struct regmap_config gcc_sdm845_regmap_config = {
.reg_bits = 32,
.reg_stride = 4,
.val_bits = 32,
@@ -3525,33 +3525,33 @@
.fast_io = true,
};
-static const struct qcom_cc_desc gcc_msmskunk_desc = {
- .config = &gcc_msmskunk_regmap_config,
- .clks = gcc_msmskunk_clocks,
- .num_clks = ARRAY_SIZE(gcc_msmskunk_clocks),
- .resets = gcc_msmskunk_resets,
- .num_resets = ARRAY_SIZE(gcc_msmskunk_resets),
+static const struct qcom_cc_desc gcc_sdm845_desc = {
+ .config = &gcc_sdm845_regmap_config,
+ .clks = gcc_sdm845_clocks,
+ .num_clks = ARRAY_SIZE(gcc_sdm845_clocks),
+ .resets = gcc_sdm845_resets,
+ .num_resets = ARRAY_SIZE(gcc_sdm845_resets),
};
-static const struct of_device_id gcc_msmskunk_match_table[] = {
- { .compatible = "qcom,gcc-msmskunk" },
+static const struct of_device_id gcc_sdm845_match_table[] = {
+ { .compatible = "qcom,gcc-sdm845" },
{ }
};
-MODULE_DEVICE_TABLE(of, gcc_msmskunk_match_table);
+MODULE_DEVICE_TABLE(of, gcc_sdm845_match_table);
-static int gcc_msmskunk_probe(struct platform_device *pdev)
+static int gcc_sdm845_probe(struct platform_device *pdev)
{
struct clk *clk;
struct regmap *regmap;
int ret = 0, i;
- regmap = qcom_cc_map(pdev, &gcc_msmskunk_desc);
+ regmap = qcom_cc_map(pdev, &gcc_sdm845_desc);
if (IS_ERR(regmap))
return PTR_ERR(regmap);
/* register hardware clocks */
- for (i = 0; i < ARRAY_SIZE(gcc_msmskunk_hws); i++) {
- clk = devm_clk_register(&pdev->dev, gcc_msmskunk_hws[i]);
+ for (i = 0; i < ARRAY_SIZE(gcc_sdm845_hws); i++) {
+ clk = devm_clk_register(&pdev->dev, gcc_sdm845_hws[i]);
if (IS_ERR(clk))
return PTR_ERR(clk);
}
@@ -3579,7 +3579,7 @@
return PTR_ERR(vdd_cx_ao.regulator[0]);
}
- ret = qcom_cc_really_probe(pdev, &gcc_msmskunk_desc, regmap);
+ ret = qcom_cc_really_probe(pdev, &gcc_sdm845_desc, regmap);
if (ret) {
dev_err(&pdev->dev, "Failed to register GCC clocks\n");
return ret;
@@ -3617,26 +3617,26 @@
return ret;
}
-static struct platform_driver gcc_msmskunk_driver = {
- .probe = gcc_msmskunk_probe,
+static struct platform_driver gcc_sdm845_driver = {
+ .probe = gcc_sdm845_probe,
.driver = {
- .name = "gcc-msmskunk",
- .of_match_table = gcc_msmskunk_match_table,
+ .name = "gcc-sdm845",
+ .of_match_table = gcc_sdm845_match_table,
},
};
-static int __init gcc_msmskunk_init(void)
+static int __init gcc_sdm845_init(void)
{
- return platform_driver_register(&gcc_msmskunk_driver);
+ return platform_driver_register(&gcc_sdm845_driver);
}
-core_initcall(gcc_msmskunk_init);
+core_initcall(gcc_sdm845_init);
-static void __exit gcc_msmskunk_exit(void)
+static void __exit gcc_sdm845_exit(void)
{
- platform_driver_unregister(&gcc_msmskunk_driver);
+ platform_driver_unregister(&gcc_sdm845_driver);
}
-module_exit(gcc_msmskunk_exit);
+module_exit(gcc_sdm845_exit);
-MODULE_DESCRIPTION("QTI GCC MSMSKUNK Driver");
+MODULE_DESCRIPTION("QTI GCC SDM845 Driver");
MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:gcc-msmskunk");
+MODULE_ALIAS("platform:gcc-sdm845");
diff --git a/drivers/clk/qcom/vdd-level-skunk.h b/drivers/clk/qcom/vdd-level-sdm845.h
similarity index 100%
rename from drivers/clk/qcom/vdd-level-skunk.h
rename to drivers/clk/qcom/vdd-level-sdm845.h
diff --git a/drivers/clk/qcom/videocc-msmskunk.c b/drivers/clk/qcom/videocc-sdm845.c
similarity index 85%
rename from drivers/clk/qcom/videocc-msmskunk.c
rename to drivers/clk/qcom/videocc-sdm845.c
index 670efb5..0e9cf88 100644
--- a/drivers/clk/qcom/videocc-msmskunk.c
+++ b/drivers/clk/qcom/videocc-sdm845.c
@@ -23,7 +23,7 @@
#include <linux/regmap.h>
#include <linux/reset-controller.h>
-#include <dt-bindings/clock/qcom,videocc-skunk.h>
+#include <dt-bindings/clock/qcom,videocc-sdm845.h>
#include "common.h"
#include "clk-regmap.h"
@@ -32,7 +32,7 @@
#include "clk-branch.h"
#include "reset.h"
#include "clk-alpha-pll.h"
-#include "vdd-level-skunk.h"
+#include "vdd-level-sdm845.h"
#define F(f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) }
@@ -298,7 +298,7 @@
},
};
-static struct clk_regmap *video_cc_msmskunk_clocks[] = {
+static struct clk_regmap *video_cc_sdm845_clocks[] = {
[VIDEO_CC_APB_CLK] = &video_cc_apb_clk.clkr,
[VIDEO_CC_AT_CLK] = &video_cc_at_clk.clkr,
[VIDEO_CC_DEBUG_CLK] = &video_cc_debug_clk.clkr,
@@ -315,14 +315,14 @@
[VIDEO_PLL0] = &video_pll0.clkr,
};
-static const struct qcom_reset_map video_cc_msmskunk_resets[] = {
+static const struct qcom_reset_map video_cc_sdm845_resets[] = {
[VIDEO_CC_INTERFACE_BCR] = { 0x8f0 },
[VIDEO_CC_VCODEC0_BCR] = { 0x870 },
[VIDEO_CC_VCODEC1_BCR] = { 0x8b0 },
[VIDEO_CC_VENUS_BCR] = { 0x810 },
};
-static const struct regmap_config video_cc_msmskunk_regmap_config = {
+static const struct regmap_config video_cc_sdm845_regmap_config = {
.reg_bits = 32,
.reg_stride = 4,
.val_bits = 32,
@@ -330,26 +330,26 @@
.fast_io = true,
};
-static const struct qcom_cc_desc video_cc_msmskunk_desc = {
- .config = &video_cc_msmskunk_regmap_config,
- .clks = video_cc_msmskunk_clocks,
- .num_clks = ARRAY_SIZE(video_cc_msmskunk_clocks),
- .resets = video_cc_msmskunk_resets,
- .num_resets = ARRAY_SIZE(video_cc_msmskunk_resets),
+static const struct qcom_cc_desc video_cc_sdm845_desc = {
+ .config = &video_cc_sdm845_regmap_config,
+ .clks = video_cc_sdm845_clocks,
+ .num_clks = ARRAY_SIZE(video_cc_sdm845_clocks),
+ .resets = video_cc_sdm845_resets,
+ .num_resets = ARRAY_SIZE(video_cc_sdm845_resets),
};
-static const struct of_device_id video_cc_msmskunk_match_table[] = {
- { .compatible = "qcom,video_cc-msmskunk" },
+static const struct of_device_id video_cc_sdm845_match_table[] = {
+ { .compatible = "qcom,video_cc-sdm845" },
{ }
};
-MODULE_DEVICE_TABLE(of, video_cc_msmskunk_match_table);
+MODULE_DEVICE_TABLE(of, video_cc_sdm845_match_table);
-static int video_cc_msmskunk_probe(struct platform_device *pdev)
+static int video_cc_sdm845_probe(struct platform_device *pdev)
{
struct regmap *regmap;
int ret = 0;
- regmap = qcom_cc_map(pdev, &video_cc_msmskunk_desc);
+ regmap = qcom_cc_map(pdev, &video_cc_sdm845_desc);
if (IS_ERR(regmap)) {
pr_err("Failed to map the Video CC registers\n");
return PTR_ERR(regmap);
@@ -365,7 +365,7 @@
clk_fabia_pll_configure(&video_pll0, regmap, &video_pll0_config);
- ret = qcom_cc_really_probe(pdev, &video_cc_msmskunk_desc, regmap);
+ ret = qcom_cc_really_probe(pdev, &video_cc_sdm845_desc, regmap);
if (ret) {
dev_err(&pdev->dev, "Failed to register Video CC clocks\n");
return ret;
@@ -375,26 +375,26 @@
return ret;
}
-static struct platform_driver video_cc_msmskunk_driver = {
- .probe = video_cc_msmskunk_probe,
+static struct platform_driver video_cc_sdm845_driver = {
+ .probe = video_cc_sdm845_probe,
.driver = {
- .name = "video_cc-msmskunk",
- .of_match_table = video_cc_msmskunk_match_table,
+ .name = "video_cc-sdm845",
+ .of_match_table = video_cc_sdm845_match_table,
},
};
-static int __init video_cc_msmskunk_init(void)
+static int __init video_cc_sdm845_init(void)
{
- return platform_driver_register(&video_cc_msmskunk_driver);
+ return platform_driver_register(&video_cc_sdm845_driver);
}
-core_initcall(video_cc_msmskunk_init);
+core_initcall(video_cc_sdm845_init);
-static void __exit video_cc_msmskunk_exit(void)
+static void __exit video_cc_sdm845_exit(void)
{
- platform_driver_unregister(&video_cc_msmskunk_driver);
+ platform_driver_unregister(&video_cc_sdm845_driver);
}
-module_exit(video_cc_msmskunk_exit);
+module_exit(video_cc_sdm845_exit);
-MODULE_DESCRIPTION("QCOM VIDEO_CC MSMSKUNK Driver");
+MODULE_DESCRIPTION("QCOM VIDEO_CC SDM845 Driver");
MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:video_cc-msmskunk");
+MODULE_ALIAS("platform:video_cc-sdm845");
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_catalog.c b/drivers/gpu/drm/msm/sde/sde_hw_catalog.c
index 7d233e6..c53a373 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_catalog.c
+++ b/drivers/gpu/drm/msm/sde/sde_hw_catalog.c
@@ -1969,7 +1969,7 @@
break;
case SDE_HW_VER_300:
case SDE_HW_VER_400:
- /* update msm8998 and skunk target here */
+ /* update msm8998 and sdm845 target here */
break;
}
}
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_catalog.h b/drivers/gpu/drm/msm/sde/sde_hw_catalog.h
index 5e35e4e..d28be49a 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_catalog.h
+++ b/drivers/gpu/drm/msm/sde/sde_hw_catalog.h
@@ -42,9 +42,9 @@
#define SDE_HW_VER_171 SDE_HW_VER(1, 7, 1) /* 8996 v2.0 */
#define SDE_HW_VER_172 SDE_HW_VER(1, 7, 2) /* 8996 v3.0 */
#define SDE_HW_VER_300 SDE_HW_VER(3, 0, 0) /* 8998 v1.0 */
-#define SDE_HW_VER_400 SDE_HW_VER(4, 0, 0) /* msmskunk v1.0 */
+#define SDE_HW_VER_400 SDE_HW_VER(4, 0, 0) /* sdm845 v1.0 */
-#define IS_MSMSKUNK_TARGET(rev) IS_SDE_MAJOR_MINOR_SAME((rev), SDE_HW_VER_400)
+#define IS_SDM845_TARGET(rev) IS_SDE_MAJOR_MINOR_SAME((rev), SDE_HW_VER_400)
#define MAX_IMG_WIDTH 0x3fff
#define MAX_IMG_HEIGHT 0x3fff
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_lm.c b/drivers/gpu/drm/msm/sde/sde_hw_lm.c
index 6552326..a471dad 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_lm.c
+++ b/drivers/gpu/drm/msm/sde/sde_hw_lm.c
@@ -109,7 +109,7 @@
}
}
-static void sde_hw_lm_setup_blend_config_msmskunk(struct sde_hw_mixer *ctx,
+static void sde_hw_lm_setup_blend_config_sdm845(struct sde_hw_mixer *ctx,
u32 stage, u32 fg_alpha, u32 bg_alpha, u32 blend_op)
{
struct sde_hw_blk_reg_map *c = &ctx->hw;
@@ -227,8 +227,8 @@
unsigned long features)
{
ops->setup_mixer_out = sde_hw_lm_setup_out;
- if (IS_MSMSKUNK_TARGET(m->hwversion))
- ops->setup_blend_config = sde_hw_lm_setup_blend_config_msmskunk;
+ if (IS_SDM845_TARGET(m->hwversion))
+ ops->setup_blend_config = sde_hw_lm_setup_blend_config_sdm845;
else
ops->setup_blend_config = sde_hw_lm_setup_blend_config;
ops->setup_alpha_out = sde_hw_lm_setup_color3;
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 1749037..92fd916 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -54,7 +54,7 @@
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-v3.o
-obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qrbtc-msmskunk.o
+obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qrbtc-sdm845.o
obj-$(CONFIG_PHY_TUSB1210) += phy-tusb1210.o
obj-$(CONFIG_PHY_BRCM_SATA) += phy-brcm-sata.o
obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o
diff --git a/drivers/phy/phy-qcom-ufs-qrbtc-msmskunk.c b/drivers/phy/phy-qcom-ufs-qrbtc-sdm845.c
similarity index 65%
rename from drivers/phy/phy-qcom-ufs-qrbtc-msmskunk.c
rename to drivers/phy/phy-qcom-ufs-qrbtc-sdm845.c
index 61f1232..6834f6a 100644
--- a/drivers/phy/phy-qcom-ufs-qrbtc-msmskunk.c
+++ b/drivers/phy/phy-qcom-ufs-qrbtc-sdm845.c
@@ -12,12 +12,12 @@
*
*/
-#include "phy-qcom-ufs-qrbtc-msmskunk.h"
+#include "phy-qcom-ufs-qrbtc-sdm845.h"
-#define UFS_PHY_NAME "ufs_phy_qrbtc_msmskunk"
+#define UFS_PHY_NAME "ufs_phy_qrbtc_sdm845"
static
-int ufs_qcom_phy_qrbtc_msmskunk_phy_calibrate(struct ufs_qcom_phy *ufs_qcom_phy,
+int ufs_qcom_phy_qrbtc_sdm845_phy_calibrate(struct ufs_qcom_phy *ufs_qcom_phy,
bool is_rate_B)
{
int err;
@@ -44,7 +44,7 @@
}
static int
-ufs_qcom_phy_qrbtc_msmskunk_is_pcs_ready(struct ufs_qcom_phy *phy_common)
+ufs_qcom_phy_qrbtc_sdm845_is_pcs_ready(struct ufs_qcom_phy *phy_common)
{
int err = 0;
u32 val;
@@ -68,7 +68,7 @@
return err;
}
-static void ufs_qcom_phy_qrbtc_msmskunk_start_serdes(struct ufs_qcom_phy *phy)
+static void ufs_qcom_phy_qrbtc_sdm845_start_serdes(struct ufs_qcom_phy *phy)
{
u32 temp;
@@ -82,29 +82,29 @@
mb();
}
-static int ufs_qcom_phy_qrbtc_msmskunk_init(struct phy *generic_phy)
+static int ufs_qcom_phy_qrbtc_sdm845_init(struct phy *generic_phy)
{
return 0;
}
-struct phy_ops ufs_qcom_phy_qrbtc_msmskunk_phy_ops = {
- .init = ufs_qcom_phy_qrbtc_msmskunk_init,
+struct phy_ops ufs_qcom_phy_qrbtc_sdm845_phy_ops = {
+ .init = ufs_qcom_phy_qrbtc_sdm845_init,
.exit = ufs_qcom_phy_exit,
.owner = THIS_MODULE,
};
-struct ufs_qcom_phy_specific_ops phy_qrbtc_msmskunk_ops = {
- .calibrate_phy = ufs_qcom_phy_qrbtc_msmskunk_phy_calibrate,
- .start_serdes = ufs_qcom_phy_qrbtc_msmskunk_start_serdes,
+struct ufs_qcom_phy_specific_ops phy_qrbtc_sdm845_ops = {
+ .calibrate_phy = ufs_qcom_phy_qrbtc_sdm845_phy_calibrate,
+ .start_serdes = ufs_qcom_phy_qrbtc_sdm845_start_serdes,
.is_physical_coding_sublayer_ready =
- ufs_qcom_phy_qrbtc_msmskunk_is_pcs_ready,
+ ufs_qcom_phy_qrbtc_sdm845_is_pcs_ready,
};
-static int ufs_qcom_phy_qrbtc_msmskunk_probe(struct platform_device *pdev)
+static int ufs_qcom_phy_qrbtc_sdm845_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct phy *generic_phy;
- struct ufs_qcom_phy_qrbtc_msmskunk *phy;
+ struct ufs_qcom_phy_qrbtc_sdm845 *phy;
int err = 0;
phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);
@@ -114,7 +114,7 @@
}
generic_phy = ufs_qcom_phy_generic_probe(pdev, &phy->common_cfg,
- &ufs_qcom_phy_qrbtc_msmskunk_phy_ops, &phy_qrbtc_msmskunk_ops);
+ &ufs_qcom_phy_qrbtc_sdm845_phy_ops, &phy_qrbtc_sdm845_ops);
if (!generic_phy) {
dev_err(dev, "%s: ufs_qcom_phy_generic_probe() failed\n",
@@ -132,7 +132,7 @@
return err;
}
-static int ufs_qcom_phy_qrbtc_msmskunk_remove(struct platform_device *pdev)
+static int ufs_qcom_phy_qrbtc_sdm845_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct phy *generic_phy = to_phy(dev);
@@ -147,23 +147,23 @@
return err;
}
-static const struct of_device_id ufs_qcom_phy_qrbtc_msmskunk_of_match[] = {
- {.compatible = "qcom,ufs-phy-qrbtc-msmskunk"},
+static const struct of_device_id ufs_qcom_phy_qrbtc_sdm845_of_match[] = {
+ {.compatible = "qcom,ufs-phy-qrbtc-sdm845"},
{},
};
-MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qrbtc_msmskunk_of_match);
+MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qrbtc_sdm845_of_match);
-static struct platform_driver ufs_qcom_phy_qrbtc_msmskunk_driver = {
- .probe = ufs_qcom_phy_qrbtc_msmskunk_probe,
- .remove = ufs_qcom_phy_qrbtc_msmskunk_remove,
+static struct platform_driver ufs_qcom_phy_qrbtc_sdm845_driver = {
+ .probe = ufs_qcom_phy_qrbtc_sdm845_probe,
+ .remove = ufs_qcom_phy_qrbtc_sdm845_remove,
.driver = {
- .of_match_table = ufs_qcom_phy_qrbtc_msmskunk_of_match,
- .name = "ufs_qcom_phy_qrbtc_msmskunk",
+ .of_match_table = ufs_qcom_phy_qrbtc_sdm845_of_match,
+ .name = "ufs_qcom_phy_qrbtc_sdm845",
.owner = THIS_MODULE,
},
};
-module_platform_driver(ufs_qcom_phy_qrbtc_msmskunk_driver);
+module_platform_driver(ufs_qcom_phy_qrbtc_sdm845_driver);
-MODULE_DESCRIPTION("Universal Flash Storage (UFS) QCOM PHY QRBTC MSMSKUNK");
+MODULE_DESCRIPTION("Universal Flash Storage (UFS) QCOM PHY QRBTC SDM845");
MODULE_LICENSE("GPL v2");
diff --git a/drivers/phy/phy-qcom-ufs-qrbtc-msmskunk.h b/drivers/phy/phy-qcom-ufs-qrbtc-sdm845.h
similarity index 97%
rename from drivers/phy/phy-qcom-ufs-qrbtc-msmskunk.h
rename to drivers/phy/phy-qcom-ufs-qrbtc-sdm845.h
index 2597576..ddcf4192 100644
--- a/drivers/phy/phy-qcom-ufs-qrbtc-msmskunk.h
+++ b/drivers/phy/phy-qcom-ufs-qrbtc-sdm845.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef UFS_QCOM_PHY_QRBTC_MSMSKUNK_H_
-#define UFS_QCOM_PHY_QRBTC_MSMSKUNK_H_
+#ifndef UFS_QCOM_PHY_QRBTC_SDM845_H_
+#define UFS_QCOM_PHY_QRBTC_SDM845_H_
#include "phy-qcom-ufs-i.h"
@@ -166,14 +166,14 @@
/*
- * This structure represents the qrbtc-msmskunk specific phy.
+ * This structure represents the qrbtc-sdm845 specific phy.
* common_cfg MUST remain the first field in this structure
* in case extra fields are added. This way, when calling
* get_ufs_qcom_phy() of generic phy, we can extract the
* common phy structure (struct ufs_qcom_phy) out of it
* regardless of the relevant specific phy.
*/
-struct ufs_qcom_phy_qrbtc_msmskunk {
+struct ufs_qcom_phy_qrbtc_sdm845 {
struct ufs_qcom_phy common_cfg;
};
diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
index 1058e5e..5222936 100644
--- a/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@ -79,23 +79,23 @@
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
Qualcomm TLMM block found on the Qualcomm 8916 platform.
-config PINCTRL_MSMSKUNK
- tristate "Qualcomm Technologies Inc MSMSKUNK pin controller driver"
+config PINCTRL_SDM845
+ tristate "Qualcomm Technologies Inc SDM845 pin controller driver"
depends on GPIOLIB && OF
select PINCTRL_MSM
help
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
Qualcomm Technologies Inc TLMM block found on the Qualcomm
- Technologies Inc MSMSKUNK platform.
+ Technologies Inc SDM845 platform.
-config PINCTRL_SDMBAT
- tristate "Qualcomm Technologies Inc SDMBAT pin controller driver"
+config PINCTRL_SDM830
+ tristate "Qualcomm Technologies Inc SDM830 pin controller driver"
depends on GPIOLIB && OF
select PINCTRL_MSM
help
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
Qualcomm Technologies Inc TLMM block found on the Qualcomm
- Technologies Inc SDMBAT platform.
+ Technologies Inc SDM830 platform.
config PINCTRL_MSM8996
diff --git a/drivers/pinctrl/qcom/Makefile b/drivers/pinctrl/qcom/Makefile
index fd52c43..c66ee3c 100644
--- a/drivers/pinctrl/qcom/Makefile
+++ b/drivers/pinctrl/qcom/Makefile
@@ -15,5 +15,5 @@
obj-$(CONFIG_PINCTRL_QCOM_SPMI_PMIC) += pinctrl-spmi-mpp.o
obj-$(CONFIG_PINCTRL_QCOM_SSBI_PMIC) += pinctrl-ssbi-gpio.o
obj-$(CONFIG_PINCTRL_QCOM_SSBI_PMIC) += pinctrl-ssbi-mpp.o
-obj-$(CONFIG_PINCTRL_MSMSKUNK) += pinctrl-msmskunk.o
-obj-$(CONFIG_PINCTRL_SDMBAT) += pinctrl-sdmbat.o
+obj-$(CONFIG_PINCTRL_SDM845) += pinctrl-sdm845.o
+obj-$(CONFIG_PINCTRL_SDM830) += pinctrl-sdm830.o
diff --git a/drivers/pinctrl/qcom/pinctrl-sdmbat.c b/drivers/pinctrl/qcom/pinctrl-sdm830.c
similarity index 97%
rename from drivers/pinctrl/qcom/pinctrl-sdmbat.c
rename to drivers/pinctrl/qcom/pinctrl-sdm830.c
index 3e4fdda..fc3d0ad 100644
--- a/drivers/pinctrl/qcom/pinctrl-sdmbat.c
+++ b/drivers/pinctrl/qcom/pinctrl-sdm830.c
@@ -118,7 +118,7 @@
.intr_detection_bit = -1, \
.intr_detection_width = -1, \
}
-static const struct pinctrl_pin_desc sdmbat_pins[] = {
+static const struct pinctrl_pin_desc sdm830_pins[] = {
PINCTRL_PIN(0, "GPIO_0"),
PINCTRL_PIN(1, "GPIO_1"),
PINCTRL_PIN(2, "GPIO_2"),
@@ -403,7 +403,7 @@
static const unsigned int sdc2_cmd_pins[] = { 151 };
static const unsigned int sdc2_data_pins[] = { 152 };
-enum sdmbat_functions {
+enum sdm830_functions {
msm_mux_qup0,
msm_mux_gpio,
msm_mux_reserved0,
@@ -1680,7 +1680,7 @@
"gpio123",
};
-static const struct msm_function sdmbat_functions[] = {
+static const struct msm_function sdm830_functions[] = {
FUNCTION(qup0),
FUNCTION(gpio),
FUNCTION(reserved0),
@@ -1996,7 +1996,7 @@
FUNCTION(reserved123),
};
-static const struct msm_pingroup sdmbat_groups[] = {
+static const struct msm_pingroup sdm830_groups[] = {
PINGROUP(0, SOUTH, qup0, NA, reserved0, NA, NA, NA, NA, NA, NA),
PINGROUP(1, SOUTH, qup0, NA, reserved1, NA, NA, NA, NA, NA, NA),
PINGROUP(2, SOUTH, qup0, NA, reserved2, NA, NA, NA, NA, NA, NA),
@@ -2236,48 +2236,48 @@
SDC_QDSD_PINGROUP(sdc2_data, 0x59a000, 9, 0),
};
-static const struct msm_pinctrl_soc_data sdmbat_pinctrl = {
- .pins = sdmbat_pins,
- .npins = ARRAY_SIZE(sdmbat_pins),
- .functions = sdmbat_functions,
- .nfunctions = ARRAY_SIZE(sdmbat_functions),
- .groups = sdmbat_groups,
- .ngroups = ARRAY_SIZE(sdmbat_groups),
+static const struct msm_pinctrl_soc_data sdm830_pinctrl = {
+ .pins = sdm830_pins,
+ .npins = ARRAY_SIZE(sdm830_pins),
+ .functions = sdm830_functions,
+ .nfunctions = ARRAY_SIZE(sdm830_functions),
+ .groups = sdm830_groups,
+ .ngroups = ARRAY_SIZE(sdm830_groups),
.ngpios = 136,
};
-static int sdmbat_pinctrl_probe(struct platform_device *pdev)
+static int sdm830_pinctrl_probe(struct platform_device *pdev)
{
- return msm_pinctrl_probe(pdev, &sdmbat_pinctrl);
+ return msm_pinctrl_probe(pdev, &sdm830_pinctrl);
}
-static const struct of_device_id sdmbat_pinctrl_of_match[] = {
- { .compatible = "qcom,sdmbat-pinctrl", },
+static const struct of_device_id sdm830_pinctrl_of_match[] = {
+ { .compatible = "qcom,sdm830-pinctrl", },
{ },
};
-static struct platform_driver sdmbat_pinctrl_driver = {
+static struct platform_driver sdm830_pinctrl_driver = {
.driver = {
- .name = "sdmbat-pinctrl",
+ .name = "sdm830-pinctrl",
.owner = THIS_MODULE,
- .of_match_table = sdmbat_pinctrl_of_match,
+ .of_match_table = sdm830_pinctrl_of_match,
},
- .probe = sdmbat_pinctrl_probe,
+ .probe = sdm830_pinctrl_probe,
.remove = msm_pinctrl_remove,
};
-static int __init sdmbat_pinctrl_init(void)
+static int __init sdm830_pinctrl_init(void)
{
- return platform_driver_register(&sdmbat_pinctrl_driver);
+ return platform_driver_register(&sdm830_pinctrl_driver);
}
-arch_initcall(sdmbat_pinctrl_init);
+arch_initcall(sdm830_pinctrl_init);
-static void __exit sdmbat_pinctrl_exit(void)
+static void __exit sdm830_pinctrl_exit(void)
{
- platform_driver_unregister(&sdmbat_pinctrl_driver);
+ platform_driver_unregister(&sdm830_pinctrl_driver);
}
-module_exit(sdmbat_pinctrl_exit);
+module_exit(sdm830_pinctrl_exit);
-MODULE_DESCRIPTION("QTI sdmbat pinctrl driver");
+MODULE_DESCRIPTION("QTI sdm830 pinctrl driver");
MODULE_LICENSE("GPL v2");
-MODULE_DEVICE_TABLE(of, sdmbat_pinctrl_of_match);
+MODULE_DEVICE_TABLE(of, sdm830_pinctrl_of_match);
diff --git a/drivers/pinctrl/qcom/pinctrl-msmskunk.c b/drivers/pinctrl/qcom/pinctrl-sdm845.c
similarity index 97%
rename from drivers/pinctrl/qcom/pinctrl-msmskunk.c
rename to drivers/pinctrl/qcom/pinctrl-sdm845.c
index e203b2d..b237a6d 100644
--- a/drivers/pinctrl/qcom/pinctrl-msmskunk.c
+++ b/drivers/pinctrl/qcom/pinctrl-sdm845.c
@@ -116,7 +116,7 @@
.intr_detection_bit = -1, \
.intr_detection_width = -1, \
}
-static const struct pinctrl_pin_desc msmskunk_pins[] = {
+static const struct pinctrl_pin_desc sdm845_pins[] = {
PINCTRL_PIN(0, "GPIO_0"),
PINCTRL_PIN(1, "GPIO_1"),
PINCTRL_PIN(2, "GPIO_2"),
@@ -429,7 +429,7 @@
static const unsigned int sdc2_cmd_pins[] = { 151 };
static const unsigned int sdc2_data_pins[] = { 152 };
-enum msmskunk_functions {
+enum sdm845_functions {
msm_mux_gpio,
msm_mux_qup0,
msm_mux_reserved0,
@@ -1815,7 +1815,7 @@
"gpio96",
};
-static const struct msm_function msmskunk_functions[] = {
+static const struct msm_function sdm845_functions[] = {
FUNCTION(gpio),
FUNCTION(qup0),
FUNCTION(reserved0),
@@ -2158,7 +2158,7 @@
FUNCTION(sdc40),
};
-static const struct msm_pingroup msmskunk_groups[] = {
+static const struct msm_pingroup sdm845_groups[] = {
PINGROUP(0, NORTH, qup0, NA, reserved0, NA, NA, NA, NA, NA, NA),
PINGROUP(1, NORTH, qup0, NA, reserved1, NA, NA, NA, NA, NA, NA),
PINGROUP(2, NORTH, qup0, NA, reserved2, NA, NA, NA, NA, NA, NA),
@@ -2421,48 +2421,48 @@
SDC_QDSD_PINGROUP(sdc2_data, 0x59a000, 9, 0),
};
-static const struct msm_pinctrl_soc_data msmskunk_pinctrl = {
- .pins = msmskunk_pins,
- .npins = ARRAY_SIZE(msmskunk_pins),
- .functions = msmskunk_functions,
- .nfunctions = ARRAY_SIZE(msmskunk_functions),
- .groups = msmskunk_groups,
- .ngroups = ARRAY_SIZE(msmskunk_groups),
+static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
+ .pins = sdm845_pins,
+ .npins = ARRAY_SIZE(sdm845_pins),
+ .functions = sdm845_functions,
+ .nfunctions = ARRAY_SIZE(sdm845_functions),
+ .groups = sdm845_groups,
+ .ngroups = ARRAY_SIZE(sdm845_groups),
.ngpios = 150,
};
-static int msmskunk_pinctrl_probe(struct platform_device *pdev)
+static int sdm845_pinctrl_probe(struct platform_device *pdev)
{
- return msm_pinctrl_probe(pdev, &msmskunk_pinctrl);
+ return msm_pinctrl_probe(pdev, &sdm845_pinctrl);
}
-static const struct of_device_id msmskunk_pinctrl_of_match[] = {
- { .compatible = "qcom,msmskunk-pinctrl", },
+static const struct of_device_id sdm845_pinctrl_of_match[] = {
+ { .compatible = "qcom,sdm845-pinctrl", },
{ },
};
-static struct platform_driver msmskunk_pinctrl_driver = {
+static struct platform_driver sdm845_pinctrl_driver = {
.driver = {
- .name = "msmskunk-pinctrl",
+ .name = "sdm845-pinctrl",
.owner = THIS_MODULE,
- .of_match_table = msmskunk_pinctrl_of_match,
+ .of_match_table = sdm845_pinctrl_of_match,
},
- .probe = msmskunk_pinctrl_probe,
+ .probe = sdm845_pinctrl_probe,
.remove = msm_pinctrl_remove,
};
-static int __init msmskunk_pinctrl_init(void)
+static int __init sdm845_pinctrl_init(void)
{
- return platform_driver_register(&msmskunk_pinctrl_driver);
+ return platform_driver_register(&sdm845_pinctrl_driver);
}
-arch_initcall(msmskunk_pinctrl_init);
+arch_initcall(sdm845_pinctrl_init);
-static void __exit msmskunk_pinctrl_exit(void)
+static void __exit sdm845_pinctrl_exit(void)
{
- platform_driver_unregister(&msmskunk_pinctrl_driver);
+ platform_driver_unregister(&sdm845_pinctrl_driver);
}
-module_exit(msmskunk_pinctrl_exit);
+module_exit(sdm845_pinctrl_exit);
-MODULE_DESCRIPTION("QTI msmskunk pinctrl driver");
+MODULE_DESCRIPTION("QTI sdm845 pinctrl driver");
MODULE_LICENSE("GPL v2");
-MODULE_DEVICE_TABLE(of, msmskunk_pinctrl_of_match);
+MODULE_DEVICE_TABLE(of, sdm845_pinctrl_of_match);
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 2829a02..474f914 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -35,11 +35,11 @@
Level Cache. This provides interfaces to client's that use the LLCC.
Say yes here to enable LLCC slice driver.
-config QCOM_MSMSKUNK_LLCC
- tristate "Qualcomm Technologies, Inc. MSMSKUNK LLCC driver"
+config QCOM_SDM845_LLCC
+ tristate "Qualcomm Technologies, Inc. SDM845 LLCC driver"
depends on QCOM_LLCC
help
- Say yes here to enable the LLCC driver for MSMSKUNK. This is provides
+ Say yes here to enable the LLCC driver for SDM845. This is provides
data required to configure LLCC so that clients can start using the
LLCC slices.
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index 1700319..531685c 100644
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -1,7 +1,7 @@
obj-$(CONFIG_QCOM_CPUSS_DUMP) += cpuss_dump.o
obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o
obj-$(CONFIG_QCOM_LLCC) += llcc-core.o llcc-slice.o
-obj-$(CONFIG_QCOM_MSMSKUNK_LLCC) += llcc-msmskunk.o
+obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o
obj-$(CONFIG_QCOM_LLCC_AMON) += llcc-amon.o
obj-$(CONFIG_QCOM_PM) += spm.o
obj-$(CONFIG_QCOM_SMD) += smd.o
diff --git a/drivers/soc/qcom/llcc-msmskunk.c b/drivers/soc/qcom/llcc-sdm845.c
similarity index 82%
rename from drivers/soc/qcom/llcc-msmskunk.c
rename to drivers/soc/qcom/llcc-sdm845.c
index 41f55eb..0a28ee0 100644
--- a/drivers/soc/qcom/llcc-msmskunk.c
+++ b/drivers/soc/qcom/llcc-sdm845.c
@@ -56,7 +56,7 @@
.activate_on_init = a, \
}
-static struct llcc_slice_config msmskunk_data[] = {
+static struct llcc_slice_config sdm845_data[] = {
SCT_ENTRY("cpuss", 1, 1, 3072, 1, 0, 0xFFF, 0x0, 0, 0, 0, 1, 1),
SCT_ENTRY("vidsc0", 2, 2, 512, 2, 1, 0xFFF, 0x0, 0, 0, 0, 1, 0),
SCT_ENTRY("vidsc1", 3, 3, 512, 2, 1, 0xFFF, 0x0, 0, 0, 0, 1, 0),
@@ -81,38 +81,38 @@
SCT_ENTRY("audiohw", 22, 22, 3072, 1, 0, 0xFFF, 0x0, 0, 0, 0, 1, 0),
};
-static int msmskunk_qcom_llcc_probe(struct platform_device *pdev)
+static int sdm845_qcom_llcc_probe(struct platform_device *pdev)
{
- return qcom_llcc_probe(pdev, msmskunk_data,
- ARRAY_SIZE(msmskunk_data));
+ return qcom_llcc_probe(pdev, sdm845_data,
+ ARRAY_SIZE(sdm845_data));
}
-static const struct of_device_id msmskunk_qcom_llcc_of_match[] = {
- { .compatible = "qcom,msmskunk-llcc", },
+static const struct of_device_id sdm845_qcom_llcc_of_match[] = {
+ { .compatible = "qcom,sdm845-llcc", },
{ },
};
-static struct platform_driver msmskunk_qcom_llcc_driver = {
+static struct platform_driver sdm845_qcom_llcc_driver = {
.driver = {
- .name = "msmskunk-llcc",
+ .name = "sdm845-llcc",
.owner = THIS_MODULE,
- .of_match_table = msmskunk_qcom_llcc_of_match,
+ .of_match_table = sdm845_qcom_llcc_of_match,
},
- .probe = msmskunk_qcom_llcc_probe,
+ .probe = sdm845_qcom_llcc_probe,
.remove = qcom_llcc_remove,
};
-static int __init msmskunk_init_qcom_llcc_init(void)
+static int __init sdm845_init_qcom_llcc_init(void)
{
- return platform_driver_register(&msmskunk_qcom_llcc_driver);
+ return platform_driver_register(&sdm845_qcom_llcc_driver);
}
-module_init(msmskunk_init_qcom_llcc_init);
+module_init(sdm845_init_qcom_llcc_init);
-static void __exit msmskunk_exit_qcom_llcc_exit(void)
+static void __exit sdm845_exit_qcom_llcc_exit(void)
{
- platform_driver_unregister(&msmskunk_qcom_llcc_driver);
+ platform_driver_unregister(&sdm845_qcom_llcc_driver);
}
-module_exit(msmskunk_exit_qcom_llcc_exit);
+module_exit(sdm845_exit_qcom_llcc_exit);
-MODULE_DESCRIPTION("QTI msmskunk LLCC driver");
+MODULE_DESCRIPTION("QTI sdm845 LLCC driver");
MODULE_LICENSE("GPL v2");
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index 7957e83..967b227 100644
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -538,11 +538,11 @@
/* falcon ID */
[317] = {MSM_CPU_FALCON, "MSMFALCON"},
- /* Skunk ID */
- [321] = {MSM_CPU_SKUNK, "MSMSKUNK"},
+ /* sdm845 ID */
+ [321] = {MSM_CPU_SDM845, "SDM845"},
/* Bat ID */
- [328] = {MSM_CPU_BAT, "SDMBAT"},
+ [328] = {MSM_CPU_SDM830, "SDM830"},
/* Uninitialized IDs are not known to run Linux.
* MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
@@ -1221,13 +1221,13 @@
dummy_socinfo.id = 319;
strlcpy(dummy_socinfo.build_id, "apqcobalt - ",
sizeof(dummy_socinfo.build_id));
- } else if (early_machine_is_msmskunk()) {
+ } else if (early_machine_is_sdm845()) {
dummy_socinfo.id = 321;
- strlcpy(dummy_socinfo.build_id, "msmskunk - ",
+ strlcpy(dummy_socinfo.build_id, "sdm845 - ",
sizeof(dummy_socinfo.build_id));
- } else if (early_machine_is_sdmbat()) {
+ } else if (early_machine_is_sdm830()) {
dummy_socinfo.id = 328;
- strlcpy(dummy_socinfo.build_id, "sdmbat - ",
+ strlcpy(dummy_socinfo.build_id, "sdm830 - ",
sizeof(dummy_socinfo.build_id));
}