| Message ID | 1448062280-15406-5-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/20/2015 3:31 PM, Stephen Boyd wrote: > Add an alias for pm8916 on msm8916 based SoCs so that the newly > updated dtbTool can find the pmic compatible string and add the > pmic-id element to the QCDT header. > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 1 + > arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 1 + > arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 +++--- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > index 6b8abbe68746..46bfcb9b2e84 100644 > --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > @@ -20,6 +20,7 @@ > aliases { > serial0 = &blsp1_uart2; > serial1 = &blsp1_uart1; > + usid0 = &pm8916_0; > }; > > chosen { > diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi > index a1aa0b201e92..ceeb8a6feed6 100644 > --- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi > @@ -17,6 +17,7 @@ > / { > aliases { > serial0 = &blsp1_uart2; > + usid0 = &pm8916_0; > }; > > chosen { > diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi > index b222ece7e3d2..37432451ee4c 100644 > --- a/arch/arm64/boot/dts/qcom/pm8916.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi > @@ -4,8 +4,8 @@ > > &spmi_bus { > > - usid0: pm8916@0 { > - compatible = "qcom,spmi-pmic"; > + pm8916_0: pm8916@0 { > + compatible = "qcom,pm8916", "qcom,spmi-pmic"; > reg = <0x0 SPMI_USID>; > #address-cells = <1>; > #size-cells = <0>; > @@ -90,7 +90,7 @@ > }; > }; > > - usid1: pm8916@1 { > + pm8916_1: pm8916@1 { > compatible = "qcom,spmi-pmic"; > reg = <0x1 SPMI_USID>; > #address-cells = <1>; > Where are usid0 and usid1 documented? I understand why they exist given the context of v1 and v2 of this patchset, but it will not be obvious to anyone who is just looking at the .dtsi files in the future.
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 6b8abbe68746..46bfcb9b2e84 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -20,6 +20,7 @@ aliases { serial0 = &blsp1_uart2; serial1 = &blsp1_uart1; + usid0 = &pm8916_0; }; chosen { diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi index a1aa0b201e92..ceeb8a6feed6 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi @@ -17,6 +17,7 @@ / { aliases { serial0 = &blsp1_uart2; + usid0 = &pm8916_0; }; chosen { diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi index b222ece7e3d2..37432451ee4c 100644 --- a/arch/arm64/boot/dts/qcom/pm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi @@ -4,8 +4,8 @@ &spmi_bus { - usid0: pm8916@0 { - compatible = "qcom,spmi-pmic"; + pm8916_0: pm8916@0 { + compatible = "qcom,pm8916", "qcom,spmi-pmic"; reg = <0x0 SPMI_USID>; #address-cells = <1>; #size-cells = <0>; @@ -90,7 +90,7 @@ }; }; - usid1: pm8916@1 { + pm8916_1: pm8916@1 { compatible = "qcom,spmi-pmic"; reg = <0x1 SPMI_USID>; #address-cells = <1>;
Add an alias for pm8916 on msm8916 based SoCs so that the newly updated dtbTool can find the pmic compatible string and add the pmic-id element to the QCDT header. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 1 + arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 1 + arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-)