Merge "ARM: dts: msm: Configure irq flag for blsp_uart2 in 8996 gvm" (b2798d39) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-blsp.dtsi

+3 −1

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/
		#include <dt-bindings/interrupt-controller/irq.h>

		/ {
		aliases {
		spi9 = &spi_9;
		@@ -94,7 +96,7 @@
		<0x7544000 0x2b000>;
		reg-names = "core_mem", "bam_mem";
		interrupt-names = "core_irq", "bam_irq", "wakeup_irq";
		interrupts = <0 108 0>, <0 238 0>, <0 810 0>;
		interrupts = <0 108 0>, <0 238 0>, <0 810 IRQ_TYPE_LEVEL_HIGH>;
		#address-cells = <0>;

		qcom,inject-rx-on-wakeup;

+6 −2

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		* MSM 7k High speed uart driver
		*
		* Copyright (c) 2008 Google Inc.
		* Copyright (c) 2007-2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2007-2018, The Linux Foundation. All rights reserved.
		* Modified: Nick Pelly <npelly@google.com>
		*
		* All source code in this file is licensed under the following license
		@@ -2656,6 +2656,7 @@ static int msm_hs_startup(struct uart_port *uport)
		int ret;
		int rfr_level;
		unsigned long flags;
		u32 irq_type;
		unsigned int data;
		struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport);
		struct circ_buf *tx_buf = &uport->state->xmit;
		@@ -2676,8 +2677,11 @@ static int msm_hs_startup(struct uart_port *uport)
		msm_hs_resource_vote(msm_uport);

		if (is_use_low_power_wakeup(msm_uport)) {
		irq_type = irq_get_trigger_type(msm_uport->wakeup.irq);
		if (irq_type == IRQ_TYPE_NONE)
		irq_type = IRQ_TYPE_EDGE_FALLING;
		ret = request_irq(msm_uport->wakeup.irq, msm_hs_wakeup_isr,
		IRQF_TRIGGER_FALLING \| IRQF_ONESHOT,
		irq_type \| IRQF_ONESHOT,
		"msm_hs_wakeup", msm_uport);
		if (unlikely(ret)) {
		MSM_HS_ERR("%s():Err getting uart wakeup_irq %d\n",