summaryrefslogtreecommitdiff
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorNeeraj Upadhyay <neeraju@codeaurora.org>2016-12-27 19:03:35 +0530
committerNeeraj Upadhyay <neeraju@codeaurora.org>2016-12-28 21:56:21 +0530
commitda23c02138f79eacef6f8adfbf75db2a4a14f3ad (patch)
treeb3d345a93a4b88ca5898c5cad0684d1b674f03f3 /drivers/pinctrl
parentaa36bb38fc87f49921c9e07fdb4a1a74482f26af (diff)
msm: Rename msmfalcon/apqfalcon to sdm660/sda660
Update the code name from msmfalcon/apqfalcon to sdm660/sda660. As part of this, update the filename containing "falcon" and files content containing "falcon". Change-Id: Iec85862251b9e1b4dcc8bdce8b214ce87c0049bc Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/qcom/Kconfig6
-rw-r--r--drivers/pinctrl/qcom/Makefile2
-rw-r--r--drivers/pinctrl/qcom/pinctrl-sdm660.c (renamed from drivers/pinctrl/qcom/pinctrl-msmfalcon.c)54
3 files changed, 31 insertions, 31 deletions
diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
index 68546eec7f61..3f9f58f57393 100644
--- a/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@ -112,13 +112,13 @@ config PINCTRL_MSM8996
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
Qualcomm TLMM block found in the Qualcomm MSM8996 platform.
-config PINCTRL_MSMFALCON
- tristate "Qualcomm MSMFALCON pin controller driver"
+config PINCTRL_SDM660
+ tristate "Qualcomm SDM660 pin controller driver"
depends on GPIOLIB && OF
select PINCTRL_MSM
help
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
- Qualcomm TLMM block found in the Qualcomm MSMFALCON platform.
+ Qualcomm TLMM block found in the Qualcomm SDM660 platform.
config PINCTRL_WCD
tristate "Qualcomm Technologies, Inc WCD pin controller driver"
diff --git a/drivers/pinctrl/qcom/Makefile b/drivers/pinctrl/qcom/Makefile
index fa228c7243e2..502b91f455d7 100644
--- a/drivers/pinctrl/qcom/Makefile
+++ b/drivers/pinctrl/qcom/Makefile
@@ -14,6 +14,6 @@ obj-$(CONFIG_PINCTRL_QCOM_SSBI_PMIC) += pinctrl-ssbi-gpio.o
obj-$(CONFIG_PINCTRL_QCOM_SSBI_PMIC) += pinctrl-ssbi-mpp.o
obj-$(CONFIG_PINCTRL_MSM8996) += pinctrl-msm8996.o
obj-$(CONFIG_PINCTRL_MSM8998) += pinctrl-msm8998.o
-obj-$(CONFIG_PINCTRL_MSMFALCON) += pinctrl-msmfalcon.o
+obj-$(CONFIG_PINCTRL_SDM660) += pinctrl-sdm660.o
obj-$(CONFIG_PINCTRL_WCD) += pinctrl-wcd.o
obj-$(CONFIG_PINCTRL_LPI) += pinctrl-lpi.o
diff --git a/drivers/pinctrl/qcom/pinctrl-msmfalcon.c b/drivers/pinctrl/qcom/pinctrl-sdm660.c
index 91bbce2ce1d1..4dbb4cae2fae 100644
--- a/drivers/pinctrl/qcom/pinctrl-msmfalcon.c
+++ b/drivers/pinctrl/qcom/pinctrl-sdm660.c
@@ -92,7 +92,7 @@
.intr_detection_bit = -1, \
.intr_detection_width = -1, \
}
-static const struct pinctrl_pin_desc msmfalcon_pins[] = {
+static const struct pinctrl_pin_desc sdm660_pins[] = {
PINCTRL_PIN(0, "GPIO_0"),
PINCTRL_PIN(1, "GPIO_1"),
PINCTRL_PIN(2, "GPIO_2"),
@@ -341,7 +341,7 @@ static const unsigned int sdc2_cmd_pins[] = { 118 };
static const unsigned int sdc2_data_pins[] = { 119 };
static const unsigned int sdc1_rclk_pins[] = { 120 };
-enum msmfalcon_functions {
+enum sdm660_functions {
msm_mux_blsp_spi1,
msm_mux_gpio,
msm_mux_blsp_uim1,
@@ -1259,7 +1259,7 @@ static const char * const LCD_PWR_groups[] = {
"gpio113",
};
-static const struct msm_function msmfalcon_functions[] = {
+static const struct msm_function sdm660_functions[] = {
FUNCTION(blsp_spi1),
FUNCTION(gpio),
FUNCTION(blsp_uim1),
@@ -1486,7 +1486,7 @@ static const struct msm_function msmfalcon_functions[] = {
FUNCTION(LCD_PWR),
};
-static const struct msm_pingroup msmfalcon_groups[] = {
+static const struct msm_pingroup sdm660_groups[] = {
PINGROUP(0, SOUTH, blsp_spi1, blsp_uart1, blsp_uim1, tgu_ch0, NA, NA,
qdss_gpio4, atest_gpsadc1, NA),
PINGROUP(1, SOUTH, blsp_spi1, blsp_uart1, blsp_uim1, tgu_ch1, NA, NA,
@@ -1675,48 +1675,48 @@ static const struct msm_pingroup msmfalcon_groups[] = {
SDC_QDSD_PINGROUP(sdc1_rclk, 0x99a000, 15, 0),
};
-static const struct msm_pinctrl_soc_data msmfalcon_pinctrl = {
- .pins = msmfalcon_pins,
- .npins = ARRAY_SIZE(msmfalcon_pins),
- .functions = msmfalcon_functions,
- .nfunctions = ARRAY_SIZE(msmfalcon_functions),
- .groups = msmfalcon_groups,
- .ngroups = ARRAY_SIZE(msmfalcon_groups),
+static const struct msm_pinctrl_soc_data sdm660_pinctrl = {
+ .pins = sdm660_pins,
+ .npins = ARRAY_SIZE(sdm660_pins),
+ .functions = sdm660_functions,
+ .nfunctions = ARRAY_SIZE(sdm660_functions),
+ .groups = sdm660_groups,
+ .ngroups = ARRAY_SIZE(sdm660_groups),
.ngpios = 114,
};
-static int msmfalcon_pinctrl_probe(struct platform_device *pdev)
+static int sdm660_pinctrl_probe(struct platform_device *pdev)
{
- return msm_pinctrl_probe(pdev, &msmfalcon_pinctrl);
+ return msm_pinctrl_probe(pdev, &sdm660_pinctrl);
}
-static const struct of_device_id msmfalcon_pinctrl_of_match[] = {
- { .compatible = "qcom,msmfalcon-pinctrl", },
+static const struct of_device_id sdm660_pinctrl_of_match[] = {
+ { .compatible = "qcom,sdm660-pinctrl", },
{ },
};
-static struct platform_driver msmfalcon_pinctrl_driver = {
+static struct platform_driver sdm660_pinctrl_driver = {
.driver = {
- .name = "msmfalcon-pinctrl",
+ .name = "sdm660-pinctrl",
.owner = THIS_MODULE,
- .of_match_table = msmfalcon_pinctrl_of_match,
+ .of_match_table = sdm660_pinctrl_of_match,
},
- .probe = msmfalcon_pinctrl_probe,
+ .probe = sdm660_pinctrl_probe,
.remove = msm_pinctrl_remove,
};
-static int __init msmfalcon_pinctrl_init(void)
+static int __init sdm660_pinctrl_init(void)
{
- return platform_driver_register(&msmfalcon_pinctrl_driver);
+ return platform_driver_register(&sdm660_pinctrl_driver);
}
-arch_initcall(msmfalcon_pinctrl_init);
+arch_initcall(sdm660_pinctrl_init);
-static void __exit msmfalcon_pinctrl_exit(void)
+static void __exit sdm660_pinctrl_exit(void)
{
- platform_driver_unregister(&msmfalcon_pinctrl_driver);
+ platform_driver_unregister(&sdm660_pinctrl_driver);
}
-module_exit(msmfalcon_pinctrl_exit);
+module_exit(sdm660_pinctrl_exit);
-MODULE_DESCRIPTION("QTI msmfalcon pinctrl driver");
+MODULE_DESCRIPTION("QTI sdm660 pinctrl driver");
MODULE_LICENSE("GPL v2");
-MODULE_DEVICE_TABLE(of, msmfalcon_pinctrl_of_match);
+MODULE_DEVICE_TABLE(of, sdm660_pinctrl_of_match);