Skip to contentSkip to conversation

ARM: dts: qcom: ipq8064: add v2 dtsi variant

PATCH Applied Christian Marangi 3 participants 9 messages Jul 18, 2022 – Aug 29, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ARM: dts: qcom: ipq8064: add v2 dtsi variant

Add ipq8064-v2.0 dtsi variant that differ from original ipq8064 SoC for some additional pcie, sata and usb configuration values, additional reserved memory and serial output.

---
 .../boot/dts/qcom-ipq8064-v2.0-smb208.dtsi    | 37 ++++++++++
 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi      | 69 +++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi
 create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi new file +37 -0
new file mode 100644
index 000000000000..0442580b22de
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "qcom-ipq8064-v2.0.dtsi"
+
+&rpm {
+	smb208_regulators: regulators {
+		compatible = "qcom,rpm-smb208-regulators";
+
+		smb208_s1a: s1a {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s1b: s1b {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2a: s2a {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1250000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2b: s2b {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1250000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+	};
+};
arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi new file +69 -0

69 lines not on this page · raw message

Signature · 1 line
2.36.1
#1 lore raw

PATCH 2/3 ARM: dts: qcom: ipq8064: add ipq8062 variant

ipq8062 SoC is based on ipq8064-v2.0 with lower supported freq, lack of usb port and a reduced voltage output with the smb208 regulators.

---
 arch/arm/boot/dts/qcom-ipq8062-smb208.dtsi | 37 ++++++++++++++++++++++
 arch/arm/boot/dts/qcom-ipq8062.dtsi        |  8 +++++
 2 files changed, 45 insertions(+)
 create mode 100644 arch/arm/boot/dts/qcom-ipq8062-smb208.dtsi
 create mode 100644 arch/arm/boot/dts/qcom-ipq8062.dtsi
arch/arm/boot/dts/qcom-ipq8062-smb208.dtsi new file +37 -0
new file mode 100644
index 000000000000..9d06255104c7
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "qcom-ipq8062.dtsi"
+
+&rpm {
+	smb208_regulators: regulators {
+		compatible = "qcom,rpm-smb208-regulators";
+
+		smb208_s1a: s1a {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s1b: s1b {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2a: s2a {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2b: s2b {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+	};
+};
arch/arm/boot/dts/qcom-ipq8062.dtsi new file +8 -0
new file mode 100644
index 000000000000..5d3ebd3e2e51
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "qcom-ipq8064-v2.0.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. IPQ8062";
+	compatible = "qcom,ipq8062", "qcom,ipq8064";
+};
Signature · 1 line
2.36.1
#2 lore raw

PATCH 3/3 ARM: dts: qcom: ipq8064: add ipq8065 variant

In reply to Christian Marangi

ipq8065 SoC is based on ipq8064-v2.0 with a more clocked CPU and an increased voltage output with the smb208 regulators.

---
 arch/arm/boot/dts/qcom-ipq8065-smb208.dtsi | 37 ++++++++++++++++++++++
 arch/arm/boot/dts/qcom-ipq8065.dtsi        |  8 +++++
 2 files changed, 45 insertions(+)
 create mode 100644 arch/arm/boot/dts/qcom-ipq8065-smb208.dtsi
 create mode 100644 arch/arm/boot/dts/qcom-ipq8065.dtsi
arch/arm/boot/dts/qcom-ipq8065-smb208.dtsi new file +37 -0
new file mode 100644
index 000000000000..803e6ff99ef8
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "qcom-ipq8065.dtsi"
+
+&rpm {
+	smb208_regulators: regulators {
+		compatible = "qcom,rpm-smb208-regulators";
+
+		smb208_s1a: s1a {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s1b: s1b {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2a: s2a {
+			regulator-min-microvolt = <775000>;
+			regulator-max-microvolt = <1275000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2b: s2b {
+			regulator-min-microvolt = <775000>;
+			regulator-max-microvolt = <1275000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+	};
+};
arch/arm/boot/dts/qcom-ipq8065.dtsi new file +8 -0
new file mode 100644
index 000000000000..ea49f6cc416d
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "qcom-ipq8064-v2.0.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. IPQ8065";
+	compatible = "qcom,ipq8065", "qcom,ipq8064";
+};
Signature · 1 line
2.36.1
#3 lore raw
In reply to Christian Marangi
Quoted 5 lines · Christian Marangi

Add ipq8064-v2.0 dtsi variant that differ from original ipq8064 SoC for some additional pcie, sata and usb configuration values, additional reserved memory and serial output.

Any news for this?

Quoted 128 lines
---
 .../boot/dts/qcom-ipq8064-v2.0-smb208.dtsi    | 37 ++++++++++
 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi      | 69 +++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi
 create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi new file +37 -0
new file mode 100644
index 000000000000..0442580b22de
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "qcom-ipq8064-v2.0.dtsi"
+
+&rpm {
+	smb208_regulators: regulators {
+		compatible = "qcom,rpm-smb208-regulators";
+
+		smb208_s1a: s1a {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s1b: s1b {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2a: s2a {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1250000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2b: s2b {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1250000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+	};
+};
arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi new file +69 -0
new file mode 100644
index 000000000000..2f117d576daf
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "qcom-ipq8064.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. IPQ8064-v2.0";
+
+	aliases {
+		serial0 = &gsbi4_serial;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		rsvd@41200000 {
+			reg = <0x41200000 0x300000>;
+			no-map;
+		};
+	};
+};
+
+&gsbi4 {
+	qcom,mode = <GSBI_PROT_I2C_UART>;
+	status = "okay";
+
+	serial@16340000 {
+		status = "okay";
+	};
+	/*
+	 * The i2c device on gsbi4 should not be enabled.
+	 * On ipq806x designs gsbi4 i2c is meant for exclusive
+	 * RPM usage. Turning this on in kernel manifests as
+	 * i2c failure for the RPM.
+	 */
+};
+
+&pcie0 {
+	compatible = "qcom,pcie-ipq8064-v2";
+};
+
+&pcie1 {
+	compatible = "qcom,pcie-ipq8064-v2";
+};
+
+&pcie2 {
+	compatible = "qcom,pcie-ipq8064-v2";
+};
+
+&sata {
+	ports-implemented = <0x1>;
+};
+
+&ss_phy_0 {
+	qcom,rx-eq = <2>;
+	qcom,tx-deamp_3_5db = <32>;
+	qcom,mpll = <5>;
+};
+
+&ss_phy_1 {
+	qcom,rx-eq = <2>;
+	qcom,tx-deamp_3_5db = <32>;
+	qcom,mpll = <5>;
+};
Signature · 1 line
2.36.1
Signature · 1 line
	Ansuel
#4 lore raw
Quoted 8 lines · Christian Marangi
Quoted 5 lines · Christian Marangi

Add ipq8064-v2.0 dtsi variant that differ from original ipq8064 SoC for some additional pcie, sata and usb configuration values, additional reserved memory and serial output.

Any news for this?Unless Qualcomm naming was different back then, you should simply merge

all of these changes into ipq8064.dtsi, as v1 is often the pre-production, internal chip revision and only the last one (or the last and second-last) are shipped in production devices.

Konrad

Quoted 130 lines
Quoted 129 lines
---
 .../boot/dts/qcom-ipq8064-v2.0-smb208.dtsi    | 37 ++++++++++
 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi      | 69 +++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi
 create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi new file +37 -0
new file mode 100644
index 000000000000..0442580b22de
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "qcom-ipq8064-v2.0.dtsi"
+
+&rpm {
+	smb208_regulators: regulators {
+		compatible = "qcom,rpm-smb208-regulators";
+
+		smb208_s1a: s1a {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s1b: s1b {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2a: s2a {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1250000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2b: s2b {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1250000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+	};
+};
arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi new file +69 -0
new file mode 100644
index 000000000000..2f117d576daf
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "qcom-ipq8064.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. IPQ8064-v2.0";
+
+	aliases {
+		serial0 = &gsbi4_serial;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		rsvd@41200000 {
+			reg = <0x41200000 0x300000>;
+			no-map;
+		};
+	};
+};
+
+&gsbi4 {
+	qcom,mode = <GSBI_PROT_I2C_UART>;
+	status = "okay";
+
+	serial@16340000 {
+		status = "okay";
+	};
+	/*
+	 * The i2c device on gsbi4 should not be enabled.
+	 * On ipq806x designs gsbi4 i2c is meant for exclusive
+	 * RPM usage. Turning this on in kernel manifests as
+	 * i2c failure for the RPM.
+	 */
+};
+
+&pcie0 {
+	compatible = "qcom,pcie-ipq8064-v2";
+};
+
+&pcie1 {
+	compatible = "qcom,pcie-ipq8064-v2";
+};
+
+&pcie2 {
+	compatible = "qcom,pcie-ipq8064-v2";
+};
+
+&sata {
+	ports-implemented = <0x1>;
+};
+
+&ss_phy_0 {
+	qcom,rx-eq = <2>;
+	qcom,tx-deamp_3_5db = <32>;
+	qcom,mpll = <5>;
+};
+
+&ss_phy_1 {
+	qcom,rx-eq = <2>;
+	qcom,tx-deamp_3_5db = <32>;
+	qcom,mpll = <5>;
+};
Signature · 1 line
2.36.1
#5 lore raw
Quoted 8 lines · Konrad Dybcio
Quoted 5 lines · Christian Marangi
Quoted 4 lines · Christian Marangi

Add ipq8064-v2.0 dtsi variant that differ from original ipq8064 SoC for some additional pcie, sata and usb configuration values, additional reserved memory and serial output.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Any news for this?Unless Qualcomm naming was different back then, you should simply merge

all of these changes into ipq8064.dtsi, as v1 is often the pre-production, internal chip revision and only the last one (or the last and second-last) are shipped in production devices.

Mhh, this is not the case, there are dev board based on v1 and we also have some device based on v1 (that have some difference for pci and usb) One example is a Netgear r7500 where we have 2 revision one based on ipq8064-v1.0 and one based on ipq8064-v2.0.

Quoted 130 lines
Quoted 130 lines
Quoted 129 lines
---
 .../boot/dts/qcom-ipq8064-v2.0-smb208.dtsi    | 37 ++++++++++
 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi      | 69 +++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi
 create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi new file +37 -0
new file mode 100644
index 000000000000..0442580b22de
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "qcom-ipq8064-v2.0.dtsi"
+
+&rpm {
+	smb208_regulators: regulators {
+		compatible = "qcom,rpm-smb208-regulators";
+
+		smb208_s1a: s1a {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s1b: s1b {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1150000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2a: s2a {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1250000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+
+		smb208_s2b: s2b {
+			regulator-min-microvolt = < 800000>;
+			regulator-max-microvolt = <1250000>;
+
+			qcom,switch-mode-frequency = <1200000>;
+		};
+	};
+};
arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi new file +69 -0
new file mode 100644
index 000000000000..2f117d576daf
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "qcom-ipq8064.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. IPQ8064-v2.0";
+
+	aliases {
+		serial0 = &gsbi4_serial;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		rsvd@41200000 {
+			reg = <0x41200000 0x300000>;
+			no-map;
+		};
+	};
+};
+
+&gsbi4 {
+	qcom,mode = <GSBI_PROT_I2C_UART>;
+	status = "okay";
+
+	serial@16340000 {
+		status = "okay";
+	};
+	/*
+	 * The i2c device on gsbi4 should not be enabled.
+	 * On ipq806x designs gsbi4 i2c is meant for exclusive
+	 * RPM usage. Turning this on in kernel manifests as
+	 * i2c failure for the RPM.
+	 */
+};
+
+&pcie0 {
+	compatible = "qcom,pcie-ipq8064-v2";
+};
+
+&pcie1 {
+	compatible = "qcom,pcie-ipq8064-v2";
+};
+
+&pcie2 {
+	compatible = "qcom,pcie-ipq8064-v2";
+};
+
+&sata {
+	ports-implemented = <0x1>;
+};
+
+&ss_phy_0 {
+	qcom,rx-eq = <2>;
+	qcom,tx-deamp_3_5db = <32>;
+	qcom,mpll = <5>;
+};
+
+&ss_phy_1 {
+	qcom,rx-eq = <2>;
+	qcom,tx-deamp_3_5db = <32>;
+	qcom,mpll = <5>;
+};
Signature · 1 line
2.36.1
Signature · 1 line
	Ansuel
#6 lore raw
Quoted 17 lines · Christian Marangi
Quoted 8 lines · Konrad Dybcio
Quoted 5 lines · Christian Marangi
Quoted 4 lines · Christian Marangi

Add ipq8064-v2.0 dtsi variant that differ from original ipq8064 SoC for some additional pcie, sata and usb configuration values, additional reserved memory and serial output.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Any news for this?Unless Qualcomm naming was different back then, you should simply merge

all of these changes into ipq8064.dtsi, as v1 is often the pre-production, internal chip revision and only the last one (or the last and second-last) are shipped in production devices.

Quoted 4 lines

Mhh, this is not the case, there are dev board based on v1 and we also have some device based on v1 (that have some difference for pci and usb) One example is a Netgear r7500 where we have 2 revision one based on ipq8064-v1.0 and one based on ipq8064-v2.0.

Very interesting.. but if there really are devices shipping with v1, I guess it's the correct thing to keep both.

Konrad

#7 lore raw
Quoted 20 lines · Konrad Dybcio
Quoted 17 lines · Christian Marangi
Quoted 15 lines · Konrad Dybcio
Quoted 8 lines · Christian Marangi
Quoted 5 lines · Christian Marangi

Add ipq8064-v2.0 dtsi variant that differ from original ipq8064 SoC for some additional pcie, sata and usb configuration values, additional reserved memory and serial output.

Any news for this?Unless Qualcomm naming was different back then, you should simply merge

all of these changes into ipq8064.dtsi, as v1 is often the pre-production, internal chip revision and only the last one (or the last and second-last) are shipped in production devices.

Quoted 8 lines
Quoted 4 lines

Mhh, this is not the case, there are dev board based on v1 and we also have some device based on v1 (that have some difference for pci and usb) One example is a Netgear r7500 where we have 2 revision one based on ipq8064-v1.0 and one based on ipq8064-v2.0.

Very interesting.. but if there really are devices shipping with v1, I guess it's the correct thing to keep both.

Konrad

Yep, that is the case. Main concern here is the fact that we have to have smb208 dtsi variant for each revision and we can't reuse v2 for ipq8065 and ipq8062 as they have different opp for the CPU core. (currently not present but they will be added in the future when we will finally have a correct krait cache devfreq driver)

Signature · 1 line
	Ansuel
#8 lore raw

Re: (subset) [PATCH 1/3] ARM: dts: qcom: ipq8064: add v2 dtsi variant

In reply to Christian Marangi
Quoted 5 lines · Christian Marangi

Add ipq8064-v2.0 dtsi variant that differ from original ipq8064 SoC for some additional pcie, sata and usb configuration values, additional reserved memory and serial output.

Applied, thanks!

[1/3] ARM: dts: qcom: ipq8064: add v2 dtsi variant

      commit: a9f2cd80ee4669c851d6953fbbb592a3ba44df9f
[2/3] ARM: dts: qcom: ipq8064: add ipq8062 variant
      commit: 58907a1cae53dd5f91a7dfb17ac8de10c60c32fd
[3/3] ARM: dts: qcom: ipq8064: add ipq8065 variant
      commit: 12e621362be39350167ede99542256e768ecbfd6

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>