Commit 3563b783 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-for-5.4' of... 

Merge tag 'qcom-arm64-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

Qualcomm ARM64 Updates for v5.4

* Add Lenovo Miix 630, HP Envy x2, and Asus Novago TP370QL support
* Assorted cleanups for SDM845 nodes
* Add video nodes, cpu coefficients, adsp, csdp, and
  fastrpc nodes for SDM845
* Add coresight for MSM8996, SDM845, and MSM8998
* Misc cleanups on QCS404 and PMS405
* Update memory map for QCS404
* Add wifi rails, update WCSS clocks, and add ADS unit names on QCS404
* Add Longcheer and Samsung Galaxy A3U/A5U support
* Add initial support for SM8150 and PM8150

* tag 'qcom-arm64-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (39 commits)
  arm64: dts: sdm845: Add parent clock for rpmhcc
  arm64: dts: qcom: sm8150: Add apps shared nodes
  arm64: dts: qcom: sm8150: Add reserved-memory regions
  arm64: dts: qcom: sm8150-mtp: Add regulators
  arm64: dts: qcom: sm8150-mtp: Add base dts file
  arm64: dts: qcom: pm8150l: Add base dts file
  arm64: dts: qcom: pm8150b: Add base dts file
  arm64: dts: qcom: pm8150: Add base dts file
  arm64: dts: qcom: sm8150: Add base dts file
  arm64: sdm845: add adsp and cdsp fastrpc nodes
  arm64: dts: sdm845: Add dynamic CPU power coefficients
  arm64: dts: qcom: qcs404: Update memory map to v3
  arm64: dts: qcom: qcs404-evb: Mark WCSS clocks protected
  arm64: dts: qcom: Add device tree for Longcheer L8150
  arm64: dts: qcom: Add device tree for Samsung Galaxy A3U/A5U
  dt-bindings: qcom: Document bindings for new MSM8916 devices
  dt-bindings: vendor-prefixes: Add Longcheer Technology Co., Ltd.
  arm64: dts: qcom: msm8996: Add Venus video codec DT node
  arm64: dts: qcom: Extend AOSS QMP node
  arm64: dts: qcom: msm8996: Add Coresight support
  ...
parents ffcd65a5 1dd70853

Documentation/devicetree/bindings/arm/qcom.yaml

+8 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ description: | 
  	mtp

  	sbc

  	hk01

  	qrd



  The 'soc_version' and 'board_version' elements take the form of v<Major>.<Minor>

  where the minor number may be omitted when it's zero, i.e.  v1.0 is the same
@@ -115,6 +116,13 @@ properties: 
          - const: qcom,msm8916-mtp

          - const: qcom,msm8916



      - items:

          - enum:

              - longcheer,l8150

              - samsung,a3u-eur

              - samsung,a5u-eur

          - const: qcom,msm8916



      - items:

          - const: qcom,msm8996-mtp

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -537,6 +537,8 @@ patternProperties: 
    description: Linear Technology Corporation

  "^logicpd,.*":

    description: Logic PD, Inc.

  "^longcheer,.*":

    description: Longcheer Technology (Shanghai) Co., Ltd.

  "^lsi,.*":

    description: LSI Corp. (LSI Logic)

  "^lwn,.*":

arch/arm64/boot/dts/qcom/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -3,14 +3,21 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk01.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-longcheer-l8150.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-samsung-a3u-eur.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-samsung-a5u-eur.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8998-asus-novago-tp370ql.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8998-hp-envy-x2.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8998-lenovo-miix-630.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8998-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r1.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r2.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r3.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-db845c.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8150-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-1000.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-4000.dtb

arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts

0 → 100644
+228 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



/dts-v1/;



#include "msm8916.dtsi"

#include "pm8916.dtsi"

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



/ {

	model = "Longcheer L8150";

	compatible = "longcheer,l8150", "qcom,msm8916-v1-qrd/9-v1", "qcom,msm8916";



	aliases {

		serial0 = &blsp1_uart2;

	};



	chosen {

		stdout-path = "serial0";

	};



	soc {

		sdhci@7824000 {

			status = "okay";



			vmmc-supply = <&pm8916_l8>;

			vqmmc-supply = <&pm8916_l5>;



			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

			pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;

		};



		sdhci@7864000 {

			status = "okay";



			vmmc-supply = <&pm8916_l11>;

			vqmmc-supply = <&pm8916_l12>;



			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;

			pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;



			non-removable;

		};



		serial@78b0000 {

			status = "okay";

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&blsp1_uart2_default>;

			pinctrl-1 = <&blsp1_uart2_sleep>;

		};



		usb@78d9000 {

			status = "okay";

			dr_mode = "peripheral";

			extcon = <&usb_vbus>;



			hnp-disable;

			srp-disable;

			adp-disable;



			ulpi {

				phy {

					extcon = <&usb_vbus>;

					v1p8-supply = <&pm8916_l7>;

					v3p3-supply = <&pm8916_l13>;

				};

			};

		};



		/*

		 * Attempting to enable these devices causes a "synchronous

		 * external abort". Suspected cause is that the debug power

		 * domain is not enabled by default on this device.

		 * Disable these devices for now to avoid the crash.

		 *

		 * See: https://lore.kernel.org/linux-arm-msm/20190618202623.GA53651@gerhold.net/

		 */

		tpiu@820000 { status = "disabled"; };

		funnel@821000 { status = "disabled"; };

		replicator@824000 { status = "disabled"; };

		etf@825000 { status = "disabled"; };

		etr@826000 { status = "disabled"; };

		funnel@841000 { status = "disabled"; };

		debug@850000 { status = "disabled"; };

		debug@852000 { status = "disabled"; };

		debug@854000 { status = "disabled"; };

		debug@856000 { status = "disabled"; };

		etm@85c000 { status = "disabled"; };

		etm@85d000 { status = "disabled"; };

		etm@85e000 { status = "disabled"; };

		etm@85f000 { status = "disabled"; };

	};



	// FIXME: Use extcon device provided by charger driver when available

	usb_vbus: usb-vbus {

		compatible = "linux,extcon-usb-gpio";

		vbus-gpio = <&msmgpio 62 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&usb_vbus_default>;

	};

};



&msmgpio {

	usb_vbus_default: usb-vbus-default {

		pinmux {

			function = "gpio";

			pins = "gpio62";

		};

		pinconf {

			pins = "gpio62";

			bias-pull-up;

		};

	};

};



&smd_rpm_regulators {

	vdd_l1_l2_l3-supply = <&pm8916_s3>;

	vdd_l4_l5_l6-supply = <&pm8916_s4>;

	vdd_l7-supply = <&pm8916_s4>;



	s1 {

		regulator-min-microvolt = <500000>;

		regulator-max-microvolt = <1300000>;

	};



	s3 {

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1300000>;

	};



	s4 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2100000>;

	};



	l1 {

		regulator-min-microvolt = <1225000>;

		regulator-max-microvolt = <1225000>;

	};



	l2 {

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

	};



	l3 {

		regulator-min-microvolt = <500000>;

		regulator-max-microvolt = <1287500>;

	};



	l4 {

		regulator-min-microvolt = <2050000>;

		regulator-max-microvolt = <2050000>;

	};



	l5 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	l6 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	l7 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	l8 {

		regulator-min-microvolt = <2850000>;

		regulator-max-microvolt = <2900000>;

	};



	l9 {

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	l10 {

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2800000>;

	};



	l11 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2950000>;

		regulator-allow-set-load;

		regulator-system-load = <200000>;

	};



	l12 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2950000>;

	};



	l13 {

		regulator-min-microvolt = <3075000>;

		regulator-max-microvolt = <3075000>;

	};



	l14 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

	};



	l15 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

	};



	l16 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

	};



	l17 {

		regulator-min-microvolt = <2850000>;

		regulator-max-microvolt = <2850000>;

	};



	l18 {

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2700000>;

	};

};

arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi

0 → 100644
+236 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



#include "msm8916.dtsi"

#include "pm8916.dtsi"

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

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	aliases {

		serial0 = &blsp1_uart2;

	};



	chosen {

		stdout-path = "serial0";

	};



	soc {

		sdhci@7824000 {

			status = "okay";



			vmmc-supply = <&pm8916_l8>;

			vqmmc-supply = <&pm8916_l5>;



			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

			pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;

		};



		sdhci@7864000 {

			status = "okay";



			vmmc-supply = <&pm8916_l11>;

			vqmmc-supply = <&pm8916_l12>;



			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;

			pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;



			cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;

		};



		serial@78b0000 {

			status = "okay";

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&blsp1_uart2_default>;

			pinctrl-1 = <&blsp1_uart2_sleep>;

		};



		usb@78d9000 {

			status = "okay";

			extcon = <&muic>, <&muic>;



			hnp-disable;

			srp-disable;

			adp-disable;



			ulpi {

				phy {

					extcon = <&muic>;

					v1p8-supply = <&pm8916_l7>;

					v3p3-supply = <&pm8916_l13>;

				};

			};

		};



		/*

		 * Attempting to enable these devices causes a "synchronous

		 * external abort". Suspected cause is that the debug power

		 * domain is not enabled by default on this device.

		 * Disable these devices for now to avoid the crash.

		 *

		 * See: https://lore.kernel.org/linux-arm-msm/20190618202623.GA53651@gerhold.net/

		 */

		tpiu@820000 { status = "disabled"; };

		funnel@821000 { status = "disabled"; };

		replicator@824000 { status = "disabled"; };

		etf@825000 { status = "disabled"; };

		etr@826000 { status = "disabled"; };

		funnel@841000 { status = "disabled"; };

		debug@850000 { status = "disabled"; };

		debug@852000 { status = "disabled"; };

		debug@854000 { status = "disabled"; };

		debug@856000 { status = "disabled"; };

		etm@85c000 { status = "disabled"; };

		etm@85d000 { status = "disabled"; };

		etm@85e000 { status = "disabled"; };

		etm@85f000 { status = "disabled"; };

	};



	i2c-muic {

		compatible = "i2c-gpio";

		sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;

		scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;



		#address-cells = <1>;

		#size-cells = <0>;



		muic: sm5502@25 {

			compatible = "siliconmitus,sm5502-muic";



			reg = <0x25>;

			interrupt-parent = <&msmgpio>;

			interrupts = <12 IRQ_TYPE_EDGE_FALLING>;



			pinctrl-names = "default";

			pinctrl-0 = <&muic_int_default>;

		};

	};

};



&msmgpio {

	muic_int_default: muic_int_default {

		pinmux {

			function = "gpio";

			pins = "gpio12";

		};

		pinconf {

			pins = "gpio12";

			drive-strength = <2>;

			bias-disable;

		};

	};

};



&smd_rpm_regulators {

	vdd_l1_l2_l3-supply = <&pm8916_s3>;

	vdd_l4_l5_l6-supply = <&pm8916_s4>;

	vdd_l7-supply = <&pm8916_s4>;



	s1 {

		regulator-min-microvolt = <500000>;

		regulator-max-microvolt = <1300000>;

	};



	s3 {

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1300000>;

	};



	s4 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2100000>;

	};



	l1 {

		regulator-min-microvolt = <1225000>;

		regulator-max-microvolt = <1225000>;

	};



	l2 {

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

	};



	l3 {

		regulator-min-microvolt = <500000>;

		regulator-max-microvolt = <1287500>;

	};



	l4 {

		regulator-min-microvolt = <2050000>;

		regulator-max-microvolt = <2050000>;

	};



	l5 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	l6 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	l7 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	l8 {

		regulator-min-microvolt = <2850000>;

		regulator-max-microvolt = <2900000>;

	};



	l9 {

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	l10 {

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2800000>;

	};



	l11 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2950000>;

		regulator-allow-set-load;

		regulator-system-load = <200000>;

	};



	l12 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2950000>;

	};



	l13 {

		regulator-min-microvolt = <3075000>;

		regulator-max-microvolt = <3075000>;

	};



	l14 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

	};



	l15 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

	};



	l16 {

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

	};



	l17 {

		regulator-min-microvolt = <2850000>;

		regulator-max-microvolt = <2850000>;

	};



	l18 {

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2700000>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE