2022-07-22 15:01:01

by Parikshit Pareek

[permalink] [raw]
Subject: [PATCH v2 2/3] arm64: dts: qcom: sa8295p: move common nodes to dtsi

There are many ADP boards with lot of common features. Move common
nodes to sa8xxxp-auto.dtsi files. This will be base for many ADP boards
to be introduced in near future.

Signed-off-by: Parikshit Pareek <[email protected]>
---

Changes since v1:
- Add , after year 2022, in the license header
- Rename the dtsi which is suitable for common to many ADP boards
- Split the patch in introducing common dtsi file, and adding new board
file

arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 378 +----------------
.../arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi | 385 ++++++++++++++++++
2 files changed, 387 insertions(+), 376 deletions(-)
create mode 100644 arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
index 9398f0349944..3cc92162ba02 100644
--- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
@@ -2,388 +2,14 @@
/*
* Copyright (c) 2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022, Linaro Limited
+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
*/

/dts-v1/;

-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include <dt-bindings/spmi/spmi.h>
-
-#include "sa8540p.dtsi"
+#include "sa8xxxp-auto-adp.dtsi"

/ {
model = "Qualcomm SA8295P ADP";
compatible = "qcom,sa8295p-adp", "qcom,sa8540p";
-
- aliases {
- serial0 = &qup2_uart17;
- };
-
- chosen {
- stdout-path = "serial0:115200n8";
- };
-};
-
-&apps_rsc {
- pmm8540-a-regulators {
- compatible = "qcom,pm8150-rpmh-regulators";
- qcom,pmic-id = "a";
-
- vreg_l3a: ldo3 {
- regulator-name = "vreg_l3a";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1208000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l5a: ldo5 {
- regulator-name = "vreg_l5a";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l7a: ldo7 {
- regulator-name = "vreg_l7a";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l13a: ldo13 {
- regulator-name = "vreg_l13a";
- regulator-min-microvolt = <3072000>;
- regulator-max-microvolt = <3072000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
- };
-
- pmm8540-c-regulators {
- compatible = "qcom,pm8150-rpmh-regulators";
- qcom,pmic-id = "c";
-
- vreg_l1c: ldo1 {
- regulator-name = "vreg_l1c";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l2c: ldo2 {
- regulator-name = "vreg_l2c";
- regulator-min-microvolt = <3072000>;
- regulator-max-microvolt = <3072000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l3c: ldo3 {
- regulator-name = "vreg_l3c";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l4c: ldo4 {
- regulator-name = "vreg_l4c";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1208000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l6c: ldo6 {
- regulator-name = "vreg_l6c";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l7c: ldo7 {
- regulator-name = "vreg_l7c";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l10c: ldo10 {
- regulator-name = "vreg_l10c";
- regulator-min-microvolt = <2504000>;
- regulator-max-microvolt = <2504000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l17c: ldo17 {
- regulator-name = "vreg_l17c";
- regulator-min-microvolt = <2504000>;
- regulator-max-microvolt = <2504000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
- };
-
- pmm8540-g-regulators {
- compatible = "qcom,pm8150-rpmh-regulators";
- qcom,pmic-id = "g";
-
- vreg_l3g: ldo3 {
- regulator-name = "vreg_l3g";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l7g: ldo7 {
- regulator-name = "vreg_l7g";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
-
- vreg_l8g: ldo8 {
- regulator-name = "vreg_l8g";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <880000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-allow-set-load;
- };
- };
-};
-
-&qup2 {
- status = "okay";
-};
-
-&qup2_uart17 {
- compatible = "qcom,geni-debug-uart";
- status = "okay";
-};
-
-&remoteproc_adsp {
- firmware-name = "qcom/sa8540p/adsp.mbn";
- status = "okay";
-};
-
-&remoteproc_nsp0 {
- firmware-name = "qcom/sa8540p/cdsp.mbn";
- status = "okay";
-};
-
-&remoteproc_nsp1 {
- firmware-name = "qcom/sa8540p/cdsp1.mbn";
- status = "okay";
-};
-
-&spmi_bus {
- pm8450a: pmic@0 {
- compatible = "qcom,pm8150", "qcom,spmi-pmic";
- reg = <0x0 SPMI_USID>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pm8450a_gpios: gpio@c000 {
- compatible = "qcom,pm8150-gpio";
- reg = <0xc000>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
- #interrupt-cells = <2>;
- };
- };
-
- pm8450c: pmic@4 {
- compatible = "qcom,pm8150", "qcom,spmi-pmic";
- reg = <0x4 SPMI_USID>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pm8450c_gpios: gpio@c000 {
- compatible = "qcom,pm8150-gpio";
- reg = <0xc000>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
- #interrupt-cells = <2>;
- };
- };
-
- pm8450e: pmic@8 {
- compatible = "qcom,pm8150", "qcom,spmi-pmic";
- reg = <0x8 SPMI_USID>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pm8450e_gpios: gpio@c000 {
- compatible = "qcom,pm8150-gpio";
- reg = <0xc000>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
- #interrupt-cells = <2>;
- };
- };
-
- pm8450g: pmic@c {
- compatible = "qcom,pm8150", "qcom,spmi-pmic";
- reg = <0xc SPMI_USID>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pm8450g_gpios: gpio@c000 {
- compatible = "qcom,pm8150-gpio";
- reg = <0xc000>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
- #interrupt-cells = <2>;
- };
- };
-};
-
-&ufs_mem_hc {
- reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;
-
- vcc-supply = <&vreg_l17c>;
- vcc-max-microamp = <800000>;
- vccq-supply = <&vreg_l6c>;
- vccq-max-microamp = <900000>;
-
- status = "okay";
-};
-
-&ufs_mem_phy {
- vdda-phy-supply = <&vreg_l8g>;
- vdda-pll-supply = <&vreg_l3g>;
-
- status = "okay";
};
-
-&ufs_card_hc {
- reset-gpios = <&tlmm 229 GPIO_ACTIVE_LOW>;
-
- vcc-supply = <&vreg_l10c>;
- vcc-max-microamp = <800000>;
- vccq-supply = <&vreg_l3c>;
- vccq-max-microamp = <900000>;
-
- status = "okay";
-};
-
-&ufs_card_phy {
- vdda-phy-supply = <&vreg_l8g>;
- vdda-pll-supply = <&vreg_l3g>;
-
- status = "okay";
-};
-
-&usb_0 {
- status = "okay";
-};
-
-&usb_0_dwc3 {
- /* TODO: Define USB-C connector properly */
- dr_mode = "peripheral";
-};
-
-&usb_0_hsphy {
- vdda-pll-supply = <&vreg_l5a>;
- vdda18-supply = <&vreg_l7a>;
- vdda33-supply = <&vreg_l13a>;
-
- status = "okay";
-};
-
-&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l3a>;
- vdda-pll-supply = <&vreg_l5a>;
-
- status = "okay";
-};
-
-&usb_1 {
- status = "okay";
-};
-
-&usb_1_dwc3 {
- /* TODO: Define USB-C connector properly */
- dr_mode = "host";
-};
-
-&usb_1_hsphy {
- vdda-pll-supply = <&vreg_l1c>;
- vdda18-supply = <&vreg_l7c>;
- vdda33-supply = <&vreg_l2c>;
-
- status = "okay";
-};
-
-&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l4c>;
- vdda-pll-supply = <&vreg_l1c>;
-
- status = "okay";
-};
-
-&usb_2_hsphy0 {
- vdda-pll-supply = <&vreg_l5a>;
- vdda18-supply = <&vreg_l7g>;
- vdda33-supply = <&vreg_l13a>;
-
- status = "okay";
-};
-
-&usb_2_hsphy1 {
- vdda-pll-supply = <&vreg_l5a>;
- vdda18-supply = <&vreg_l7g>;
- vdda33-supply = <&vreg_l13a>;
-
- status = "okay";
-};
-
-&usb_2_hsphy2 {
- vdda-pll-supply = <&vreg_l5a>;
- vdda18-supply = <&vreg_l7g>;
- vdda33-supply = <&vreg_l13a>;
-
- status = "okay";
-};
-
-&usb_2_hsphy3 {
- vdda-pll-supply = <&vreg_l5a>;
- vdda18-supply = <&vreg_l7g>;
- vdda33-supply = <&vreg_l13a>;
-
- status = "okay";
-};
-
-&usb_2_qmpphy0 {
- vdda-phy-supply = <&vreg_l3a>;
- vdda-pll-supply = <&vreg_l5a>;
-
- status = "okay";
-};
-
-&usb_2_qmpphy1 {
- vdda-phy-supply = <&vreg_l3a>;
- vdda-pll-supply = <&vreg_l5a>;
-
- status = "okay";
-};
-
-&xo_board_clk {
- clock-frequency = <38400000>;
-};
-
-/* PINCTRL */
diff --git a/arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi b/arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi
new file mode 100644
index 000000000000..428e10f48481
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi
@@ -0,0 +1,385 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022, Linaro Limited
+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
+#include <dt-bindings/spmi/spmi.h>
+
+#include "sa8540p.dtsi"
+
+/ {
+ aliases {
+ serial0 = &qup2_uart17;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+};
+
+&apps_rsc {
+ pmm8540-a-regulators {
+ compatible = "qcom,pm8150-rpmh-regulators";
+ qcom,pmic-id = "a";
+
+ vreg_l3a: ldo3 {
+ regulator-name = "vreg_l3a";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1208000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l5a: ldo5 {
+ regulator-name = "vreg_l5a";
+ regulator-min-microvolt = <912000>;
+ regulator-max-microvolt = <912000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l7a: ldo7 {
+ regulator-name = "vreg_l7a";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l13a: ldo13 {
+ regulator-name = "vreg_l13a";
+ regulator-min-microvolt = <3072000>;
+ regulator-max-microvolt = <3072000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+ };
+
+ pmm8540-c-regulators {
+ compatible = "qcom,pm8150-rpmh-regulators";
+ qcom,pmic-id = "c";
+
+ vreg_l1c: ldo1 {
+ regulator-name = "vreg_l1c";
+ regulator-min-microvolt = <912000>;
+ regulator-max-microvolt = <912000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l2c: ldo2 {
+ regulator-name = "vreg_l2c";
+ regulator-min-microvolt = <3072000>;
+ regulator-max-microvolt = <3072000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l3c: ldo3 {
+ regulator-name = "vreg_l3c";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l4c: ldo4 {
+ regulator-name = "vreg_l4c";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1208000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l6c: ldo6 {
+ regulator-name = "vreg_l6c";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l7c: ldo7 {
+ regulator-name = "vreg_l7c";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l10c: ldo10 {
+ regulator-name = "vreg_l10c";
+ regulator-min-microvolt = <2504000>;
+ regulator-max-microvolt = <2504000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l17c: ldo17 {
+ regulator-name = "vreg_l17c";
+ regulator-min-microvolt = <2504000>;
+ regulator-max-microvolt = <2504000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+ };
+
+ pmm8540-g-regulators {
+ compatible = "qcom,pm8150-rpmh-regulators";
+ qcom,pmic-id = "g";
+
+ vreg_l3g: ldo3 {
+ regulator-name = "vreg_l3g";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l7g: ldo7 {
+ regulator-name = "vreg_l7g";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+
+ vreg_l8g: ldo8 {
+ regulator-name = "vreg_l8g";
+ regulator-min-microvolt = <880000>;
+ regulator-max-microvolt = <880000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-allow-set-load;
+ };
+ };
+};
+
+&qup2 {
+ status = "okay";
+};
+
+&qup2_uart17 {
+ compatible = "qcom,geni-debug-uart";
+ status = "okay";
+};
+
+&remoteproc_adsp {
+ firmware-name = "qcom/sa8540p/adsp.mbn";
+ status = "okay";
+};
+
+&remoteproc_nsp0 {
+ firmware-name = "qcom/sa8540p/cdsp.mbn";
+ status = "okay";
+};
+
+&remoteproc_nsp1 {
+ firmware-name = "qcom/sa8540p/cdsp1.mbn";
+ status = "okay";
+};
+
+&spmi_bus {
+ pm8450a: pmic@0 {
+ compatible = "qcom,pm8150", "qcom,spmi-pmic";
+ reg = <0x0 SPMI_USID>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pm8450a_gpios: gpio@c000 {
+ compatible = "qcom,pm8150-gpio";
+ reg = <0xc000>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
+ pm8450c: pmic@4 {
+ compatible = "qcom,pm8150", "qcom,spmi-pmic";
+ reg = <0x4 SPMI_USID>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pm8450c_gpios: gpio@c000 {
+ compatible = "qcom,pm8150-gpio";
+ reg = <0xc000>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
+ pm8450e: pmic@8 {
+ compatible = "qcom,pm8150", "qcom,spmi-pmic";
+ reg = <0x8 SPMI_USID>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pm8450e_gpios: gpio@c000 {
+ compatible = "qcom,pm8150-gpio";
+ reg = <0xc000>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
+ pm8450g: pmic@c {
+ compatible = "qcom,pm8150", "qcom,spmi-pmic";
+ reg = <0xc SPMI_USID>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pm8450g_gpios: gpio@c000 {
+ compatible = "qcom,pm8150-gpio";
+ reg = <0xc000>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+};
+
+&ufs_mem_hc {
+ reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;
+
+ vcc-supply = <&vreg_l17c>;
+ vcc-max-microamp = <800000>;
+ vccq-supply = <&vreg_l6c>;
+ vccq-max-microamp = <900000>;
+
+ status = "okay";
+};
+
+&ufs_mem_phy {
+ vdda-phy-supply = <&vreg_l8g>;
+ vdda-pll-supply = <&vreg_l3g>;
+
+ status = "okay";
+};
+
+&ufs_card_hc {
+ reset-gpios = <&tlmm 229 GPIO_ACTIVE_LOW>;
+
+ vcc-supply = <&vreg_l10c>;
+ vcc-max-microamp = <800000>;
+ vccq-supply = <&vreg_l3c>;
+ vccq-max-microamp = <900000>;
+
+ status = "okay";
+};
+
+&ufs_card_phy {
+ vdda-phy-supply = <&vreg_l8g>;
+ vdda-pll-supply = <&vreg_l3g>;
+
+ status = "okay";
+};
+
+&usb_0 {
+ status = "okay";
+};
+
+&usb_0_dwc3 {
+ /* TODO: Define USB-C connector properly */
+ dr_mode = "peripheral";
+};
+
+&usb_0_hsphy {
+ vdda-pll-supply = <&vreg_l5a>;
+ vdda18-supply = <&vreg_l7a>;
+ vdda33-supply = <&vreg_l13a>;
+
+ status = "okay";
+};
+
+&usb_0_qmpphy {
+ vdda-phy-supply = <&vreg_l3a>;
+ vdda-pll-supply = <&vreg_l5a>;
+
+ status = "okay";
+};
+
+&usb_1 {
+ status = "okay";
+};
+
+&usb_1_dwc3 {
+ /* TODO: Define USB-C connector properly */
+ dr_mode = "host";
+};
+
+&usb_1_hsphy {
+ vdda-pll-supply = <&vreg_l1c>;
+ vdda18-supply = <&vreg_l7c>;
+ vdda33-supply = <&vreg_l2c>;
+
+ status = "okay";
+};
+
+&usb_1_qmpphy {
+ vdda-phy-supply = <&vreg_l4c>;
+ vdda-pll-supply = <&vreg_l1c>;
+
+ status = "okay";
+};
+
+&usb_2_hsphy0 {
+ vdda-pll-supply = <&vreg_l5a>;
+ vdda18-supply = <&vreg_l7g>;
+ vdda33-supply = <&vreg_l13a>;
+
+ status = "okay";
+};
+
+&usb_2_hsphy1 {
+ vdda-pll-supply = <&vreg_l5a>;
+ vdda18-supply = <&vreg_l7g>;
+ vdda33-supply = <&vreg_l13a>;
+
+ status = "okay";
+};
+
+&usb_2_hsphy2 {
+ vdda-pll-supply = <&vreg_l5a>;
+ vdda18-supply = <&vreg_l7g>;
+ vdda33-supply = <&vreg_l13a>;
+
+ status = "okay";
+};
+
+&usb_2_hsphy3 {
+ vdda-pll-supply = <&vreg_l5a>;
+ vdda18-supply = <&vreg_l7g>;
+ vdda33-supply = <&vreg_l13a>;
+
+ status = "okay";
+};
+
+&usb_2_qmpphy0 {
+ vdda-phy-supply = <&vreg_l3a>;
+ vdda-pll-supply = <&vreg_l5a>;
+
+ status = "okay";
+};
+
+&usb_2_qmpphy1 {
+ vdda-phy-supply = <&vreg_l3a>;
+ vdda-pll-supply = <&vreg_l5a>;
+
+ status = "okay";
+};
+
+&xo_board_clk {
+ clock-frequency = <38400000>;
+};
+
+/* PINCTRL */
--
2.17.1


2022-07-22 15:41:57

by Andrew Halaney

[permalink] [raw]
Subject: Re: [PATCH v2 2/3] arm64: dts: qcom: sa8295p: move common nodes to dtsi

On Fri, Jul 22, 2022 at 08:02:32PM +0530, Parikshit Pareek wrote:
> There are many ADP boards with lot of common features. Move common
> nodes to sa8xxxp-auto.dtsi files. This will be base for many ADP boards
> to be introduced in near future.
>
> Signed-off-by: Parikshit Pareek <[email protected]>
> ---
>
> Changes since v1:
> - Add , after year 2022, in the license header
> - Rename the dtsi which is suitable for common to many ADP boards
> - Split the patch in introducing common dtsi file, and adding new board
> file
>
> arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 378 +----------------
> .../arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi | 385 ++++++++++++++++++

Is this maybe too broad of a name? Outside of sa8295p/sa8540p inheriting
from sc8280xp, you've got sa8155p inheriting from sm8150 and sa8195p
inheriting from sc8180xp (may have butchered some of the suffixes there
but you get the point). I know for sure that sa8155p/sa8195p are
"auto-adp" boards so the sa8xxxp-auto-adp.dtsi might cause confusion.
If I was looking I'd expect that dtsi to be relevant to them as well
based on the name, but it isn't as far as I can tell.

By the way, I plan on taking these for a spin on the qdrive3 board I
have when I get access to it again (today/monday), so feel free to cc
me on new versions!

Thanks,
Andrew

> 2 files changed, 387 insertions(+), 376 deletions(-)
> create mode 100644 arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi
>
> diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
> index 9398f0349944..3cc92162ba02 100644
> --- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
> +++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
> @@ -2,388 +2,14 @@
> /*
> * Copyright (c) 2021, The Linux Foundation. All rights reserved.
> * Copyright (c) 2022, Linaro Limited
> + * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
> */
>
> /dts-v1/;
>
> -#include <dt-bindings/gpio/gpio.h>
> -#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> -#include <dt-bindings/spmi/spmi.h>
> -
> -#include "sa8540p.dtsi"
> +#include "sa8xxxp-auto-adp.dtsi"
>
> / {
> model = "Qualcomm SA8295P ADP";
> compatible = "qcom,sa8295p-adp", "qcom,sa8540p";
> -
> - aliases {
> - serial0 = &qup2_uart17;
> - };
> -
> - chosen {
> - stdout-path = "serial0:115200n8";
> - };
> -};
> -
> -&apps_rsc {
> - pmm8540-a-regulators {
> - compatible = "qcom,pm8150-rpmh-regulators";
> - qcom,pmic-id = "a";
> -
> - vreg_l3a: ldo3 {
> - regulator-name = "vreg_l3a";
> - regulator-min-microvolt = <1200000>;
> - regulator-max-microvolt = <1208000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l5a: ldo5 {
> - regulator-name = "vreg_l5a";
> - regulator-min-microvolt = <912000>;
> - regulator-max-microvolt = <912000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l7a: ldo7 {
> - regulator-name = "vreg_l7a";
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l13a: ldo13 {
> - regulator-name = "vreg_l13a";
> - regulator-min-microvolt = <3072000>;
> - regulator-max-microvolt = <3072000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> - };
> -
> - pmm8540-c-regulators {
> - compatible = "qcom,pm8150-rpmh-regulators";
> - qcom,pmic-id = "c";
> -
> - vreg_l1c: ldo1 {
> - regulator-name = "vreg_l1c";
> - regulator-min-microvolt = <912000>;
> - regulator-max-microvolt = <912000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l2c: ldo2 {
> - regulator-name = "vreg_l2c";
> - regulator-min-microvolt = <3072000>;
> - regulator-max-microvolt = <3072000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l3c: ldo3 {
> - regulator-name = "vreg_l3c";
> - regulator-min-microvolt = <1200000>;
> - regulator-max-microvolt = <1200000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l4c: ldo4 {
> - regulator-name = "vreg_l4c";
> - regulator-min-microvolt = <1200000>;
> - regulator-max-microvolt = <1208000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l6c: ldo6 {
> - regulator-name = "vreg_l6c";
> - regulator-min-microvolt = <1200000>;
> - regulator-max-microvolt = <1200000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l7c: ldo7 {
> - regulator-name = "vreg_l7c";
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l10c: ldo10 {
> - regulator-name = "vreg_l10c";
> - regulator-min-microvolt = <2504000>;
> - regulator-max-microvolt = <2504000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l17c: ldo17 {
> - regulator-name = "vreg_l17c";
> - regulator-min-microvolt = <2504000>;
> - regulator-max-microvolt = <2504000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> - };
> -
> - pmm8540-g-regulators {
> - compatible = "qcom,pm8150-rpmh-regulators";
> - qcom,pmic-id = "g";
> -
> - vreg_l3g: ldo3 {
> - regulator-name = "vreg_l3g";
> - regulator-min-microvolt = <1200000>;
> - regulator-max-microvolt = <1200000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l7g: ldo7 {
> - regulator-name = "vreg_l7g";
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> -
> - vreg_l8g: ldo8 {
> - regulator-name = "vreg_l8g";
> - regulator-min-microvolt = <880000>;
> - regulator-max-microvolt = <880000>;
> - regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> - regulator-allow-set-load;
> - };
> - };
> -};
> -
> -&qup2 {
> - status = "okay";
> -};
> -
> -&qup2_uart17 {
> - compatible = "qcom,geni-debug-uart";
> - status = "okay";
> -};
> -
> -&remoteproc_adsp {
> - firmware-name = "qcom/sa8540p/adsp.mbn";
> - status = "okay";
> -};
> -
> -&remoteproc_nsp0 {
> - firmware-name = "qcom/sa8540p/cdsp.mbn";
> - status = "okay";
> -};
> -
> -&remoteproc_nsp1 {
> - firmware-name = "qcom/sa8540p/cdsp1.mbn";
> - status = "okay";
> -};
> -
> -&spmi_bus {
> - pm8450a: pmic@0 {
> - compatible = "qcom,pm8150", "qcom,spmi-pmic";
> - reg = <0x0 SPMI_USID>;
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - pm8450a_gpios: gpio@c000 {
> - compatible = "qcom,pm8150-gpio";
> - reg = <0xc000>;
> - gpio-controller;
> - #gpio-cells = <2>;
> - interrupt-controller;
> - #interrupt-cells = <2>;
> - };
> - };
> -
> - pm8450c: pmic@4 {
> - compatible = "qcom,pm8150", "qcom,spmi-pmic";
> - reg = <0x4 SPMI_USID>;
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - pm8450c_gpios: gpio@c000 {
> - compatible = "qcom,pm8150-gpio";
> - reg = <0xc000>;
> - gpio-controller;
> - #gpio-cells = <2>;
> - interrupt-controller;
> - #interrupt-cells = <2>;
> - };
> - };
> -
> - pm8450e: pmic@8 {
> - compatible = "qcom,pm8150", "qcom,spmi-pmic";
> - reg = <0x8 SPMI_USID>;
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - pm8450e_gpios: gpio@c000 {
> - compatible = "qcom,pm8150-gpio";
> - reg = <0xc000>;
> - gpio-controller;
> - #gpio-cells = <2>;
> - interrupt-controller;
> - #interrupt-cells = <2>;
> - };
> - };
> -
> - pm8450g: pmic@c {
> - compatible = "qcom,pm8150", "qcom,spmi-pmic";
> - reg = <0xc SPMI_USID>;
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - pm8450g_gpios: gpio@c000 {
> - compatible = "qcom,pm8150-gpio";
> - reg = <0xc000>;
> - gpio-controller;
> - #gpio-cells = <2>;
> - interrupt-controller;
> - #interrupt-cells = <2>;
> - };
> - };
> -};
> -
> -&ufs_mem_hc {
> - reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;
> -
> - vcc-supply = <&vreg_l17c>;
> - vcc-max-microamp = <800000>;
> - vccq-supply = <&vreg_l6c>;
> - vccq-max-microamp = <900000>;
> -
> - status = "okay";
> -};
> -
> -&ufs_mem_phy {
> - vdda-phy-supply = <&vreg_l8g>;
> - vdda-pll-supply = <&vreg_l3g>;
> -
> - status = "okay";
> };
> -
> -&ufs_card_hc {
> - reset-gpios = <&tlmm 229 GPIO_ACTIVE_LOW>;
> -
> - vcc-supply = <&vreg_l10c>;
> - vcc-max-microamp = <800000>;
> - vccq-supply = <&vreg_l3c>;
> - vccq-max-microamp = <900000>;
> -
> - status = "okay";
> -};
> -
> -&ufs_card_phy {
> - vdda-phy-supply = <&vreg_l8g>;
> - vdda-pll-supply = <&vreg_l3g>;
> -
> - status = "okay";
> -};
> -
> -&usb_0 {
> - status = "okay";
> -};
> -
> -&usb_0_dwc3 {
> - /* TODO: Define USB-C connector properly */
> - dr_mode = "peripheral";
> -};
> -
> -&usb_0_hsphy {
> - vdda-pll-supply = <&vreg_l5a>;
> - vdda18-supply = <&vreg_l7a>;
> - vdda33-supply = <&vreg_l13a>;
> -
> - status = "okay";
> -};
> -
> -&usb_0_qmpphy {
> - vdda-phy-supply = <&vreg_l3a>;
> - vdda-pll-supply = <&vreg_l5a>;
> -
> - status = "okay";
> -};
> -
> -&usb_1 {
> - status = "okay";
> -};
> -
> -&usb_1_dwc3 {
> - /* TODO: Define USB-C connector properly */
> - dr_mode = "host";
> -};
> -
> -&usb_1_hsphy {
> - vdda-pll-supply = <&vreg_l1c>;
> - vdda18-supply = <&vreg_l7c>;
> - vdda33-supply = <&vreg_l2c>;
> -
> - status = "okay";
> -};
> -
> -&usb_1_qmpphy {
> - vdda-phy-supply = <&vreg_l4c>;
> - vdda-pll-supply = <&vreg_l1c>;
> -
> - status = "okay";
> -};
> -
> -&usb_2_hsphy0 {
> - vdda-pll-supply = <&vreg_l5a>;
> - vdda18-supply = <&vreg_l7g>;
> - vdda33-supply = <&vreg_l13a>;
> -
> - status = "okay";
> -};
> -
> -&usb_2_hsphy1 {
> - vdda-pll-supply = <&vreg_l5a>;
> - vdda18-supply = <&vreg_l7g>;
> - vdda33-supply = <&vreg_l13a>;
> -
> - status = "okay";
> -};
> -
> -&usb_2_hsphy2 {
> - vdda-pll-supply = <&vreg_l5a>;
> - vdda18-supply = <&vreg_l7g>;
> - vdda33-supply = <&vreg_l13a>;
> -
> - status = "okay";
> -};
> -
> -&usb_2_hsphy3 {
> - vdda-pll-supply = <&vreg_l5a>;
> - vdda18-supply = <&vreg_l7g>;
> - vdda33-supply = <&vreg_l13a>;
> -
> - status = "okay";
> -};
> -
> -&usb_2_qmpphy0 {
> - vdda-phy-supply = <&vreg_l3a>;
> - vdda-pll-supply = <&vreg_l5a>;
> -
> - status = "okay";
> -};
> -
> -&usb_2_qmpphy1 {
> - vdda-phy-supply = <&vreg_l3a>;
> - vdda-pll-supply = <&vreg_l5a>;
> -
> - status = "okay";
> -};
> -
> -&xo_board_clk {
> - clock-frequency = <38400000>;
> -};
> -
> -/* PINCTRL */
> diff --git a/arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi b/arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi
> new file mode 100644
> index 000000000000..428e10f48481
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi
> @@ -0,0 +1,385 @@
> +// SPDX-License-Identifier: BSD-3-Clause
> +/*
> + * Copyright (c) 2021, The Linux Foundation. All rights reserved.
> + * Copyright (c) 2022, Linaro Limited
> + * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> +#include <dt-bindings/spmi/spmi.h>
> +
> +#include "sa8540p.dtsi"
> +
> +/ {
> + aliases {
> + serial0 = &qup2_uart17;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +};
> +
> +&apps_rsc {
> + pmm8540-a-regulators {
> + compatible = "qcom,pm8150-rpmh-regulators";
> + qcom,pmic-id = "a";
> +
> + vreg_l3a: ldo3 {
> + regulator-name = "vreg_l3a";
> + regulator-min-microvolt = <1200000>;
> + regulator-max-microvolt = <1208000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l5a: ldo5 {
> + regulator-name = "vreg_l5a";
> + regulator-min-microvolt = <912000>;
> + regulator-max-microvolt = <912000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l7a: ldo7 {
> + regulator-name = "vreg_l7a";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l13a: ldo13 {
> + regulator-name = "vreg_l13a";
> + regulator-min-microvolt = <3072000>;
> + regulator-max-microvolt = <3072000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> + };
> +
> + pmm8540-c-regulators {
> + compatible = "qcom,pm8150-rpmh-regulators";
> + qcom,pmic-id = "c";
> +
> + vreg_l1c: ldo1 {
> + regulator-name = "vreg_l1c";
> + regulator-min-microvolt = <912000>;
> + regulator-max-microvolt = <912000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l2c: ldo2 {
> + regulator-name = "vreg_l2c";
> + regulator-min-microvolt = <3072000>;
> + regulator-max-microvolt = <3072000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l3c: ldo3 {
> + regulator-name = "vreg_l3c";
> + regulator-min-microvolt = <1200000>;
> + regulator-max-microvolt = <1200000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l4c: ldo4 {
> + regulator-name = "vreg_l4c";
> + regulator-min-microvolt = <1200000>;
> + regulator-max-microvolt = <1208000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l6c: ldo6 {
> + regulator-name = "vreg_l6c";
> + regulator-min-microvolt = <1200000>;
> + regulator-max-microvolt = <1200000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l7c: ldo7 {
> + regulator-name = "vreg_l7c";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l10c: ldo10 {
> + regulator-name = "vreg_l10c";
> + regulator-min-microvolt = <2504000>;
> + regulator-max-microvolt = <2504000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l17c: ldo17 {
> + regulator-name = "vreg_l17c";
> + regulator-min-microvolt = <2504000>;
> + regulator-max-microvolt = <2504000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> + };
> +
> + pmm8540-g-regulators {
> + compatible = "qcom,pm8150-rpmh-regulators";
> + qcom,pmic-id = "g";
> +
> + vreg_l3g: ldo3 {
> + regulator-name = "vreg_l3g";
> + regulator-min-microvolt = <1200000>;
> + regulator-max-microvolt = <1200000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l7g: ldo7 {
> + regulator-name = "vreg_l7g";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> +
> + vreg_l8g: ldo8 {
> + regulator-name = "vreg_l8g";
> + regulator-min-microvolt = <880000>;
> + regulator-max-microvolt = <880000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + regulator-allow-set-load;
> + };
> + };
> +};
> +
> +&qup2 {
> + status = "okay";
> +};
> +
> +&qup2_uart17 {
> + compatible = "qcom,geni-debug-uart";
> + status = "okay";
> +};
> +
> +&remoteproc_adsp {
> + firmware-name = "qcom/sa8540p/adsp.mbn";
> + status = "okay";
> +};
> +
> +&remoteproc_nsp0 {
> + firmware-name = "qcom/sa8540p/cdsp.mbn";
> + status = "okay";
> +};
> +
> +&remoteproc_nsp1 {
> + firmware-name = "qcom/sa8540p/cdsp1.mbn";
> + status = "okay";
> +};
> +
> +&spmi_bus {
> + pm8450a: pmic@0 {
> + compatible = "qcom,pm8150", "qcom,spmi-pmic";
> + reg = <0x0 SPMI_USID>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pm8450a_gpios: gpio@c000 {
> + compatible = "qcom,pm8150-gpio";
> + reg = <0xc000>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> + };
> +
> + pm8450c: pmic@4 {
> + compatible = "qcom,pm8150", "qcom,spmi-pmic";
> + reg = <0x4 SPMI_USID>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pm8450c_gpios: gpio@c000 {
> + compatible = "qcom,pm8150-gpio";
> + reg = <0xc000>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> + };
> +
> + pm8450e: pmic@8 {
> + compatible = "qcom,pm8150", "qcom,spmi-pmic";
> + reg = <0x8 SPMI_USID>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pm8450e_gpios: gpio@c000 {
> + compatible = "qcom,pm8150-gpio";
> + reg = <0xc000>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> + };
> +
> + pm8450g: pmic@c {
> + compatible = "qcom,pm8150", "qcom,spmi-pmic";
> + reg = <0xc SPMI_USID>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pm8450g_gpios: gpio@c000 {
> + compatible = "qcom,pm8150-gpio";
> + reg = <0xc000>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> + };
> +};
> +
> +&ufs_mem_hc {
> + reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;
> +
> + vcc-supply = <&vreg_l17c>;
> + vcc-max-microamp = <800000>;
> + vccq-supply = <&vreg_l6c>;
> + vccq-max-microamp = <900000>;
> +
> + status = "okay";
> +};
> +
> +&ufs_mem_phy {
> + vdda-phy-supply = <&vreg_l8g>;
> + vdda-pll-supply = <&vreg_l3g>;
> +
> + status = "okay";
> +};
> +
> +&ufs_card_hc {
> + reset-gpios = <&tlmm 229 GPIO_ACTIVE_LOW>;
> +
> + vcc-supply = <&vreg_l10c>;
> + vcc-max-microamp = <800000>;
> + vccq-supply = <&vreg_l3c>;
> + vccq-max-microamp = <900000>;
> +
> + status = "okay";
> +};
> +
> +&ufs_card_phy {
> + vdda-phy-supply = <&vreg_l8g>;
> + vdda-pll-supply = <&vreg_l3g>;
> +
> + status = "okay";
> +};
> +
> +&usb_0 {
> + status = "okay";
> +};
> +
> +&usb_0_dwc3 {
> + /* TODO: Define USB-C connector properly */
> + dr_mode = "peripheral";
> +};
> +
> +&usb_0_hsphy {
> + vdda-pll-supply = <&vreg_l5a>;
> + vdda18-supply = <&vreg_l7a>;
> + vdda33-supply = <&vreg_l13a>;
> +
> + status = "okay";
> +};
> +
> +&usb_0_qmpphy {
> + vdda-phy-supply = <&vreg_l3a>;
> + vdda-pll-supply = <&vreg_l5a>;
> +
> + status = "okay";
> +};
> +
> +&usb_1 {
> + status = "okay";
> +};
> +
> +&usb_1_dwc3 {
> + /* TODO: Define USB-C connector properly */
> + dr_mode = "host";
> +};
> +
> +&usb_1_hsphy {
> + vdda-pll-supply = <&vreg_l1c>;
> + vdda18-supply = <&vreg_l7c>;
> + vdda33-supply = <&vreg_l2c>;
> +
> + status = "okay";
> +};
> +
> +&usb_1_qmpphy {
> + vdda-phy-supply = <&vreg_l4c>;
> + vdda-pll-supply = <&vreg_l1c>;
> +
> + status = "okay";
> +};
> +
> +&usb_2_hsphy0 {
> + vdda-pll-supply = <&vreg_l5a>;
> + vdda18-supply = <&vreg_l7g>;
> + vdda33-supply = <&vreg_l13a>;
> +
> + status = "okay";
> +};
> +
> +&usb_2_hsphy1 {
> + vdda-pll-supply = <&vreg_l5a>;
> + vdda18-supply = <&vreg_l7g>;
> + vdda33-supply = <&vreg_l13a>;
> +
> + status = "okay";
> +};
> +
> +&usb_2_hsphy2 {
> + vdda-pll-supply = <&vreg_l5a>;
> + vdda18-supply = <&vreg_l7g>;
> + vdda33-supply = <&vreg_l13a>;
> +
> + status = "okay";
> +};
> +
> +&usb_2_hsphy3 {
> + vdda-pll-supply = <&vreg_l5a>;
> + vdda18-supply = <&vreg_l7g>;
> + vdda33-supply = <&vreg_l13a>;
> +
> + status = "okay";
> +};
> +
> +&usb_2_qmpphy0 {
> + vdda-phy-supply = <&vreg_l3a>;
> + vdda-pll-supply = <&vreg_l5a>;
> +
> + status = "okay";
> +};
> +
> +&usb_2_qmpphy1 {
> + vdda-phy-supply = <&vreg_l3a>;
> + vdda-pll-supply = <&vreg_l5a>;
> +
> + status = "okay";
> +};
> +
> +&xo_board_clk {
> + clock-frequency = <38400000>;
> +};
> +
> +/* PINCTRL */
> --
> 2.17.1
>

2022-07-22 15:55:29

by Konrad Dybcio

[permalink] [raw]
Subject: Re: [PATCH v2 2/3] arm64: dts: qcom: sa8295p: move common nodes to dtsi



On 22.07.2022 16:32, Parikshit Pareek wrote:
> There are many ADP boards with lot of common features. Move common
> nodes to sa8xxxp-auto.dtsi files. This will be base for many ADP boards
> to be introduced in near future.
>
> Signed-off-by: Parikshit Pareek <[email protected]>
> ---
>
> Changes since v1:
> - Add , after year 2022, in the license header
> - Rename the dtsi which is suitable for common to many ADP boards
> - Split the patch in introducing common dtsi file, and adding new board
> file
>
> arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 378 +----------------
> .../arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi | 385 ++++++++++++++++++
Hello,

this one sounds too generic.. sa8195p matches the name and it is not a
part of this hw generation.

Konrad

2022-07-26 14:28:29

by Johan Hovold

[permalink] [raw]
Subject: Re: [PATCH v2 2/3] arm64: dts: qcom: sa8295p: move common nodes to dtsi

On Fri, Jul 22, 2022 at 08:02:32PM +0530, Parikshit Pareek wrote:
> There are many ADP boards with lot of common features. Move common
> nodes to sa8xxxp-auto.dtsi files. This will be base for many ADP boards
> to be introduced in near future.
>
> Signed-off-by: Parikshit Pareek <[email protected]>
> ---
>
> Changes since v1:
> - Add , after year 2022, in the license header
> - Rename the dtsi which is suitable for common to many ADP boards
> - Split the patch in introducing common dtsi file, and adding new board
> file
>
> arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 378 +----------------
> .../arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi | 385 ++++++++++++++++++
> 2 files changed, 387 insertions(+), 376 deletions(-)
> create mode 100644 arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi

Not sure about the name; sa8540-adp.dtsi seems like a better choice, but
I'd need to know more about how these two relate to each other.

What differs between sa8295p-adp and sa8540p-adp? That should go in the
commit message too.

> diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
> index 9398f0349944..3cc92162ba02 100644
> --- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
> +++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
> @@ -2,388 +2,14 @@
> /*
> * Copyright (c) 2021, The Linux Foundation. All rights reserved.
> * Copyright (c) 2022, Linaro Limited
> + * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.

I'm pretty sure you can't claim copyright for just moving code around
(same for the new file).

> */

Johan

2022-08-10 12:11:36

by Parikshit Pareek

[permalink] [raw]
Subject: Re: [PATCH v2 2/3] arm64: dts: qcom: sa8295p: move common nodes to dtsi

On Tue, Jul 26, 2022 at 03:49:26PM +0200, Johan Hovold wrote:
> On Fri, Jul 22, 2022 at 08:02:32PM +0530, Parikshit Pareek wrote:
> > There are many ADP boards with lot of common features. Move common
> > nodes to sa8xxxp-auto.dtsi files. This will be base for many ADP boards
> > to be introduced in near future.
> >
> > Signed-off-by: Parikshit Pareek <[email protected]>
> > ---
> >
> > Changes since v1:
> > - Add , after year 2022, in the license header
> > - Rename the dtsi which is suitable for common to many ADP boards
> > - Split the patch in introducing common dtsi file, and adding new board
> > file
> >
> > arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 378 +----------------
> > .../arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi | 385 ++++++++++++++++++
> > 2 files changed, 387 insertions(+), 376 deletions(-)
> > create mode 100644 arch/arm64/boot/dts/qcom/sa8xxxp-auto-adp.dtsi
>
> Not sure about the name; sa8540-adp.dtsi seems like a better choice, but
> I'd need to know more about how these two relate to each other.
>
> What differs between sa8295p-adp and sa8540p-adp? That should go in the
> commit message too.
The sa8540-adp has connectors for PCIe,ethernet-switch and different USB ports than sa8295p-adp.
So far, as we checked, such differences are on connector level and don't need any device tree level
modification. If any is needed, intention is to do that in future patches.
>
> > diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
> > index 9398f0349944..3cc92162ba02 100644
> > --- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
> > +++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
> > @@ -2,388 +2,14 @@
> > /*
> > * Copyright (c) 2021, The Linux Foundation. All rights reserved.
> > * Copyright (c) 2022, Linaro Limited
> > + * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
>
> I'm pretty sure you can't claim copyright for just moving code around
> (same for the new file).
>
> > */
>
> Johan
Regards,
Parikshit Pareek