Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fd05cce authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable QCA9379 bluetooth device for apq8009"

parents 8b23b7e4 06cf5aff

arch/arm/boot/dts/qcom/apq8009-mtp-wcd9326-excelpoint-refboard.dts

+83 −0
Original line number Diff line number Diff line
@@ -30,6 +30,34 @@ 
	status = "disabled";

};



&msm_gpio {

	hsuart_active: default {

		mux {

			pins = "gpio20", "gpio21", "gpio111", "gpio112";

			function = "blsp_uart2";

		};



		config {

			pins = "gpio20", "gpio21", "gpio111", "gpio112";

			drive-strength = <16>;

			bias-disable;

		};

	};



	hsuart_sleep: sleep {

		mux {

			pins = "gpio20", "gpio21", "gpio111", "gpio112";

			function = "blsp_uart2";

		};



		config {

			pins = "gpio20", "gpio21", "gpio111", "gpio112";

			drive-strength = <2>;

			bias-disable;

		};

	};

};



&soc {

	sound-9335 {

		qcom,model = "apq8009-tashalite-snd-card-tdm";
@@ -83,6 +111,45 @@ 
		gpio = <&pm8916_gpios 4 0>;

		vin-supply = <&pm8916_s4>;

	};



	blsp1_uart2_hs: uart@78b0000 {

		compatible = "qcom,msm-hsuart-v14";

		reg = <0x78b0000 0x200>,

			<0x7884000 0x1f000>;

		reg-names = "core_mem", "bam_mem";

		interrupt-names = "core_irq", "bam_irq", "wakeup_irq";

		#address-cells = <0>;

		interrupt-parent = <&blsp1_uart2_hs>;

		interrupts = <0 1 2>;

		#interrupt-cells = <1>;

		interrupt-map-mask = <0xffffffff>;

		interrupt-map = <0 &intc 0 108 0

				1 &intc 0 238 0

				2 &msm_gpio 21 0>;

		qcom,inject-rx-on-wakeup;

		qcom,rx-char-to-inject = <0xfd>;

		qcom,master-id = <86>;

		clock-names = "core_clk", "iface_clk";

		clocks = <&clock_gcc clk_gcc_blsp1_uart2_apps_clk>,

				<&clock_gcc clk_gcc_blsp1_ahb_clk>;

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

		pinctrl-0 = <&hsuart_sleep>;

		pinctrl-1 = <&hsuart_active>;

		qcom,bam-tx-ep-pipe-index = <2>;

		qcom,bam-rx-ep-pipe-index = <3>;

		qcom,msm-bus,name = "blsp1_uart2_hs";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

				<86 512 0 0>,

				<86 512 500 800>;

		status = "ok";

	};



	bluetooth: bt_qca9379 {

		compatible = "qca,qca9379";

		qca,bt-reset-gpio = <&msm_gpio 47 0>; /* BT_EN */

	};

};



&i2c_4 {
@@ -150,4 +217,20 @@ 
	status = "disabled";

};



&i2c_1 {

	status = "disabled";

};



&i2c_2 {

	status = "disabled";

};



&i2c_5 {

	status = "disabled";

};



&spi_0 {

	status = "disabled";

};



/delete-node/ &cont_splash_mem;

arch/arm/boot/dts/qcom/apq8009-mtp-wcd9326-refboard.dts

+84 −1
Original line number Diff line number Diff line 
/*

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -30,6 +30,34 @@ 
	status = "disabled";

};



&msm_gpio {

	hsuart_active: default {

		mux {

			pins = "gpio20", "gpio21", "gpio111", "gpio112";

			function = "blsp_uart2";

		};



		config {

			pins = "gpio20", "gpio21", "gpio111", "gpio112";

			drive-strength = <16>;

			bias-disable;

		};

	};



	hsuart_sleep: sleep {

		mux {

			pins = "gpio20", "gpio21", "gpio111", "gpio112";

			function = "blsp_uart2";

		};



		config {

			pins = "gpio20", "gpio21", "gpio111", "gpio112";

			drive-strength = <2>;

			bias-disable;

		};

	};

};



&soc {

	sound-9335 {

		qcom,audio-routing =
@@ -61,6 +89,45 @@ 
			status = "disabled";

		};

	};



	blsp1_uart2_hs: uart@78b0000 {

		compatible = "qcom,msm-hsuart-v14";

		reg = <0x78b0000 0x200>,

			<0x7884000 0x1f000>;

		reg-names = "core_mem", "bam_mem";

		interrupt-names = "core_irq", "bam_irq", "wakeup_irq";

		#address-cells = <0>;

		interrupt-parent = <&blsp1_uart2_hs>;

		interrupts = <0 1 2>;

		#interrupt-cells = <1>;

		interrupt-map-mask = <0xffffffff>;

		interrupt-map = <0 &intc 0 108 0

				1 &intc 0 238 0

				2 &msm_gpio 21 0>;

		qcom,inject-rx-on-wakeup;

		qcom,rx-char-to-inject = <0xfd>;

		qcom,master-id = <86>;

		clock-names = "core_clk", "iface_clk";

		clocks = <&clock_gcc clk_gcc_blsp1_uart2_apps_clk>,

				<&clock_gcc clk_gcc_blsp1_ahb_clk>;

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

		pinctrl-0 = <&hsuart_sleep>;

		pinctrl-1 = <&hsuart_active>;

		qcom,bam-tx-ep-pipe-index = <2>;

		qcom,bam-rx-ep-pipe-index = <3>;

		qcom,msm-bus,name = "blsp1_uart2_hs";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

				<86 512 0 0>,

				<86 512 500 800>;

		status = "ok";

	};



	bluetooth: bt_qca9379 {

		compatible = "qca,qca9379";

		qca,bt-reset-gpio = <&msm_gpio 47 0>; /* BT_EN */

	};

};



&i2c_4 {
@@ -117,4 +184,20 @@ 
	status = "disabled";

};



&i2c_1 {

	status = "disabled";

};



&i2c_2 {

	status = "disabled";

};



&i2c_5 {

	status = "disabled";

};



&spi_0 {

	status = "disabled";

};



/delete-node/ &cont_splash_mem;