Commit a1c259cd authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Qualcomm ARM64 DT updates for v5.10

Cleanup, refactor and modernize MSM8916 by sorting nodes, moving device
and platform specific parts to their respective files, add and use
labels for reference nodes and use IRQ defines. Migrate TCSR mutex off
the depricated binding, add resin node for PM8916.

Add LPASS clock controller for SC7180. Fix the LLCC reg, increase
interconnect-cells, drop flags on MDSS irqs. Add interconnects for
display, eMMC and SD-card, specify 'sustainable_power' for CPU thermal
zones, improve pinconf states related to UART and Bluetooth. Add new DT
for Lazor and Trogdor.

Increase #interconnect-cells for SDM845 to allow tags, add OPP tables
and power-domains for Venus and interconnects for display. Fix the ports
on the HDMI nodes for DB845c and add DT for the Xiaomi Poco F1.

Add interconnect providers, fix up primary USB's clock and use
dt-binding defines for GPU clocks on SM8150.

Add interconnect providers, CPUfreq, thermal configuration and missing
uarts for SM8250. Fix up naming of debug uart, add always-on supply
clock to gcc, fix up the sleep clock rate and define OPP tables for all
QUP devices. Then add a new DeviceTree for the QRB5165 RB5 board.

Enable watchdog on IPQ8074 and use the appropriate compatible for the
PMU node. Enable DVFS support for IPQ6018.

Finally correct the spelling of "interrupts" in MSM8992 uart node, fix
missing # in PM660 #interrupt-cells, add second VFE power-domain to
camss in MSM8996 and sort the Makefile.

* tag 'qcom-arm64-for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (75 commits)
  arm64: dts: qcom: sm8250: Add thermal zones and throttling support
  arm64: dts: qcom: sm8250: Add cpufreq hw node
  arm64: dts: qcom: sdm845: Add interconnects property for display
  arm64: dts: qcom: sm8250: Add EPSS L3 interconnect provider
  arm64: dts: qcom: sm8150: Add OSM L3 interconnect provider
  arm64: dts: qcom: sm8250: add interconnect nodes
  arm64: dts: qcom: sm8150: add interconnect nodes
  arm64: dts: qcom: sc7180: Increase the number of interconnect cells
  arm64: dts: qcom: sdm845: Increase the number of interconnect cells
  arm64: dts: qcom: Makefile: Sort lines
  arm64: dts: qcom: pm8916: Sort nodes
  arm64: dts: qcom: msm8916: Sort nodes
  arm64: dts: qcom: msm8916: Pad addresses
  arm64: dts: qcom: msm8916: Rename "x-smp2p" to "smp2p-x"
  arm64: dts: qcom: msm8916: Use more generic node names
  arm64: dts: qcom: msm8916: Add MSM8916-specific compatibles to SCM/MSS
  arm64: dts: qcom: msm8916: Minor style fixes
  arm64: dts: qcom: msm8916: Drop qcom,tcsr-mutex syscon
  arm64: dts: qcom: msm8916: Use IRQ defines, add IRQ types
  arm64: dts: qcom: msm8916: Fix MDP/DSI interrupts
  ...

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 99bf15c7 bac12f25

Documentation/devicetree/bindings/arm/qcom.yaml

+11 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ description: | 
        sdm630

        sdm660

        sdm845

        sm8250



  The 'board' element must be one of the following strings:
@@ -47,6 +48,8 @@ description: | 
        cp01-c1

        dragonboard

        hk01

        hk10-c1

        hk10-c2

        idp

        liquid

        mtp
@@ -148,6 +151,8 @@ properties: 
      - items:

          - enum:

              - qcom,ipq8074-hk01

              - qcom,ipq8074-hk10-c1

              - qcom,ipq8074-hk10-c2

          - const: qcom,ipq8074



      - items:
@@ -165,4 +170,10 @@ properties: 
              - qcom,ipq6018-cp01-c1

          - const: qcom,ipq6018



      - items:

          - enum:

              - qcom,qrb5165-rb5

              - qcom,sm8250-mtp

          - const: qcom,sm8250



...

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ maintainers: 
properties:

  compatible:

    enum:

      - qcom,ipq6018-apcs-apps-global

      - qcom,ipq8074-apcs-apps-global

      - qcom,msm8916-apcs-kpss-global

      - qcom,msm8994-apcs-kpss-global

arch/arm64/boot/dts/qcom/Makefile

+12 −4
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 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)	+= msm8916-mtp.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.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
@@ -18,7 +18,16 @@ 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)	+= qcs404-evb-1000.dtb

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

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

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-idp.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

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

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

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

dtb-$(CONFIG_ARCH_QCOM)	+= sdm630-sony-xperia-ganges-kirin.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm630-sony-xperia-nile-discovery.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm630-sony-xperia-nile-pioneer.dtb
@@ -30,8 +39,7 @@ 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)	+= sdm845-xiaomi-beryllium.dtb

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

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

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

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

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

+407 −493

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts

+3 −3
Original line number Diff line number Diff line
@@ -26,18 +26,18 @@ 
&blsp1_uart3 {

	pinctrl-0 = <&serial_3_pins>;

	pinctrl-names = "default";

	status = "ok";

	status = "okay";

};



&i2c_1 {

	pinctrl-0 = <&i2c_1_pins>;

	pinctrl-names = "default";

	status = "ok";

	status = "okay";

};



&spi_0 {

	cs-select = <0>;

	status = "ok";

	status = "okay";



	m25p80@0 {

		#address-cells = <1>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE