Merge "ARM: dts: msm: Enable USBC for sm6150" (c82e22a5) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sm6150-audio.dtsi

+1 −0

+0 −31

Original line number	Diff line number	Diff line
		@@ -868,37 +868,6 @@
		};
		};

		/* USB C analog configuration */
		wcd_usbc_analog_en1 {
		wcd_usbc_analog_en1_idle: wcd_usbc_ana_en1_idle {
		mux {
		pins = "gpio49";
		function = "gpio";
		};

		config {
		pins = "gpio49";
		drive-strength = <2>;
		bias-pull-down;
		output-low;
		};
		};

		wcd_usbc_analog_en1_active: wcd_usbc_ana_en1_active {
		mux {
		pins = "gpio49";
		function = "gpio";
		};

		config {
		pins = "gpio49";
		drive-strength = <2>;
		bias-disable;
		output-high;
		};
		};
		};

		wsa_swr_clk_pin {
		wsa_swr_clk_sleep: wsa_swr_clk_sleep {
		mux {

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include <dt-bindings/clock/qcom,camcc-sm6150.h>

		#include "sm6150-idp.dtsi"
		#include "sm6150-usbc-idp.dtsi"

		/ {
		model = "USBC Audio IDP";

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		#include "sm6150.dtsi"
		#include "sm6150-idp.dtsi"
		#include "sm6150-usbc-idp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. SM6150 PM6150 USBC Audio IDP";

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 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
		* 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.
		*/

		#include "sm6150-audio-overlay.dtsi"

		&sm6150_snd {
		qcom,msm-mbhc-usbc-audio-supported = <1>;
		};