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

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

Merge "ASoC: tlv320aic3x: Add reset inverted DT property"

parents 9d1dd8c8 243174d5

Documentation/devicetree/bindings/arm/msm/msm.txt

+1 −1
Original line number Diff line number Diff line
@@ -411,5 +411,5 @@ compatible = "qcom,sdxpoorwills-atp" 
compatible = "qcom,sdxpoorwills-mtp"

compatible = "qcom,sdxpoorwills-cdp"

compatible = "qcom,sdxpoorwills-ttp"

compatible = "qcom,sdxpoorwills-adp"

compatible = "qcom,sdxpoorwills-ccard"

compatible = "qcom,mdm9607-ttp"

Documentation/devicetree/bindings/sound/tlv320aic3x.txt

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Required properties: 


Optional properties:



- gpio-reset - gpio pin number used for codec reset

- gpio-reset - gpio pin number used for codec reset, default active low

- reset-inverted - set the reset gpio mode as active high

- ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality

				    - Not supported on tlv320aic3104

- ai3x-micbias-vg - MicBias Voltage required.

arch/arm/boot/dts/qcom/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ dtb-$(CONFIG_ARCH_SDXPOORWILLS) += sdxpoorwills-rumi.dtb \ 
	sdxpoorwills-v2-cdp.dtb \

	sdxpoorwills-v2-dualwifi-mtp.dtb \

	sdxpoorwills-v2-dualwifi-cdp.dtb \

	sdxpoorwills-adp.dtb \

	sdxpoorwills-pcie-ep-adp.dtb \

	sdxpoorwills-usb-ep-adp.dtb \

	sdxpoorwills-ccard.dtb \

	sdxpoorwills-ccard-pcie-ep.dtb \

	sdxpoorwills-ccard-usb-ep.dtb \

	sdxpoorwills-v2-pcie-ep-mtp-256.dtb \

	sdxpoorwills-v2-pcie-ep-mtp.dtb

arch/arm/boot/dts/qcom/pmxpoorwills.dtsi

+6 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-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
@@ -55,19 +55,21 @@ 
		pmxpoorwills_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0x900>;

			interrupts = <0x0 0xc1 0 IRQ_TYPE_NONE>,

			interrupts = <0x0 0xc0 0 IRQ_TYPE_NONE>,

					<0x0 0xc1 0 IRQ_TYPE_NONE>,

					<0x0 0xc2 0 IRQ_TYPE_NONE>,

					<0x0 0xc3 0 IRQ_TYPE_NONE>,

					<0x0 0xc4 0 IRQ_TYPE_NONE>,

					<0x0 0xc5 0 IRQ_TYPE_NONE>;

			interrupt-names = "pmxpoorwills_gpio2",

			interrupt-names = "pmxpoorwills_gpio1",

					  "pmxpoorwills_gpio2",

					  "pmxpoorwills_gpio3",

					  "pmxpoorwills_gpio4",

					  "pmxpoorwills_gpio5",

					  "pmxpoorwills_gpio6";

			gpio-controller;

			#gpio-cells = <2>;

			qcom,gpios-disallowed = <1 7 8 9>;

			qcom,gpios-disallowed = <7 8 9>;

		};



		pmxpoorwills_rtc: qcom,pmxpoorwills_rtc {

arch/arm/boot/dts/qcom/sdxpoorwills-usb-ep-adp.dts→arch/arm/boot/dts/qcom/sdxpoorwills-ccard-pcie-ep.dts

+29 −5
Original line number Diff line number Diff line
@@ -12,15 +12,39 @@ 


/dts-v1/;



#include "sdxpoorwills-adp.dtsi"

#include "sdxpoorwills-ccard.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDXPOORWILLS USB-EP ADP";

	compatible = "qcom,sdxpoorwills-adp",

		"qcom,sdxpoorwills", "qcom,adp";

	model = "Qualcomm Technologies, Inc. SA415M CCARD PCIE-EP";

	compatible = "qcom,sdxpoorwills-ccard",

		"qcom,sdxpoorwills", "qcom,ccard";

	qcom,board-id = <25 1>, <25 0x101>;

};



&blsp1_uart2b_hs {

&usb {

	/delete-property/ iommus;

};



&pcie_ep {

	status = "okay";

};



&ipa_hw {

	qcom,use-ipa-in-mhi-mode;

};



&cnss_pcie {

	status = "disabled";

};



&pcie0 {

	status = "disabled";

};



&mhi_device {

	status = "okay";

};



&restart_pshold {

	qcom,force-warm-reboot;

};