Commit 56effbdd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm ARM64 DT updates for v5.7

This brings initial support for the SM8250 and IPQ6018 platforms.

SDM845 gets audio, PCIe and IP-accelerator support, and the interconnect
providers are refactored. The Lenovo Yoga C630 has audio enabled and the
DB845c has PCIe, analog audio and low-speed interfaces enabled. The
SDM845 MTP has its display enabled and firmware location updated to
match linux-firmware.

SC7180 gains CPU topology and power properties. Interconnect providers,
eMMC, SD-card, multimedia clocks, display, Bluetooth, Venus are added.
Critical trip points are added as well as various fixes.

For MSM8916 FastRPC support is added, ETM power management and reserved
memory for Samsung A2015 are corrected.

MSM8996 switches to generic QMP phy driver for its UFS support. MSM8998
temporarily disables part of Coresight to boot without
clk_ignore_unused.  CEQ for eMMC on QCS404 is enabled.

Fixes throughout the platforms to fix binding compliance, correct
compatibles for SDHCI nodes and add gpio-ranges.

* tag 'qcom-arm64-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (56 commits)
  arm64: dts: qcom: sdm845-mtp: Relocate remoteproc firmware
  arm64: dts: sdm845: add IPA information
  arm64: dts: qcom: db845c: add analog audio support
  arm64: dts: qcom: sdm845: add pinctrl nodes for quat i2s
  arm64: dts: qcom: c630: Enable audio support
  arm64: dts: qcom: sdm845: add apr nodes
  arm64: dts: qcom: sdm845: add slimbus nodes
  arm64: dts: qcom: sc7180: Update reg names for SDHC
  arm64: dts: qcom: qcs404: Enable CQE support for eMMC
  arm64: dts: msm8916: Add fastrpc node
  arm64: dts: qcom: sm8250: Add sm8250 dts file
  arm64: dts: qcom: msm8998-mtp: Disable funnel 4 and 5
  arm64: dts: qcom: db845c: add Low speed expansion i2c and spi nodes
  arm64: dts: qcom: apq8016-sbc: Remove wrong regulator supply
  arm64: dts: qcom: sc7180: Added critical trip point Thermal-zones node
  arm64: dts: qcom: msm8998: Fix cpu compatible
  arm64: dts: qcom: sc7180: Add OSM L3 interconnect provider
  arm64: dts: qcom: sdm845: Add OSM L3 interconnect provider
  arm64: dts: sc7180: Add interconnect provider DT nodes
  arm64: dts: qcom: msm8996: Use generic QMP driver for UFS
  ...

Link: https://lore.kernel.org/r/20200318043823.GA470201@yoga


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7c764238 dfaf1601

Documentation/devicetree/bindings/arm/qcom.yaml

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ description: | 
        apq8074

        apq8084

        apq8096

        ipq6018

        ipq8074

        mdm9615

        msm8916
@@ -41,6 +42,7 @@ description: | 
  The 'board' element must be one of the following strings:



        cdp

        cp01-c1

        dragonboard

        hk01

        idp
@@ -150,4 +152,10 @@ properties: 
          - enum:

              - qcom,sc7180-idp

          - const: qcom,sc7180



      - items:

          - enum:

              - qcom,ipq6018-cp01-c1

          - const: qcom,ipq6018



...

arch/arm64/boot/dts/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
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)	+= 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
@@ -22,5 +23,6 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-mtp.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

+0 −1
Original line number Diff line number Diff line
@@ -562,7 +562,6 @@ 


&smd_rpm_regulators {

	vdd_l1_l2_l3-supply = <&pm8916_s3>;

	vdd_l5-supply = <&pm8916_s3>;

	vdd_l4_l5_l6-supply = <&pm8916_s4>;

	vdd_l7-supply = <&pm8916_s4>;

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

+0 −6
Original line number Diff line number Diff line
@@ -999,13 +999,7 @@ 


	vdda-phy-supply = <&vreg_l28a_0p925>;

	vdda-pll-supply = <&vreg_l12a_1p8>;



	vdda-phy-max-microamp = <18380>;

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



	vddp-ref-clk-supply = <&vreg_l25a_1p2>;

	vddp-ref-clk-max-microamp = <100>;

	vddp-ref-clk-always-on;

};



&ufshc {

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

0 → 100644
+64 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)

/*

 * IPQ6018 CP01 board device tree source

 *

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 */



/dts-v1/;



#include "ipq6018.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. IPQ6018/AP-CP01-C1";

	compatible = "qcom,ipq6018-cp01", "qcom,ipq6018";



	aliases {

		serial0 = &blsp1_uart3;

	};



	chosen {

		stdout-path = "serial0:115200n8";

		bootargs-append = " swiotlb=1";

	};

};



&blsp1_uart3 {

	pinctrl-0 = <&serial_3_pins>;

	pinctrl-names = "default";

	status = "ok";

};



&i2c_1 {

	pinctrl-0 = <&i2c_1_pins>;

	pinctrl-names = "default";

	status = "ok";

};



&spi_0 {

	cs-select = <0>;

	status = "ok";



	m25p80@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0>;

		compatible = "n25q128a11";

		spi-max-frequency = <50000000>;

	};

};



&tlmm {

	i2c_1_pins: i2c-1-pins {

		pins = "gpio42", "gpio43";

		function = "blsp2_i2c";

		drive-strength = <8>;

	};



	spi_0_pins: spi-0-pins {

		pins = "gpio38", "gpio39", "gpio40", "gpio41";

		function = "blsp0_spi";

		drive-strength = <8>;

		bias-pull-down;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE