[PATCH 1/1] tty: serial: qcom_geni_serial: Configure UART_IO_MACRO_CTRL register
From: Roja Rani Yarubandi <hidden>
Date: 2020-01-23 08:42:55
Also in:
linux-arm-msm, linux-serial, lkml
Subsystem:
arm/qualcomm chromebook support, arm/qualcomm mailing list, arm/qualcomm support, the rest, tty layer and serial drivers · Maintainers:
Bjorn Andersson, Konrad Dybcio, Linus Torvalds, Greg Kroah-Hartman, Jiri Slaby
Configure UART_IO_MACRO_CTRL register if UART lines are swapped. Change-Id: I8e82c2395bf4cdc51b3677c3c54f5be3f390a888 Signed-off-by: Roja Rani Yarubandi <redacted> --- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 + drivers/tty/serial/qcom_geni_serial.c | 6 ++++++ 2 files changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 7143cb2dbc05..8a8497ca0ec0 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi@@ -675,6 +675,7 @@ ap_spi_fp: &spi10 { &uart3 { status = "okay"; + qcom,pin_inverse = <0x4643>; bluetooth: bluetooth { compatible = "qcom,wcn3991-bt";
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index e1767359cc64..939592ca437c 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c@@ -25,6 +25,7 @@ /* UART specific GENI registers */ #define SE_UART_LOOPBACK_CFG 0x22c +#define SE_UART_IO_MACRO_CTRL 0x240 #define SE_UART_TX_TRANS_CFG 0x25c #define SE_UART_TX_WORD_LEN 0x268 #define SE_UART_TX_STOP_BIT_LEN 0x26c
@@ -1240,6 +1241,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) int irq; bool console = false; struct uart_driver *drv; + u32 val; if (of_device_is_compatible(pdev->dev.of_node, "qcom,geni-debug-uart")) console = true;
@@ -1313,6 +1315,10 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) if (ret) return ret; + ret = of_property_read_u32(pdev->dev.of_node, "qcom,pin_inverse", &val); + if (!ret) + writel(val, uport->membase + SE_UART_IO_MACRO_CTRL); + irq_set_status_flags(uport->irq, IRQ_NOAUTOEN); ret = devm_request_irq(uport->dev, uport->irq, qcom_geni_serial_isr, IRQF_TRIGGER_HIGH, port->name, uport);
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of the Code Aurora Forum, hosted by The Linux Foundation