Commit 2e04d1bd authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Qualcomm ARM64 DT updates for v5.6

* Align SDM845 firmware paths with linux-firmware
* Make WiFi work on Dragonboard845c
* Wire up wakeup controller for SDM845
* Critical thermal interrupt support for SDM845, MSM8996 and MSM8998
* Enable UFS for SM8150
* Add remoteproc enablers and nodes for SM8150
* Add CPUfreq for SM8150
* Add RPMH power-domain node for SM8150
* Cleanup and refactor MSM8996 dts structure
* Add initial Inforce Computing IFC6640 dts
* Increase MSM8996 core voltage
* Fix MSM8996 USB phy settings
* Add missing alias for BLSP UART in MSM8998 MTP
* Add remoteproc nodes for ADSP, modem and sensor core for MSM8998
* Enable WiFI for MSM8998
* Introduce the SC7180 platform and the IDP development board
* Add CPUfreq, QUPs, USB, remoteproc etc for SC7180
* Enable USB OTG for Dragonboard 410c
* Add vibrator motor node for PM8916
* Properly specify APCS clocks for MSM8916
* Add CPR and HFPLL for QCS404
* Enable full CPUfreq (with AVS) for QCS404

* tag 'qcom-arm64-for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (88 commits)
  arm64: dts: qcom: sdm845: move gpu zap nodes to per-device dts
  arm64: dts: qcom: sm8150: Hard code rpmhpd constants
  arm64: dts: apq8096-db820c: Fix VDD core voltage
  arm64: dts: qcom: qcs404-evb: Set vdd_apc regulator in high power mode
  arm64: dts: qcom: msm8998-mtp: Add alias for blsp1_uart3
  arm64: dts: qcom: sc7180: Add critical interrupt and cooling maps for TSENS in SC7180
  arm64: dts: qcom: msm8996: Fix venus iommu nodename error
  arm64: dts: qcom: sdm845: add the ufs reset
  arm64: dts: qcom: sm8150: Fix UFS phy register size
  arm64: dts: qcom: sm8150-mtp: Add UFS gpio reset
  arm64: dts: qcom: qcs404: Add CPR and populate OPP table
  arm64: dts: qcom: qcs404: Add DVFS support
  arm64: dts: qcom: qcs404: Add the clocks for APCS mux/divider
  arm64: dts: qcom: qcs404: Add HFPLL node
  arm64: dts: qcom: msm8916: Add the clocks for the APCS mux/divider
  arm64: dts: qcom: sc7180: Add rpmh power-domain node
  arm64: dts: pm8004: Add SPMI regulator and add phandles to lsids
  arm64: dts: msm8998: thermal: Add critical interrupt support
  arm64: dts: msm8996: thermal: Add critical interrupt support
  arm64: dts: qcom: db845c: Move remoteproc firmware to sdm845
  ...

Link: https://lore.kernel.org/r/20200113204225.GB3325@yoga


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e59760f7 f489b13d

Documentation/devicetree/bindings/arm/qcom.yaml

+25 −19
Original line number Diff line number Diff line
@@ -28,24 +28,26 @@ description: | 
        apq8074

        apq8084

        apq8096

        ipq8074

        mdm9615

        msm8916

        msm8974

        msm8992

        msm8994

        msm8996

  	mdm9615

  	ipq8074

        sc7180

        sdm845



  The 'board' element must be one of the following strings:



        cdp

  	liquid

        dragonboard

  	mtp

  	sbc

        hk01

        idp

        liquid

        mtp

        qrd

        sbc



  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
@@ -144,4 +146,8 @@ properties: 
              - qcom,ipq8074-hk01

          - const: qcom,ipq8074



      - items:

          - enum:

              - qcom,sc7180-idp

          - const: qcom,sc7180

...

arch/arm64/boot/dts/qcom/Makefile

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb

dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb

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

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

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-longcheer-l8150.dtb
@@ -13,6 +14,7 @@ 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)	+= sc7180-idp.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

arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -5,6 +5,15 @@ 
&pm8916_gpios {



	usb_hub_reset_pm: usb_hub_reset_pm {

		pinconf {

			pins = "gpio3";

			function = PMIC_GPIO_FUNC_NORMAL;

			input-disable;

			output-high;

		};

	};



	usb_hub_reset_pm_device: usb_hub_reset_pm_device {

		pinconf {

			pins = "gpio3";

			function = PMIC_GPIO_FUNC_NORMAL;
@@ -22,6 +31,16 @@ pinconf { 
		};

	};



	usb_sw_sel_pm_device: usb_sw_sel_pm_device {

		pinconf {

			pins = "gpio4";

			function = PMIC_GPIO_FUNC_NORMAL;

			power-source = <PM8916_GPIO_VPH>;

			input-disable;

			output-low;

		};

	};



	pm8916_gpios_leds: pm8916_gpios_leds {

		pinconf {

			pins = "gpio1", "gpio2";

arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -358,14 +358,15 @@ sdhci@7864000 { 
		};



		usb@78d9000 {

			extcon = <&usb_id>;

			extcon = <&usb_id>, <&usb_id>;

			status = "okay";

			adp-disable;

			hnp-disable;

			srp-disable;

			dr_mode = "host";

			pinctrl-names = "default";

			pinctrl-0 = <&usb_sw_sel_pm>;

			dr_mode = "otg";

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

			pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>;

			pinctrl-1 = <&usb_sw_sel_pm_device &usb_hub_reset_pm_device>;

			ulpi {

				phy {

					v1p8-supply = <&pm8916_l7>;
@@ -504,7 +505,7 @@ usb2513 { 


	usb_id: usb-id {

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

		vbus-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>;

		id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&usb_id_default>;

	};

arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi

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

/*

 * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 */

&msmgpio {

	sdc2_cd_on: sdc2_cd_on {

		mux {

			pins = "gpio38";

			function = "gpio";

		};



		config {

			pins = "gpio38";

			bias-pull-up;		/* pull up */

			drive-strength = <16>;	/* 16 MA */

		};

	};



	sdc2_cd_off: sdc2_cd_off {

		mux {

			pins = "gpio38";

			function = "gpio";

		};



		config {

			pins = "gpio38";

			bias-pull-up;		/* pull up */

			drive-strength = <2>;	/* 2 MA */

		};

	};



	blsp1_uart1_default: blsp1_uart1_default {

		mux {

			pins = "gpio41", "gpio42", "gpio43", "gpio44";

			function = "blsp_uart2";

		};



		config {

			pins = "gpio41", "gpio42", "gpio43", "gpio44";

			drive-strength = <16>;

			bias-disable;

		};

	};



	blsp1_uart1_sleep: blsp1_uart1_sleep {

		mux {

			pins = "gpio41", "gpio42", "gpio43", "gpio44";

			function = "gpio";

		};



		config {

			pins = "gpio41", "gpio42", "gpio43", "gpio44";

			drive-strength = <2>;

			bias-disable;

		};

	};



	hdmi_hpd_active: hdmi_hpd_active {

		mux {

			pins = "gpio34";

			function = "hdmi_hot";

		};



		config {

			pins = "gpio34";

			bias-pull-down;

			drive-strength = <16>;

		};

	};



	hdmi_hpd_suspend: hdmi_hpd_suspend {

		mux {

			pins = "gpio34";

			function = "hdmi_hot";

		};



		config {

			pins = "gpio34";

			bias-pull-down;

			drive-strength = <2>;

		};

	};



	hdmi_ddc_active: hdmi_ddc_active {

		mux {

			pins = "gpio32", "gpio33";

			function = "hdmi_ddc";

		};



		config {

			pins = "gpio32", "gpio33";

			drive-strength = <2>;

			bias-pull-up;

		};

	};



	hdmi_ddc_suspend: hdmi_ddc_suspend {

		mux {

			pins = "gpio32", "gpio33";

			function = "hdmi_ddc";

		};



		config {

			pins = "gpio32", "gpio33";

			drive-strength = <2>;

			bias-pull-down;

		};

	};

};