diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts index 29fd2b362..53f1cb75b 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts @@ -14,7 +14,6 @@ led-failsafe = &led_sys; led-running = &led_sys; led-upgrade = &led_sys; - serial0 = &blsp1_uart1; }; chosen { @@ -191,8 +190,10 @@ &blsp1_uart1 { status = "okay"; - pinctrl-0 = <&serial_0_pins>; - pinctrl-names = "default"; +}; + +&blsp1_uart2 { + status = "okay"; }; &cryptobam { @@ -242,12 +243,6 @@ }; &tlmm { - serial_0_pins: serial0-pinmux { - pins = "gpio16", "gpio17"; - function = "blsp_uart0"; - bias-disable; - }; - mdio_pins: mdio_pinmux { mux_1 { pins = "gpio6"; diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts index 29fd2b362..53f1cb75b 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts @@ -14,7 +14,6 @@ led-failsafe = &led_sys; led-running = &led_sys; led-upgrade = &led_sys; - serial0 = &blsp1_uart1; }; chosen { @@ -191,8 +190,10 @@ &blsp1_uart1 { status = "okay"; - pinctrl-0 = <&serial_0_pins>; - pinctrl-names = "default"; +}; + +&blsp1_uart2 { + status = "okay"; }; &cryptobam { @@ -242,12 +243,6 @@ }; &tlmm { - serial_0_pins: serial0-pinmux { - pins = "gpio16", "gpio17"; - function = "blsp_uart0"; - bias-disable; - }; - mdio_pins: mdio_pinmux { mux_1 { pins = "gpio6"; diff --git a/target/linux/ipq40xx/patches-4.14/996-add-blsp1-uart2-label.patch b/target/linux/ipq40xx/patches-4.14/996-add-blsp1-uart2-label.patch new file mode 100644 index 000000000..eee917afb --- /dev/null +++ b/target/linux/ipq40xx/patches-4.14/996-add-blsp1-uart2-label.patch @@ -0,0 +1,11 @@ +--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi ++++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +@@ -387,7 +387,7 @@ + dma-names = "rx", "tx"; + }; + +- serial@78b0000 { ++ blsp1_uart2: serial@78b0000 { + compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; + reg = <0x78b0000 0x200>; + interrupts = ;