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

Commit 76f9caf0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add sdxprairie-bluetooth.dtsi for SDXPRAIRIE"

parents 22559bda 8027a7bf
Loading
Loading
Loading
Loading
+39 −0
Original line number Diff line number Diff line
/* Copyright (c) 2019, 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
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

&pmxprairie_gpios {
	bt_en {
		bt_en_default: bt_en_default {
			pins = "gpio6";
			function = "normal";
			output-low;
			bias-pull-down;
			qcom,drive-strength = <2>;
			power-source = <1>;
		};
	};
};

&soc {
	bluetooth: bt_qca6390 {
		compatible = "qca,qca6390";
		pinctrl-names = "default";
		pinctrl-0 = <&bt_en_default>;
		qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>;
		qca,bt-vdd-core-supply = <&pmxprairie_s3>; /* VDD_PMU_AON_I */
		qca,bt-vdd-core-voltage-level = <950000 950000>;
	};
};

&blsp1_uart2b_hs {
	status = "okay";
};
+1 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@

#include "sdxprairie.dtsi"
#include "sdxprairie-cdp-256.dtsi"
#include "sdxprairie-bluetooth.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDXPRAIRIE CDP(256MB)";
@@ -26,6 +27,3 @@
	status = "ok";
};
&blsp1_uart2b_hs {
	status = "okay";
};
+0 −10
Original line number Diff line number Diff line
@@ -174,13 +174,3 @@
	};
};
&soc {
	bluetooth: bt_qca6390 {
		compatible = "qca,qca6390";
		pinctrl-names = "default";
		pinctrl-0 = <&bt_en_default>;
		qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>;
		qca,bt-vdd-core-supply = <&pmxprairie_s3>; /* VDD_PMU_AON_I */
		qca,bt-vdd-core-voltage-level = <950000 950000>;
	};
};
+1 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@
#include "sdxprairie-cdp.dtsi"
#include "sdxprairie-display.dtsi"
#include "qpic-panel-ili-hvga.dtsi"
#include "sdxprairie-bluetooth.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDXPRAIRIE CDP";
@@ -27,7 +28,3 @@
&qnand_1 {
	status = "ok";
};

&blsp1_uart2b_hs {
	status = "okay";
};
+0 −11
Original line number Diff line number Diff line
@@ -174,17 +174,6 @@
	};
};

&soc {
	bluetooth: bt_qca6390 {
		compatible = "qca,qca6390";
		pinctrl-names = "default";
		pinctrl-0 = <&bt_en_default>;
		qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>;
		qca,bt-vdd-core-supply = <&pmxprairie_s3>; /* VDD_PMU_AON_I */
		qca,bt-vdd-core-voltage-level = <950000 950000>;
	};
};

&pm8150b_charger {
	qcom,batteryless-platform;
	io-channels = <&pm8150b_vadc ADC_USB_IN_V_16>,
Loading