Commit a8f6ba28 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-for-5.13-2' of... 

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

More Qualcomm ARM64 DT updates for 5.13

This adds RPMh regulators, coresight, AOSS qmp, ipcc, llcc for the
SC7280. It adds interconnect, PRNG and thermal pieces to SM8350. It
specifies the now required clocks for the SDM845 gcc, corrects the
firmware-name for adsp and cdsp on the db845c and defines DSI and panel
bits for Xiaomi Pocophone F1.

SM8150 gains iommu settings and the remaining I2C controllers and SM8250
gains Venus and the QMP PHY is updated to include the DP portion.

It adds the MSM8998 based OnePlus 5/5T device and enables sound support
on the Trogdor device family.

Lastly it adds the GIC hypervisor registers & interrupt for when Linux
is booted in EL2 on MSM8916.

* tag 'qcom-arm64-for-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (25 commits)
  arm64: dts: qcom: update usb qmp phy clock-cells property
  arm64: dts: qcom: msm8916: Add GICv2 hypervisor registers/interrupt
  arm64: dts: sdm845-db845c: make firmware filenames follow linux-firmware
  arm64: dts: qcom: sdm845-xiaomi-beryllium: Add DSI and panel bits
  arm64: dts: qcom: sc7280: Add Coresight support
  arm64: dts: qcom: sc7280: Add AOSS QMP node
  arm64: dts: qcom: sc7280: Add IPCC for SC7280 SoC
  arm64: dts: qcom: sc7280: Add device tree node for LLCC
  arm64: dts: qcom: Add support for OnePlus 5/5T
  arm64: dts: qcom: msm8998: Disable MSS remoteproc by default
  arm64: dts: qcom: Move rmtfs memory region
  arm64: dts: qcom: Add sound node for sc7180-trogdor-coachz
  arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for I2S driver
  arm64: dts: qcom: use dp_phy to provide clocks to dispcc
  arm64: dts: qcom: sm8250: switch usb1 qmp phy to USB3+DP mode
  arm64: dts: qcom: sm8250: Add venus DT node
  arm64: dts: qcom: sm8250: Add videocc DT node
  arm64: dts: qcom: sm8350: Add interconnects
  arm64: dts: qcom: sm8350: Add support for PRNG EE
  arm64: dts: qcom: sc7280: Add RPMh regulators for sc7280-idp
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e8adf27e 7178d4cc

arch/arm64/boot/dts/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 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)	+= msm8998-oneplus-cheeseburger.dtb

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

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

+3 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,9 @@ 
			compatible = "qcom,msm-qgic2";

			interrupt-controller;

			#interrupt-cells = <3>;

			reg = <0x0b000000 0x1000>, <0x0b002000 0x1000>;

			reg = <0x0b000000 0x1000>, <0x0b002000 0x2000>,

			      <0x0b001000 0x1000>, <0x0b004000 0x2000>;

			interrupts = <GIC_PPI 0 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

		};



		apcs: mailbox@b011000 {

arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -281,6 +281,10 @@ 
	};

};



&remoteproc_mss {

	status = "okay";

};



&tlmm {

	gpio-reserved-ranges = <0 4>, <81 4>;

arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -328,6 +328,10 @@ 
	status = "okay";

};



&remoteproc_mss {

	status = "okay";

};



&remoteproc_slpi {

	status = "okay";

};

arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts

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

/*

 * OnePlus 5 (cheeseburger) device tree

 *

 * Copyright (c) 2021, Jami Kettunen <jamipkettunen@gmail.com>

 */



#include <dt-bindings/leds/common.h>

#include "msm8998-oneplus-common.dtsi"



/ {

	model = "OnePlus 5";

	compatible = "oneplus,cheeseburger", "qcom,msm8998";

	/* Required for bootloader to select correct board */

	qcom,board-id = <8 0 16859 23>;



	/* Capacitive keypad button backlight */

	leds {

		compatible = "gpio-leds";



		pinctrl-names = "default";

		pinctrl-0 = <&button_backlight_default>;



		button-backlight {

			gpios = <&pmi8998_gpio 5 GPIO_ACTIVE_HIGH>;

			color = <LED_COLOR_ID_WHITE>;

			function = LED_FUNCTION_KBD_BACKLIGHT;

			default-state = "off";

		};

	};

};



&pmi8998_gpio {

	button_backlight_default: button-backlight-default {

		pinconf {

			pins = "gpio5";

			function = "normal";

			bias-pull-down;

			qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;

		};

	};

};