Commit 1cb00f8c authored May 21, 2020 by Arnd Bergmann

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

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

Qualcomm ARM64 DT updates for v5.8

For SDM845 this defines the IPA network accelerator and the CCI camera
control bus, it defines the required UFS reset and adds WiFi for the
Lenovo Yoga C630 and defines GPIO pin names and adds OV8856 and OC7251
camera nodes for DB845c.

For SC7180 it adds GPU support, defines the modem remoteproc, adds the
IPA network accelerator, Coresight and ETM support, adds cpuidle low
power states and updates the CPUs' compatible.

For SM8250 it adds regulators from the PM8150, PM8150L and PM8009 and
adds voltage corners, it defines the nodes for UFS PHY and controller
and finally corrects a typo in the PDC node to make SPMI functional.

For MSM8916 I2C1 and I2C5 are defined, a node for the CCI camera control
interface bus is added and Coresight is disabled by default to match
some product configurations. The Samsung A3U gained display support and
Samsung A5U gained touchscreen support.

MSM8996 now property describes the power supply chain for the GPU, the
CCI camera control interface bus is added and the DB820c has the
regulators of the secondary PMIC defined.

For QCS404 USB PHYs and controllers are defined and wired up for the
EVB.

SDM630/SDM660 platform support is added and the Xiaomi Redmi Note 7
defined.

It also contains a number of changes throughout to improve DT binding
compliance.

* tag 'qcom-arm64-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (68 commits)
  arm64: dts: qcom: sc7180: Correct the pdc interrupt ranges
  arm64: dts: qcom: sc7180: add IPA information
  arm64: dts: qcom: sc7180: Fix ETMv4 power management patch
  arm64: dts: qcom: sc7180: Add A618 gpu dt blob
  dt-bindings: arm-smmu: Add sc7180 compatible string
  arm64: dts: qcom: msm8996: Make GPU node control GPU_GX GDSC
  arm64: dts: qcom: db820c: Add vdd_gfx and tie it into mmcc
  arm64: dts: qcom: apq8016-sbc: merge -pins.dtsi into main .dtsi
  arm64: dts: qcom: msm8916: move gpu opp table to gpu node
  arm64: dts: qcom: msm8916: avoid using _ in node names
  arm64: dts: qcom: c630: Specify UFS device reset
  arm64: dts: qcom: c630: Add WiFi node
  arm64: dts: qcom: msm8916-samsung-a3u: add nodes for display panel
  arm64: dts: qcom: db820c: Fix invalid pm8994 supplies
  arm64: dts: qcom: db820c: Add pmi8994 RPM regulators
  arm64: dts: qcom: msm8916: Disable coresight by default
  arm64: dts: qcom: sc7180: Add "no-map" to cmd_db reserved area
  arm64: dts: qcom: msm8916-samsung-a5u: Add touchscreen
  arm64: dts: qcom: msm8916-samsung-a2015: Add touchscreen regulator
  arm64: dts: qcom: msm8916: Add blsp_i2c5
  ...

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


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents a9418e89 7d2f29e4

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ properties:
		- qcom,kryo260
		- qcom,kryo280
		- qcom,kryo385
		- qcom,kryo468
		- qcom,kryo485
		- qcom,scorpion

Documentation/devicetree/bindings/arm/qcom.yaml

+7 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@ description: \|
		msm8994
		msm8996
		sc7180
		sdm630
		sdm660
		sdm845

		The 'board' element must be one of the following strings:
		@@ -153,6 +155,11 @@ properties:
		- qcom,sc7180-idp
		- const: qcom,sc7180

		- items:
		- enum:
		- xiaomi,lavender
		- const: qcom,sdm660

		- items:
		- enum:
		- qcom,ipq6018-cp01-c1

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ properties:
		- enum:
		- qcom,msm8996-smmu-v2
		- qcom,msm8998-smmu-v2
		- qcom,sc7180-smmu-v2
		- qcom,sdm845-smmu-v2
		- const: qcom,smmu-v2

arch/arm64/boot/dts/qcom/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ 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) += sdm660-xiaomi-lavender.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

deleted100644 → 0

+0 −74

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
		#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>

		&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;
		output-low;
		};
		};

		usb_sw_sel_pm: usb_sw_sel_pm {
		pinconf {
		pins = "gpio4";
		function = PMIC_GPIO_FUNC_NORMAL;
		power-source = <PM8916_GPIO_VPH>;
		input-disable;
		output-high;
		};
		};

		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";
		function = PMIC_GPIO_FUNC_NORMAL;
		output-low;
		};
		};
		};

		&pm8916_mpps {

		pinctrl-names = "default";
		pinctrl-0 = <&ls_exp_gpio_f>;

		ls_exp_gpio_f: pm8916_mpp4 {
		pinconf {
		pins = "mpp4";
		function = "digital";
		output-low;
		power-source = <PM8916_MPP_L5>; // 1.8V
		};
		};

		pm8916_mpps_leds: pm8916_mpps_leds {
		pinconf {
		pins = "mpp2", "mpp3";
		function = "digital";
		output-low;
		};
		};
		};

Admin message