Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1274510

[PATCH v2 4/5] arm64: dts: qcom: Alias pm8916 on msm8916 devices

Show all headers | View raw

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>;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/5] Remove the need for qcom,{msm-id,board-id,pmic-id} Stephen Boyd <sboyd@codeaurora.org> - 2015-11-21 00:40 +0100
  [PATCH v2 3/5] arm: dts: qcom: Update ifc6540 compat for qcom boot format Stephen Boyd <sboyd@codeaurora.org> - 2015-11-21 00:40 +0100
  [PATCH v2 1/5] devicetree: bindings: Document qcom board compatible format Stephen Boyd <sboyd@codeaurora.org> - 2015-11-21 00:40 +0100
    Re: [PATCH v2 1/5] devicetree: bindings: Document qcom board  compatible format Rob Herring <robh@kernel.org> - 2015-11-22 21:50 +0100
      Re: [PATCH v2 1/5] devicetree: bindings: Document qcom board  compatible format Stephen Boyd <sboyd@codeaurora.org> - 2015-11-24 01:50 +0100
  [PATCH v2 2/5] arm64: dts: qcom: Make msm8916-mtp compatible string compliant Stephen Boyd <sboyd@codeaurora.org> - 2015-11-21 00:40 +0100
  [PATCH v2 4/5] arm64: dts: qcom: Alias pm8916 on msm8916 devices Stephen Boyd <sboyd@codeaurora.org> - 2015-11-21 00:40 +0100
  [PATCH v2 5/5] arm: dts: qcom: Add aliases for PMICs Stephen Boyd <sboyd@codeaurora.org> - 2015-11-21 00:40 +0100

csiph-web