summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@sonymobile.com>2013-12-14 23:01:54 -0800
committerLinus Walleij <linus.walleij@linaro.org>2013-12-16 10:33:42 +0100
commitb31d100e9225d013b7b9b4162a2bd3c6724954bd (patch)
tree1385245cfa96221df4ee4a9c328eda789ead4368
parent408e3c66da700a2c30ec63e0c4078c23d28dac2f (diff)
pinctrl-msm: Rename compatible to be more specific
Use the more specific form 8974 for the compatible to reduce the risk of future mishaps. Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt (renamed from Documentation/devicetree/bindings/pinctrl/qcom,msm8x74-pinctrl.txt)4
-rw-r--r--drivers/pinctrl/pinctrl-msm8x74.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8x74-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
index 70ab78fe93c8..4c352be5dd61 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8x74-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
@@ -1,4 +1,4 @@
-Qualcomm MSM8x74 TLMM block
+Qualcomm MSM8974 TLMM block
Required properties:
- compatible: "qcom,msm8x74-pinctrl"
@@ -59,7 +59,7 @@ Valid values for qcom,function are:
Example:
msmgpio: pinctrl@fd510000 {
- compatible = "qcom,msm8x74-pinctrl";
+ compatible = "qcom,msm8974-pinctrl";
reg = <0xfd510000 0x4000>;
gpio-controller;
diff --git a/drivers/pinctrl/pinctrl-msm8x74.c b/drivers/pinctrl/pinctrl-msm8x74.c
index c702e775bf24..f944bf2172ef 100644
--- a/drivers/pinctrl/pinctrl-msm8x74.c
+++ b/drivers/pinctrl/pinctrl-msm8x74.c
@@ -603,7 +603,7 @@ static int msm8x74_pinctrl_probe(struct platform_device *pdev)
}
static const struct of_device_id msm8x74_pinctrl_of_match[] = {
- { .compatible = "qcom,msm8x74-pinctrl", },
+ { .compatible = "qcom,msm8974-pinctrl", },
{ },
};