Page MenuHomeFreeBSD
Files F148061461

D4218.id10699.diff
No OneTemporary
Actions

D4218.id10699.diff
View Options

Index: sys/boot/fdt/dts/arm/db78460.dts
===================================================================
--- sys/boot/fdt/dts/arm/db78460.dts
+++ sys/boot/fdt/dts/arm/db78460.dts
@@ -111,45 +111,41 @@
};
serial0: serial@12000 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x12000 0x20>;
reg-shift = <2>;
current-speed = <115200>;
clock-frequency = <0>;
- busy-detect = <1>;
interrupts = <41>;
interrupt-parent = <&MPIC>;
};
serial1: serial@12100 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x12100 0x20>;
reg-shift = <2>;
current-speed = <115200>;
clock-frequency = <0>;
- busy-detect = <1>;
interrupts = <42>;
interrupt-parent = <&MPIC>;
};
serial2: serial@12200 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x12200 0x20>;
reg-shift = <2>;
current-speed = <115200>;
clock-frequency = <0>;
- busy-detect = <1>;
interrupts = <43>;
interrupt-parent = <&MPIC>;
};
serial3: serial@12300 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x12300 0x20>;
reg-shift = <2>;
current-speed = <115200>;
clock-frequency = <0>;
- busy-detect = <1>;
interrupts = <44>;
interrupt-parent = <&MPIC>;
};
Index: sys/boot/fdt/dts/arm/rk3188.dtsi
===================================================================
--- sys/boot/fdt/dts/arm/rk3188.dtsi
+++ sys/boot/fdt/dts/arm/rk3188.dtsi
@@ -179,53 +179,49 @@
};
uart0: serial@10124000 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x10124000 0x400>;
reg-shift = <2>;
interrupts = <66>;
interrupt-parent = <&GIC>;
current-speed = <115200>;
clock-frequency = < 24000000 >;
- busy-detect = <1>;
broken-txfifo = <1>;
status = "disabled";
};
uart1: serial@10126000 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x10126000 0x400>;
reg-shift = <2>;
interrupts = <67>;
interrupt-parent = <&GIC>;
current-speed = <115200>;
clock-frequency = < 24000000 >;
- busy-detect = <1>;
broken-txfifo = <1>;
status = "disabled";
};
uart2: serial@20064000 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x20064000 0x400>;
reg-shift = <2>;
interrupts = <68>;
interrupt-parent = <&GIC>;
current-speed = <115200>;
clock-frequency = < 24000000 >;
- busy-detect = <1>;
broken-txfifo = <1>;
status = "disabled";
};
uart3: serial@20068000 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x20068000 0x400>;
reg-shift = <2>;
interrupts = <69>;
interrupt-parent = <&GIC>;
current-speed = <115200>;
clock-frequency = < 24000000 >;
- busy-detect = <1>;
broken-txfifo = <1>;
status = "disabled";
};
Index: sys/boot/fdt/dts/arm/sun4i-a10.dtsi
===================================================================
--- sys/boot/fdt/dts/arm/sun4i-a10.dtsi
+++ sys/boot/fdt/dts/arm/sun4i-a10.dtsi
@@ -120,14 +120,13 @@
};
UART0: serial@01c28000 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
reg-shift = <2>;
interrupts = <1>;
interrupt-parent = <&AINTC>;
current-speed = <115200>;
clock-frequency = < 24000000 >;
- busy-detect = <1>;
};
emac@01c0b000 {
Index: sys/boot/fdt/dts/arm/sun7i-a20.dtsi
===================================================================
--- sys/boot/fdt/dts/arm/sun7i-a20.dtsi
+++ sys/boot/fdt/dts/arm/sun7i-a20.dtsi
@@ -126,14 +126,13 @@
};
UART0: serial@01c28000 {
- compatible = "ns16550";
+ compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
reg-shift = <2>;
interrupts = <1>;
interrupt-parent = <&GIC>;
current-speed = <115200>;
clock-frequency = < 24000000 >;
- busy-detect = <1>;
};
emac@01c0b000 {
Index: sys/dev/uart/uart_dev_ns8250.c
===================================================================
--- sys/dev/uart/uart_dev_ns8250.c
+++ sys/dev/uart/uart_dev_ns8250.c
@@ -427,9 +427,8 @@
* Check whether uart requires to read USR reg when IIR_BUSY and
* has broken txfifo.
*/
+ ns8250->busy_detect = ofw_bus_is_compatible(sc->sc_dev, "snps,dw-apb-uart");
node = ofw_bus_get_node(sc->sc_dev);
- if ((OF_getencprop(node, "busy-detect", &cell, sizeof(cell))) > 0)
- ns8250->busy_detect = cell ? 1 : 0;
if ((OF_getencprop(node, "broken-txfifo", &cell, sizeof(cell))) > 0)
broken_txfifo = cell ? 1 : 0;
#endif

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 12:16 PM (5 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29770047
Default Alt Text
D4218.id10699.diff (4 KB)

Event Timeline