| Message ID | 1387090914-4755-5-git-send-email-bjorn.andersson@sonymobile.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Sun, Dec 15, 2013 at 8:01 AM, Bjorn Andersson <bjorn.andersson@sonymobile.com> wrote: > 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> Patch applied. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8x74-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt similarity index 97% rename from Documentation/devicetree/bindings/pinctrl/qcom,msm8x74-pinctrl.txt rename to Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt index 70ab78f..4c352be 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 c702e77..f944bf2 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", }, { }, };
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> --- ...sm8x74-pinctrl.txt => qcom,msm8974-pinctrl.txt} | 4 ++-- drivers/pinctrl/pinctrl-msm8x74.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename Documentation/devicetree/bindings/pinctrl/{qcom,msm8x74-pinctrl.txt => qcom,msm8974-pinctrl.txt} (97%)