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

Merge tag 'qcom-dts-for-5.13' of... 

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

Qualcomm dts updates for v5.13

This adds Bluetooth support on the Samsung Galaxy S5, corrects the mount
matrix for the IMU on Nexus 5 and corrects the fuel gauge irq trigger
for the two devices.

* tag 'qcom-dts-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: msm8974-klte: Add bluetooth support
  ARM: dts: qcom: msm8974: add blsp2_uart8
  ARM: dts: qcom: msm8974-samsung-klte: correct fuel gauge interrupt trigger level
  ARM: dts: qcom: msm8974-lge-nexus5: correct fuel gauge interrupt trigger level
  ARM: dts: qcom: msm8974-hammerhead: add mount matrix for IMU

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents be0f990a 885aae68

arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts

+5 −1
Original line number Diff line number Diff line
@@ -529,6 +529,10 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&mpu6515_pin>;



			mount-matrix = "0", "-1", "0",

				       "-1", "0", "0",

				       "0", "0", "1";



			i2c-gate {

				#address-cells = <1>;

				#size-cells = <0>;
@@ -575,7 +579,7 @@ 
			maxim,rcomp = /bits/ 8 <0x4d>;



			interrupt-parent = <&msmgpio>;

			interrupts = <9 IRQ_TYPE_EDGE_FALLING>;

			interrupts = <9 IRQ_TYPE_LEVEL_LOW>;



			pinctrl-names = "default";

			pinctrl-0 = <&fuelgauge_pin>;

arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts

+51 −1
Original line number Diff line number Diff line
@@ -322,6 +322,27 @@ 
		status = "okay";

	};



	/* blsp2_uart8 */

	serial@f995e000 {

		status = "okay";



		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&blsp2_uart8_pins_active>;

		pinctrl-1 = <&blsp2_uart8_pins_sleep>;



		bluetooth {

			compatible = "brcm,bcm43540-bt";

			max-speed = <3000000>;

			pinctrl-names = "default";

			pinctrl-0 = <&bt_pins>;

			device-wakeup-gpios = <&msmgpio 91 GPIO_ACTIVE_HIGH>;

			shutdown-gpios = <&gpio_expander 9 GPIO_ACTIVE_HIGH>;

			interrupt-parent = <&msmgpio>;

			interrupts = <75 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "host-wakeup";

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";
@@ -356,6 +377,35 @@ 
	};



	pinctrl@fd510000 {

		blsp2_uart8_pins_active: blsp2-uart8-pins-active {

			pins = "gpio45", "gpio46", "gpio47", "gpio48";

			function = "blsp_uart8";

			drive-strength = <8>;

			bias-disable;

		};



		blsp2_uart8_pins_sleep: blsp2-uart8-pins-sleep {

			pins = "gpio45", "gpio46", "gpio47", "gpio48";

			function = "gpio";

			drive-strength = <2>;

			bias-pull-down;

		};



		bt_pins: bt-pins {

			hostwake {

				pins = "gpio75";

				function = "gpio";

				drive-strength = <16>;

				input-enable;

			};



			devwake {

				pins = "gpio91";

				function = "gpio";

				drive-strength = <2>;

			};

		};



		sdhc1_pin_a: sdhc1-pin-active {

			clk {

				pins = "sdc1_clk";
@@ -717,7 +767,7 @@ 
			maxim,rcomp = /bits/ 8 <0x56>;



			interrupt-parent = <&pma8084_gpios>;

			interrupts = <21 IRQ_TYPE_EDGE_FALLING>;

			interrupts = <21 IRQ_TYPE_LEVEL_LOW>;



			pinctrl-names = "default";

			pinctrl-0 = <&fuelgauge_pin>;

arch/arm/boot/dts/qcom-msm8974.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -715,6 +715,15 @@ 
			status = "disabled";

		};



		blsp2_uart8: serial@f995e000 {

			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";

			reg = <0xf995e000 0x1000>;

			interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&gcc GCC_BLSP2_UART2_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;

			clock-names = "core", "iface";

			status = "disabled";

		};



		blsp2_uart10: serial@f9960000 {

			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";

			reg = <0xf9960000 0x1000>;