Unverified Commit d0dc706a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm ARM64 fixes for v5.14

This fixes three regressions across Angler and Bullhead, introduced by
advancements in the platform definition. It then corrects the powerdown
GPIOs for the speaker amps on C630 and lastly fixes a typo that assigned
CPU7 in SC7280 to the wrong CPUfreq domain.

* tag 'qcom-arm64-fixes-for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: sdm845-oneplus: fix reserved-mem
  arm64: dts: qcom: msm8994-angler: Disable cont_splash_mem
  arm64: dts: qcom: sc7280: Fixup cpufreq domain info for cpu7
  arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping
  arm64: dts: qcom: msm8992-bullhead: Remove PSCI
  arm64: dts: qcom: c630: fix correct powerdown pin for WSA881x

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents df97e5f3 d77c95bf

arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts

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

/* Copyright (c) 2015, LGE Inc. All rights reserved.

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

 * Copyright (c) 2021, Petr Vorel <petr.vorel@gmail.com>

 */



/dts-v1/;
@@ -9,6 +10,9 @@ 
#include "pm8994.dtsi"

#include "pmi8994.dtsi"



/* cont_splash_mem has different memory mapping */

/delete-node/ &cont_splash_mem;



/ {

	model = "LG Nexus 5X";

	compatible = "lg,bullhead", "qcom,msm8992";
@@ -17,6 +21,9 @@ / { 
	qcom,board-id = <0xb64 0>;

	qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>;



	/* Bullhead firmware doesn't support PSCI */

	/delete-node/ psci;



	aliases {

		serial0 = &blsp1_uart2;

	};
@@ -38,6 +45,11 @@ ramoops@1ff00000 { 
			ftrace-size = <0x10000>;

			pmsg-size = <0x20000>;

		};



		cont_splash_mem: memory@3400000 {

			reg = <0 0x03400000 0 0x1200000>;

			no-map;

		};

	};

};

arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts

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

/* Copyright (c) 2015, Huawei Inc. All rights reserved.

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

 * Copyright (c) 2021, Petr Vorel <petr.vorel@gmail.com>

 */



/dts-v1/;



#include "msm8994.dtsi"



/* Angler's firmware does not report where the memory is allocated */

/delete-node/ &cont_splash_mem;



/ {

	model = "Huawei Nexus 6P";

	compatible = "huawei,angler", "qcom,msm8994";

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

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ CPU7: cpu@700 { 
					   &BIG_CPU_SLEEP_1

					   &CLUSTER_SLEEP_0>;

			next-level-cache = <&L2_700>;

			qcom,freq-domain = <&cpufreq_hw 1>;

			qcom,freq-domain = <&cpufreq_hw 2>;

			#cooling-cells = <2>;

			L2_700: l2-cache {

				compatible = "cache";

arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ rmtfs_mem: memory@f5b01000 { 
		};

		rmtfs_upper_guard: memory@f5d01000 {

			no-map;

			reg = <0 0xf5d01000 0 0x2000>;

			reg = <0 0xf5d01000 0 0x1000>;

		};



		/*
@@ -78,7 +78,7 @@ rmtfs_upper_guard: memory@f5d01000 { 
		 */

		removed_region: memory@88f00000 {

			no-map;

			reg = <0 0x88f00000 0 0x200000>;

			reg = <0 0x88f00000 0 0x1c00000>;

		};



		ramoops: ramoops@ac300000 {

arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts

+2 −2
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ swm: swm@c85 { 
		left_spkr: wsa8810-left{

			compatible = "sdw10217211000";

			reg = <0 3>;

			powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_HIGH>;

			powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>;

			#thermal-sensor-cells = <0>;

			sound-name-prefix = "SpkrLeft";

			#sound-dai-cells = <0>;
@@ -708,7 +708,7 @@ left_spkr: wsa8810-left{ 


		right_spkr: wsa8810-right{

			compatible = "sdw10217211000";

			powerdown-gpios = <&wcdgpio 3 GPIO_ACTIVE_HIGH>;

			powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_HIGH>;

			reg = <0 4>;

			#thermal-sensor-cells = <0>;

			sound-name-prefix = "SpkrRight";