evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: Update debug uart support for msmfalcon"

Browse source
This commit is contained in:
Linux Build Service Account 2016-09-07 08:48:13 -07:00 • committed by Gerrit - the friendly Code Review server
commit c9796e05e9
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
View file

@ -22,7 +22,7 @@
qcom,board-id = <15 0>;
};
&uartblsp2dm1 {
&uartblsp1dm1 {
status = "ok";
pinctrl-names = "default";
pinctrl-0 = <&uart_console_active>;

2
arch/arm/boot/dts/qcom/msmfalcon-sim.dts
View file

@ -22,7 +22,7 @@
qcom,board-id = <16 0>;
};
&uartblsp2dm1 {
&uartblsp1dm1 {
status = "ok";
pinctrl-names = "default";
pinctrl-0 = <&uart_console_active>;

12
arch/arm/boot/dts/qcom/msmfalcon.dtsi
View file

@ -23,7 +23,7 @@
interrupt-parent = <&intc>;
aliases {
serial0 = &uartblsp2dm1;
serial0 = &uartblsp1dm1;
};
chosen {
@ -246,6 +246,16 @@
3200 3200 3200 3200 3200 3200>;
};
uartblsp1dm1: serial@0c170000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0xc170000 0x1000>;
interrupts = <0 108 0>;
status = "disabled";
clocks = <&clock_gcc GCC_BLSP1_UART2_APPS_CLK>,
<&clock_gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface";
};
uartblsp2dm1: serial@0c1b0000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0xc1b0000 0x1000>;