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

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

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

Qualcomm ARM64 DT updates for v5.14

MSM8916 gains new support for Huawei Ascend G7, with NFC, sensors and
touchscreen. The Samsung Galaxy A3/A5 gains battery support, touch keys,
NFC.

MSM8996 received more cleanup and refactoring, preparing for upcoming
new devices. Note worthy is the long pending enablement of CPUfreq.

SC7180 continues to stabilize, with a range of small fixes for various
bits and pieces, and new revisions for the CoachZ and pompom devices.

SC7280 continues to grow, with more clock controllers, thermal sensors,
thermal zones, CPUfreq and interconnect providers.

Xiaomi Poco F1 gaines audio support and the OnePlus 6/6T gaines IPA
support.

SM8350 gains some cleanups and the IPA device is enabled.

Initial support for the Microsoft Surface Duo, based on SM8150, is
added.

IPQ8074 gained support for the HK10 board.

* tag 'qcom-arm64-for-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (85 commits)
  arm64: dts: qcom: sc7180: Add xo clock for eMMC and Sd card
  arm64: dts: sc7280: Add interconnect provider DT nodes
  arm64: dts: qcom: msm8916-huawei-g7: Add NFC
  arm64: dts: qcom: msm8916-huawei-g7: Add display regulator
  arm64: dts: qcom: msm8916-huawei-g7: Add sensors
  arm64: dts: qcom: msm8916-huawei-g7: Add touchscreen
  arm64: dts: qcom: msm8916: Add device tree for Huawei Ascend G7
  arm64: dts: qcom: sc7180-trogdor: Update flash freq to match reality
  arm64: dts: qcom: sc7180: Add wakeup delay for adau codec
  arm64: dts: qcom: sdm845: Remove cros-pd-update on Cheza
  arm64: dts: qcom: sc7180: Remove cros-pd-update on Trogdor
  arm64: dts: qcom: sc7180: Disable PON on Trogdor
  arm64: dts: qcom: sc7180: Modify SPI_CLK voltage level for trogdor
  arm64: dts: qcom: add initial device-tree for Microsoft Surface Duo
  arm64: dts: qcom: sdm845-mtp: enable IPA
  arm64: dts: qcom: sc7180: SD-card GPIO pin set bias-pull up
  arm64: dts: qcom: sc7180: Move sdc pinconf to board specific DT files
  arm64: dts: qcom: msm8916-samsung-a2015: Add NFC
  arm64: dts: qcom: msm8916-samsung-a2015: Add rt5033 battery
  arm64: dts: qcom: msm8916-samsung-a5u: Add touch key regulator
  ...

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c2d0501c 81cfa462

Documentation/devicetree/bindings/arm/qcom.yaml

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ properties: 
      - items:

          - enum:

              - qcom,sc7280-idp

              - google,senor

          - const: qcom,sc7280



      - items:

arch/arm64/boot/dts/qcom/Makefile

+8 −2
Original line number Diff line number Diff line
@@ -5,8 +5,11 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-ifc6640.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= ipq6018-cp01-c1.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk10-c1.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk10-c2.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-alcatel-idol347.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-asus-z00l.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-huawei-g7.dtb

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

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

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb
@@ -35,8 +38,8 @@ dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-idp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r1.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r1-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r2.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r2-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r3.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r3-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r0.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r1.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r1-kb.dtb
@@ -51,6 +54,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-pompom-r1-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-pompom-r2.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-pompom-r2-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-pompom-r3.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-pompom-r3-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-r1.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-r1-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-idp.dtb
@@ -70,6 +75,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-oneplus-fajita.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-xiaomi-beryllium.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm850-lenovo-yoga-c630.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= sm8150-microsoft-surface-duo.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-hdk.dtb

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

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

+48 −45
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ 


/ {

	aliases {

		serial0 = &blsp2_uart1;

		serial1 = &blsp2_uart2;

		serial2 = &blsp1_uart1;

		i2c0	= &blsp1_i2c2;

		serial0 = &blsp2_uart2;

		serial1 = &blsp2_uart3;

		serial2 = &blsp1_uart2;

		i2c0	= &blsp1_i2c3;

		i2c1	= &blsp2_i2c1;

		i2c2	= &blsp2_i2c0;

		spi0	= &blsp1_spi0;

		spi1	= &blsp2_spi5;

		i2c2	= &blsp2_i2c1;

		spi0	= &blsp1_spi1;

		spi1	= &blsp2_spi6;

	};



	chosen {
@@ -133,24 +133,24 @@ wlan_en: wlan-en-1-8v { 
	};

};



&blsp1_i2c2 {

&blsp1_i2c3 {

	/* On Low speed expansion */

	label = "LS-I2C0";

	status = "okay";

};



&blsp1_spi0 {

&blsp1_spi1 {

	/* On Low speed expansion */

	label = "LS-SPI0";

	status = "okay";

};



&blsp1_uart1 {

&blsp1_uart2 {

	label = "BT-UART";

	status = "okay";

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

	pinctrl-0 = <&blsp1_uart1_default>;

	pinctrl-1 = <&blsp1_uart1_sleep>;

	pinctrl-0 = <&blsp1_uart2_default>;

	pinctrl-1 = <&blsp1_uart2_sleep>;



	bluetooth {

		compatible = "qcom,qca6174-bt";
@@ -162,7 +162,11 @@ bluetooth { 
	};

};



&blsp2_i2c0 {

&adsp_pil {

	status = "okay";

};



&blsp2_i2c1 {

	/* On High speed expansion */

	label = "HS-I2C2";

	status = "okay";
@@ -174,32 +178,36 @@ &blsp2_i2c1 { 
	status = "okay";

};



&blsp2_spi5 {

&blsp2_spi6 {

	/* On High speed expansion */

	label = "HS-SPI1";

	status = "okay";

};



&blsp2_uart1 {

&blsp2_uart2 {

	label = "LS-UART1";

	status = "okay";

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

	pinctrl-0 = <&blsp2_uart1_2pins_default>;

	pinctrl-1 = <&blsp2_uart1_2pins_sleep>;

	pinctrl-0 = <&blsp2_uart2_2pins_default>;

	pinctrl-1 = <&blsp2_uart2_2pins_sleep>;

};



&blsp2_uart2 {

&blsp2_uart3 {

	label = "LS-UART0";

	status = "disabled";

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

	pinctrl-0 = <&blsp2_uart2_4pins_default>;

	pinctrl-1 = <&blsp2_uart2_4pins_sleep>;

	pinctrl-0 = <&blsp2_uart3_4pins_default>;

	pinctrl-1 = <&blsp2_uart3_4pins_sleep>;

};



&camss {

	vdda-supply = <&vreg_l2a_1p25>;

};



&gpu {

	status = "okay";

};



&hdmi {

	status = "okay";
@@ -245,7 +253,12 @@ &mmcc { 
	vdd-gfx-supply = <&vdd_gfx>;

};



&msmgpio {

&pm8994_resin {

	status = "okay";

	linux,code = <KEY_VOLUMEDOWN>;

};



&tlmm {

	gpio-line-names =

		"[SPI0_DOUT]", /* GPIO_0, BLSP1_SPI_MOSI, LSEC pin 14 */

		"[SPI0_DIN]", /* GPIO_1, BLSP1_SPI_MISO, LSEC pin 10 */
@@ -424,7 +437,7 @@ config { 
		};

	};



	blsp1_uart1_default: blsp1_uart1_default {

	blsp1_uart2_default: blsp1_uart2_default {

		mux {

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

			function = "blsp_uart2";
@@ -437,7 +450,7 @@ config { 
		};

	};



	blsp1_uart1_sleep: blsp1_uart1_sleep {

	blsp1_uart2_sleep: blsp1_uart2_sleep {

		mux {

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

			function = "gpio";
@@ -505,20 +518,20 @@ config { 


&pcie0 {

	status = "okay";

	perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>;

	perst-gpio = <&tlmm 35 GPIO_ACTIVE_LOW>;

	vddpe-3v3-supply = <&wlan_en>;

	vdda-supply = <&vreg_l28a_0p925>;

};



&pcie1 {

	status = "okay";

	perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>;

	perst-gpio = <&tlmm 130 GPIO_ACTIVE_LOW>;

	vdda-supply = <&vreg_l28a_0p925>;

};



&pcie2 {

	status = "okay";

	perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;

	perst-gpio = <&tlmm 114 GPIO_ACTIVE_LOW>;

	vdda-supply = <&vreg_l28a_0p925>;

};
@@ -929,9 +942,9 @@ vreg_s1b_1p025: s1 { 
&sdhc2 {

	/* External SD card */

	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 0x1>;

	pinctrl-0 = <&sdc2_state_on &sdc2_cd_on>;

	pinctrl-1 = <&sdc2_state_off &sdc2_cd_off>;

	cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;

	vmmc-supply = <&vreg_l21a_2p95>;

	vqmmc-supply = <&vreg_l13a_2p95>;

	status = "okay";
@@ -1026,20 +1039,6 @@ codec { 
	};

};



&spmi_bus {

	pmic@0 {

		pon@800 {

			resin {

				compatible = "qcom,pm8941-resin";

				interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;

				debounce = <15625>;

				bias-pull-up;

				linux,code = <KEY_VOLUMEDOWN>;

			};

		};

	};

};



&ufsphy {

	status = "okay";
@@ -1064,7 +1063,7 @@ &usb2 { 
	status = "okay";

	extcon = <&usb2_id>;



	dwc3@7600000 {

	usb@7600000 {

		extcon = <&usb2_id>;

		dr_mode = "otg";

		maximum-speed = "high-speed";
@@ -1075,7 +1074,7 @@ &usb3 { 
	status = "okay";

	extcon = <&usb3_id>;



	dwc3@6a00000 {

	usb@6a00000 {

		extcon = <&usb3_id>;

		dr_mode = "otg";

	};
@@ -1089,6 +1088,10 @@ &usb3phy { 


};



&venus {

	status = "okay";

};



&wcd9335 {

	clock-names = "mclk", "slimbus";

	clocks = <&div1_mclk>,

arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts

+18 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ / { 
	qcom,board-id = <0x00010018 0>;



	aliases {

		serial0 = &blsp2_uart1;

		serial0 = &blsp2_uart2;

	};



	chosen {
@@ -81,14 +81,22 @@ vph_pwr: vph-pwr-regulator { 
	};

};



&blsp2_uart1 {

&blsp2_uart2 {

	status = "okay";

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

	pinctrl-0 = <&blsp2_uart1_2pins_default>;

	pinctrl-1 = <&blsp2_uart1_2pins_sleep>;

	pinctrl-0 = <&blsp2_uart2_2pins_default>;

	pinctrl-1 = <&blsp2_uart2_2pins_sleep>;

};



&msmgpio {

&gpu {

	status = "okay";

};



&mdss {

	status = "okay";

};



&tlmm {

	sdc2_pins_default: sdc2-pins-default {

		clk {

			pins = "sdc2_clk";
@@ -352,7 +360,7 @@ &sdhc2 { 


	bus-width = <4>;



	cd-gpios = <&msmgpio 38 0x1>;

	cd-gpios = <&tlmm 38 0x1>;



	vmmc-supply = <&vreg_l21a_2p95>;

	vqmmc-supply = <&vreg_l13a_2p95>;
@@ -383,3 +391,7 @@ &ufsphy { 
	vdda-phy-max-microamp = <18380>;

	vdda-pll-max-microamp = <9440>;

};



&venus {

	status = "okay";

};

arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dts

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

/* Copyright (c) 2020 The Linux Foundation. All rights reserved.

 */

/dts-v1/;



#include "ipq8074-hk10.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. IPQ8074/AP-HK10-C1";

	compatible = "qcom,ipq8074-hk10-c1", "qcom,ipq8074";

};