Commit 1d16a917 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Qualcomm ARM64 Updates for v5.5

* Add thermal IRQ support on MSM8916, SDM845, MSM8996, and QCS404
* Fix thermal HW ids for cpus on MSM8916
* Add blsp1 UART3 and  blsp1 BAM on MSM8998
* Add volume buttons and WCNSS for Wifi and BT on MSM8916 LongCheer-l8150
* Fixup load on l21 for SD on apq8096-db820c
* Enable LVS1/2, APSS watchdog, and select UFS reset gpio for SDM845
* Disable coresight by default on MSM8998
* Enable bluetooth and remove retention idle state on MSM8998-clamshell
* Enable adsp, cdsp, and mpss on C630
* Enable bluetooth on MSM8998-mtp
* Delete zap shader on SDM845-cheza
* Add tactile buttons and hall sensor on MSM8916-Samsung-A2015
* Add Interconnect nodes, watchdog, and sleep clk on QCS404
* Override Iris compatible on MSM8916-Samsung-A5U
* Enable WCNSS Wifi and bluetooth on MSM8916-Samsung-A2015
* Fixup cooling states for the aoss warming devices

* tag 'qcom-arm64-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (26 commits)
  arm64: dts: qcom: db845c: Enable LVS 1 and 2
  arm64: dts: qcom: msm8998: Disable coresight by default
  arm64: dts: qcom: msm8998-clamshell: Remove retention idle state
  arm64: dts: qcom: sdm845-cheza: delete zap-shader
  arm64: dts: msm8916: thermal: Fixup HW ids for cpu sensors
  arm64: dts: sdm845: thermal: Add interrupt support
  arm64: dts: msm8996: thermal: Add interrupt support
  arm64: dts: msm8998: thermal: Add interrupt support
  arm64: dts: qcs404: thermal: Add interrupt support
  arm64: dts: qcom: sdm845: Add APSS watchdog node
  arm64: dts: qcom: c630: Enable adsp, cdsp and mpss
  arm64: dts: qcom: msm8998-clamshell: Enable bluetooth
  arm64: dts: qcom: msm8998-mtp: Enable bluetooth
  arm64: dts: qcom: msm8998: Add blsp1_uart3
  arm64: dts: qcom: msm8998: Add blsp1 BAM
  arm64: dts: msm8916-longcheer-l8150: Add Volume buttons
  arm64: dts: msm8916-longcheer-l8150: Enable WCNSS for WiFi and BT
  soc: qcom: Invert the cooling states for the aoss warming devices
  arm64: dts: apq8096-db820c: Increase load on l21 for SDCARD
  arm64: dts: msm8916-samsung-a2015: add tactile buttons and hall sensor
  ...

Link: https://lore.kernel.org/r/1573068840-13098-2-git-send-email-agross@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 17795bf9 915603b1

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

+2 −0
Original line number Diff line number Diff line
@@ -623,6 +623,8 @@ 
				l21 {

					regulator-min-microvolt = <2950000>;

					regulator-max-microvolt = <2950000>;

					regulator-allow-set-load;

					regulator-system-load = <200000>;

				};

				l22 {

					regulator-min-microvolt = <3300000>;

arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts

+55 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "msm8916.dtsi"

#include "pm8916.dtsi"

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

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



/ {

	model = "Longcheer L8150";
@@ -18,6 +19,16 @@ 
		stdout-path = "serial0";

	};



	reserved-memory {

		// wcnss.mdt is not relocatable, so it must be loaded at 0x8b600000

		/delete-node/ wcnss@89300000;



		wcnss_mem: wcnss@8b600000 {

			reg = <0x0 0x8b600000 0x0 0x600000>;

			no-map;

		};

	};



	soc {

		sdhci@7824000 {

			status = "okay";
@@ -68,6 +79,10 @@ 
			};

		};



		wcnss@a21b000 {

			status = "okay";

		};



		/*

		 * Attempting to enable these devices causes a "synchronous

		 * external abort". Suspected cause is that the debug power
@@ -99,9 +114,36 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&usb_vbus_default>;

	};



	gpio-keys {

		compatible = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&gpio_keys_default>;



		label = "GPIO Buttons";



		volume-up {

			label = "Volume Up";

			gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

		};

	};

};



&msmgpio {

	gpio_keys_default: gpio_keys_default {

		pinmux {

			function = "gpio";

			pins = "gpio107";

		};

		pinconf {

			pins = "gpio107";

			drive-strength = <2>;

			bias-pull-up;

		};

	};



	usb_vbus_default: usb-vbus-default {

		pinmux {

			function = "gpio";
@@ -114,6 +156,19 @@ 
	};

};



&spmi_bus {

	pm8916@0 {

		pon@800 {

			volume-down {

				compatible = "qcom,pm8941-resin";

				interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;

				bias-pull-up;

				linux,code = <KEY_VOLUMEDOWN>;

			};

		};

	};

};



&smd_rpm_regulators {

	vdd_l1_l2_l3-supply = <&pm8916_s3>;

	vdd_l4_l5_l6-supply = <&pm8916_s4>;

arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi

+80 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include "msm8916.dtsi"

#include "pm8916.dtsi"

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

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

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



/ {
@@ -63,6 +64,10 @@ 
			};

		};



		wcnss@a21b000 {

			status = "okay";

		};



		/*

		 * Attempting to enable these devices causes a "synchronous

		 * external abort". Suspected cause is that the debug power
@@ -87,6 +92,44 @@ 
		etm@85f000 { status = "disabled"; };

	};



	gpio-keys {

		compatible = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&gpio_keys_default>;



		label = "GPIO Buttons";



		volume-up {

			label = "Volume Up";

			gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

		};



		home {

			label = "Home";

			gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_HOMEPAGE>;

		};

	};



	gpio-hall-sensor {

		compatible = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&gpio_hall_sensor_default>;



		label = "GPIO Hall Effect Sensor";



		hall-sensor {

			label = "Hall Effect Sensor";

			gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>;

			linux,input-type = <EV_SW>;

			linux,code = <SW_LID>;

			linux,can-disable;

		};

	};



	i2c-muic {

		compatible = "i2c-gpio";

		sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -109,6 +152,30 @@ 
};



&msmgpio {

	gpio_keys_default: gpio_keys_default {

		pinmux {

			function = "gpio";

			pins = "gpio107", "gpio109";

		};

		pinconf {

			pins = "gpio107", "gpio109";

			drive-strength = <2>;

			bias-pull-up;

		};

	};



	gpio_hall_sensor_default: gpio_hall_sensor_default {

		pinmux {

			function = "gpio";

			pins = "gpio52";

		};

		pinconf {

			pins = "gpio52";

			drive-strength = <2>;

			bias-disable;

		};

	};



	muic_int_default: muic_int_default {

		pinmux {

			function = "gpio";
@@ -234,3 +301,16 @@ 
		regulator-max-microvolt = <2700000>;

	};

};



&spmi_bus {

	pm8916@0 {

		pon@800 {

			volume-down {

				compatible = "qcom,pm8941-resin";

				interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;

				bias-pull-up;

				linux,code = <KEY_VOLUMEDOWN>;

			};

		};

	};

};

arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts

+6 −0
Original line number Diff line number Diff line
@@ -8,3 +8,9 @@ 
	model = "Samsung Galaxy A5U (EUR)";

	compatible = "samsung,a5u-eur", "qcom,msm8916";

};



&pronto {

	iris {

		compatible = "qcom,wcn3680";

	};

};

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

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 
			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 4>;

			thermal-sensors = <&tsens 5>;



			trips {

				cpu0_1_alert0: trip-point@0 {
@@ -209,7 +209,7 @@ 
			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 3>;

			thermal-sensors = <&tsens 4>;



			trips {

				cpu2_3_alert0: trip-point@0 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE