Unverified Commit c21cc3d8 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Additional Qualcomm ARM64 DT updates for v5.14

After a series of refactorings and additions to the SM8150 and SM8250
platform definitions, this adds new devicetree definitions for Sony
Xperia 1, 5, 1II and 5II.

It defines the Qualcomm SA8155p automotive platform as a derrivative of
SM8150 and introduces the Automotive Deveopment Platform board.

Lastly ipq8074 gains the definiton of an additiona I2C master and the
SDHCI bus votes for sc7180 are tweaked.

* tag 'qcom-arm64-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (25 commits)
  arm64: dts: ipq8074: Add QUP6 I2C node
  arm64: dts: qcom: sc7180: bus votes for eMMC and SD card
  arm64: dts: qcom: sm8250-edo: Add Samsung touchscreen
  arm64: dts: qcom: sm8250-edo: Enable GPI DMA
  arm64: dts: qcom: sm8250-edo: Enable ADSP/CDSP/SLPI
  arm64: dts: qcom: sm8250-edo: Enable PCIe
  arm64: dts: qcom: sm8250: Commonize PCIe pins
  arm64: dts: qcom: sm8250-edo: Add hardware keys
  arm64: dts: qcom: sa8155p-adp: Add base dts file
  arm64: dts: qcom: pmm8155au_2: Add base dts file
  arm64: dts: qcom: pmm8155au_1: Add base dts file
  arm64: dts: qcom: sm8250-edo: Fix up double "pinctrl-1"
  arm64: dts: qcom: sm8[12]50-pm8150: Move RESIN to pm8150 dtsi
  arm64: dts: qcom: sm8250: Add support for SONY Xperia 1 II / 5 II (Edo platform)
  arm64: dts: qcom: sm8250: Move gpio.h inclusion to SoC DTSI
  arm64: dts: qcom: sm8250: Add SDHCI2 sleep mode pinctrl
  arm64: dts: qcom: sm8150: Add support for SONY Xperia 1 / 5 (Kumano platform)
  arm64: dts: qcom: sm8150: Disable Adreno and modem by default
  arm64: dts: qcom: sm8250: Disable Adreno and Venus by default
  arm64: dts: qcom: sm8250: Add GPI DMA nodes
  ...

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 73d1774e abe66bb7

Documentation/devicetree/bindings/arm/qcom.yaml

+13 −0
Original line number Diff line number Diff line
@@ -36,17 +36,20 @@ description: | 
        msm8992

        msm8994

        msm8996

        sa8155p

        sc7180

        sc7280

        sdm630

        sdm660

        sdm845

        sdx55

        sm8150

        sm8250

        sm8350



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



        adp

        cdp

        cp01-c1

        dragonboard
@@ -199,6 +202,16 @@ properties: 
              - qcom,ipq6018-cp01-c1

          - const: qcom,ipq6018



      - items:

          - enum:

              - qcom,sa8155p-adp

          - const: qcom,sa8155p



      - items:

          - enum:

              - qcom,sm8150-mtp

          - const: qcom,sm8150



      - items:

          - enum:

              - qcom,qrb5165-rb5

arch/arm64/boot/dts/qcom/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-oneplus-dumpling.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-1000.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= qrb5165-rb5.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sa8155p-adp.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
@@ -77,7 +78,11 @@ 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)	+= sm8150-sony-xperia-kumano-bahamut.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8150-sony-xperia-kumano-griffin.dtb

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

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

dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-sony-xperia-edo-pdx203.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-sony-xperia-edo-pdx206.dtb

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

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

arch/arm64/boot/dts/qcom/ipq8074.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -373,6 +373,21 @@ blsp1_i2c3: i2c@78b7000 { 
			status = "disabled";

		};



		blsp1_i2c6: i2c@78ba000 {

			compatible = "qcom,i2c-qup-v2.2.1";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x078ba000 0x600>;

			interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&gcc GCC_BLSP1_AHB_CLK>,

				 <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;

			clock-names = "iface", "core";

			clock-frequency = <100000>;

			dmas = <&blsp_dma 23>, <&blsp_dma 22>;

			dma-names = "rx", "tx";

			status = "disabled";

		};



		qpic_bam: dma-controller@7984000 {

			compatible = "qcom,bam-v1.7.0";

			reg = <0x07984000 0x1a000>;

arch/arm64/boot/dts/qcom/pm8150.dtsi

+11 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ pm8150_0: pmic@0 { 
		pon: power-on@800 {

			compatible = "qcom,pm8916-pon";

			reg = <0x0800>;

			pwrkey {



			pon_pwrkey: pwrkey {

				compatible = "qcom,pm8941-pwrkey";

				interrupts = <0x0 0x8 0x0 IRQ_TYPE_EDGE_BOTH>;

				debounce = <15625>;
@@ -59,6 +60,15 @@ pwrkey { 


				status = "disabled";

			};



			pon_resin: resin {

				compatible = "qcom,pm8941-resin";

				interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>;

				debounce = <15625>;

				bias-pull-up;



				status = "disabled";

			};

		};



		pm8150_temp: temp-alarm@2400 {

arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi

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

/*

 * Copyright (c) 2021, Linaro Limited

 */



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

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

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

#include <dt-bindings/iio/qcom,spmi-vadc.h>



/ {

	thermal-zones {

		pmm8155au-1-thermal {

			polling-delay-passive = <100>;

			polling-delay = <0>;



			thermal-sensors = <&pmm8155au_1_temp>;



			trips {

				trip0 {

					temperature = <95000>;

					hysteresis = <0>;

					type = "passive";

				};



				trip1 {

					temperature = <115000>;

					hysteresis = <0>;

					type = "hot";

				};



				trip2 {

					temperature = <145000>;

					hysteresis = <0>;

					type = "critical";

				};

			};

		};

	};

};



&spmi_bus {

	pmic@0 {

		compatible = "qcom,pmm8155au", "qcom,spmi-pmic";

		reg = <0x0 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <0>;



		pon: power-on@800 {

			compatible = "qcom,pm8916-pon";

			reg = <0x0800>;

			pwrkey {

				compatible = "qcom,pm8941-pwrkey";

				interrupts = <0x0 0x8 0x0 IRQ_TYPE_EDGE_BOTH>;

				debounce = <15625>;

				bias-pull-up;

				linux,code = <KEY_POWER>;



				status = "disabled";

			};

		};



		pmm8155au_1_temp: temp-alarm@2400 {

			compatible = "qcom,spmi-temp-alarm";

			reg = <0x2400>;

			interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;

			io-channels = <&pmm8155au_1_adc ADC5_DIE_TEMP>;

			io-channel-names = "thermal";

			#thermal-sensor-cells = <0>;

		};



		pmm8155au_1_adc: adc@3100 {

			compatible = "qcom,spmi-adc5";

			reg = <0x3100>;

			#address-cells = <1>;

			#size-cells = <0>;

			#io-channel-cells = <1>;

			interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;



			ref-gnd@0 {

				reg = <ADC5_REF_GND>;

				qcom,pre-scaling = <1 1>;

				label = "ref_gnd";

			};



			vref-1p25@1 {

				reg = <ADC5_1P25VREF>;

				qcom,pre-scaling = <1 1>;

				label = "vref_1p25";

			};



			die-temp@6 {

				reg = <ADC5_DIE_TEMP>;

				qcom,pre-scaling = <1 1>;

				label = "die_temp";

			};

		};



		pmm8155au_1_adc_tm: adc-tm@3500 {

			compatible = "qcom,spmi-adc-tm5";

			reg = <0x3500>;

			interrupts = <0x0 0x35 0x0 IRQ_TYPE_EDGE_RISING>;

			#thermal-sensor-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		pmm8155au_1_rtc: rtc@6000 {

			compatible = "qcom,pm8941-rtc";

			reg = <0x6000>;

			reg-names = "rtc", "alarm";

			interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;



			status = "disabled";

		};



		pmm8155au_1_gpios: gpio@c000 {

			compatible = "qcom,pmm8155au-gpio";

			reg = <0xc000>;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-ranges = <&pmm8155au_1_gpios 0 0 10>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};



	pmic@1 {

		compatible = "qcom,pmm8155au", "qcom,spmi-pmic";

		reg = <0x1 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <0>;

	};

};