Commit 6417554e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-dts-for-5.13-2' of... 

Merge tag 'qcom-dts-for-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

More Qualcomm DTS updates for 5.13

This adds CPUfreq, interconnect providers, IPC, remoteproc and IPA to
the SDX55 platform and then adds board files for the Telit FN980 TLB and
Thundercomm TurboX T55.

* tag 'qcom-dts-for-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: sdx55: add IPA information
  ARM: dts: qcom: sdx55: Add basic devicetree support for Thundercomm T55
  dt-bindings: arm: qcom: Add binding for Thundercomm T55 kit
  ARM: dts: qcom: sdx55: Add basic devicetree support for Telit FN980 TLB
  dt-bindings: arm: qcom: Add binding for Telit FN980 TLB board
  ARM: dts: qcom: sdx55: Add Modem remoteproc node
  ARM: dts: qcom: Fix node name for NAND controller node
  ARM: dts: qcom: sdx55: Add interconnect nodes
  ARM: dts: qcom: sdx55: Add SCM node
  dt-bindings: firmware: scm: Add compatible for SDX55
  ARM: dts: qcom: sdx55: Add IMEM and PIL info region
  ARM: dts: qcom: sdx55: Add modem SMP2P node
  ARM: dts: qcom: sdx55: Add CPUFreq support
  ARM: dts: qcom: sdx55: Add support for APCS block
  ARM: dts: qcom: sdx55: Add support for A7 PLL clock

Link: https://lore.kernel.org/r/20210419150956.860423-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3060a15c 06ad53ef

Documentation/devicetree/bindings/arm/qcom.yaml

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ properties: 
      - items:

          - enum:

              - qcom,sdx55-mtp

              - qcom,sdx55-telit-fn980-tlb

              - qcom,sdx55-t55

          - const: qcom,sdx55



      - items:

Documentation/devicetree/bindings/firmware/qcom,scm.txt

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Required properties: 
 * "qcom,scm-msm8998"

 * "qcom,scm-sc7180"

 * "qcom,scm-sdm845"

 * "qcom,scm-sdx55"

 * "qcom,scm-sm8150"

 * "qcom,scm-sm8250"

 * "qcom,scm-sm8350"

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -931,7 +931,9 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
	qcom-msm8974-sony-xperia-castor.dtb \

	qcom-msm8974-sony-xperia-honami.dtb \

	qcom-mdm9615-wp8548-mangoh-green.dtb \

	qcom-sdx55-mtp.dtb

	qcom-sdx55-mtp.dtb \

	qcom-sdx55-t55.dtb \

	qcom-sdx55-telit-fn980-tlb.dtb

dtb-$(CONFIG_ARCH_RDA) += \

	rda8810pl-orangepi-2g-iot.dtb \

	rda8810pl-orangepi-i96.dtb

arch/arm/boot/dts/qcom-ipq4019.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ qpic_bam: dma@7984000 { 
			status = "disabled";

		};



		nand: qpic-nand@79b0000 {

		nand: nand-controller@79b0000 {

			compatible = "qcom,ipq4019-nand";

			reg = <0x79b0000 0x1000>;

			#address-cells = <1>;

arch/arm/boot/dts/qcom-sdx55-t55.dts

0 → 100644
+281 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause

/*

 * Copyright (c) 2021, Linaro Ltd.

 */



/dts-v1/;



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/regulator/qcom,rpmh-regulator.h>

#include "qcom-sdx55.dtsi"

#include "qcom-pmx55.dtsi"



/ {

	model = "Thundercomm T55 Development Kit";

	compatible = "qcom,sdx55-t55", "qcom,sdx55";

	qcom,board-id = <0xb010008 0x4>;



	aliases {

		serial0 = &blsp1_uart3;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		mpss_debug_mem: memory@8ef00000 {

			no-map;

			reg = <0x8ef00000 0x800000>;

		};



		ipa_fw_mem: memory@8fced000 {

			no-map;

			reg = <0x8fced000 0x10000>;

		};



		mpss_adsp_mem: memory@90800000 {

			no-map;

			reg = <0x90800000 0xf800000>;

		};

	};



	vph_pwr: vph-pwr-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vph_pwr";

		regulator-min-microvolt = <3700000>;

		regulator-max-microvolt = <3700000>;

	};



	vreg_bob_3p3: pmx55-bob {

		compatible = "regulator-fixed";

		regulator-name = "vreg_bob_3p3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



		regulator-always-on;

		regulator-boot-on;



		vin-supply = <&vph_pwr>;

	};



	vreg_s7e_mx_0p752: pmx55-s7e {

		compatible = "regulator-fixed";

		regulator-name = "vreg_s7e_mx_0p752";

		regulator-min-microvolt = <752000>;

		regulator-max-microvolt = <752000>;



		vin-supply = <&vph_pwr>;

	};



	vreg_sd_vdd: sd-vdd {

		compatible = "regulator-fixed";

		regulator-name = "vreg_sd_vdd";

		regulator-min-microvolt = <2950000>;

		regulator-max-microvolt = <2950000>;



		vin-supply = <&vreg_vddpx_2>;

	};



	vreg_vddpx_2: vddpx-2 {

		compatible = "regulator-gpio";

		regulator-name = "vreg_vddpx_2";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2850000>;

		enable-gpios = <&tlmm 98 GPIO_ACTIVE_HIGH>;

		gpios = <&tlmm 100 GPIO_ACTIVE_HIGH>;

		states = <1800000 0>, <2850000 1>;

		startup-delay-us = <200000>;

		enable-active-high;

		regulator-boot-on;



		vin-supply = <&vph_pwr>;

	};

};



&apps_rsc {

	pmx55-rpmh-regulators {

		compatible = "qcom,pmx55-rpmh-regulators";

		qcom,pmic-id = "e";



		vdd-s1-supply = <&vph_pwr>;

		vdd-s2-supply = <&vph_pwr>;

		vdd-s3-supply = <&vph_pwr>;

		vdd-s4-supply = <&vph_pwr>;

		vdd-s5-supply = <&vph_pwr>;

		vdd-s6-supply = <&vph_pwr>;

		vdd-s7-supply = <&vph_pwr>;

		vdd-l1-l2-supply = <&vreg_s2e_1p224>;

		vdd-l3-l9-supply = <&vreg_s3e_0p824>;

		vdd-l4-l12-supply = <&vreg_s4e_1p904>;

		vdd-l5-l6-supply = <&vreg_s4e_1p904>;

		vdd-l7-l8-supply = <&vreg_s3e_0p824>;

		vdd-l10-l11-l13-supply = <&vreg_bob_3p3>;

		vdd-l14-supply = <&vreg_s7e_mx_0p752>;

		vdd-l15-supply = <&vreg_s2e_1p224>;

		vdd-l16-supply = <&vreg_s4e_1p904>;



		vreg_s2e_1p224: smps2 {

			regulator-min-microvolt = <1280000>;

			regulator-max-microvolt = <1400000>;

		};



		vreg_s3e_0p824: smps3 {

			regulator-min-microvolt = <800000>;

			regulator-max-microvolt = <1000000>;

		};



		vreg_s4e_1p904: smps4 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1960000>;

		};



		vreg_l1e_bb_1p2: ldo1 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo2 {

			regulator-min-microvolt = <1128000>;

			regulator-max-microvolt = <1128000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo3 {

			regulator-min-microvolt = <800000>;

			regulator-max-microvolt = <800000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		vreg_l4e_bb_0p875: ldo4 {

			regulator-min-microvolt = <872000>;

			regulator-max-microvolt = <872000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		vreg_l5e_bb_1p7: ldo5 {

			regulator-min-microvolt = <1704000>;

			regulator-max-microvolt = <1900000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo6 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo7 {

			regulator-min-microvolt = <480000>;

			regulator-max-microvolt = <900000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo8 {

			regulator-min-microvolt = <480000>;

			regulator-max-microvolt = <900000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo9 {

			regulator-min-microvolt = <800000>;

			regulator-max-microvolt = <800000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		vreg_l10e_3p1: ldo10 {

			regulator-min-microvolt = <3088000>;

			regulator-max-microvolt = <3088000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo11 {

			regulator-min-microvolt = <1704000>;

			regulator-max-microvolt = <2928000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo12 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo13 {

			regulator-min-microvolt = <1704000>;

			regulator-max-microvolt = <2928000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo14 {

			regulator-min-microvolt = <600000>;

			regulator-max-microvolt = <800000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo15 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};



		ldo16 {

			regulator-min-microvolt = <1704000>;

			regulator-max-microvolt = <1904000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};

};



&blsp1_uart3 {

	status = "ok";

};



&qpic_bam {

	status = "ok";

};



&qpic_nand {

	status = "ok";



	nand@0 {

		reg = <0>;



		nand-ecc-strength = <8>;

		nand-ecc-step-size = <512>;

		nand-bus-width = <8>;

		/* efs2 partition is secured */

		secure-regions = <0x500000 0xb00000>;

	};

};



&remoteproc_mpss {

	status = "okay";

	memory-region = <&mpss_adsp_mem>;

};



&usb_hsphy {

	status = "okay";

	vdda-pll-supply = <&vreg_l4e_bb_0p875>;

	vdda33-supply = <&vreg_l10e_3p1>;

	vdda18-supply = <&vreg_l5e_bb_1p7>;

};



&usb_qmpphy {

	status = "okay";

	vdda-phy-supply = <&vreg_l4e_bb_0p875>;

	vdda-pll-supply = <&vreg_l1e_bb_1p2>;

};



&usb {

	status = "okay";

};



&usb_dwc3 {

	dr_mode = "peripheral";

};