rk_serial: use of_alias_get_id to get serial id

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 3f1214b7b6f4a33b8a14624eda7de9377f16dccd..e2d7fdae238c82dc77ea244fe312594598e9d8b4 100755 (executable)
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -7,6 +7,13 @@
        compatible = "rockchip,rk3188";
        interrupt-parent = <&gic>;
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+               serial2 = &uart2;
+               serial3 = &uart3;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -172,7 +179,6 @@
                interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
        };
 
-       
        uart0: serial@10124000 {
                compatible = "rockchip,serial";
                reg = <0x10124000 0x100>;
@@ -180,7 +186,6 @@
                clock-frequency = <24000000>;
                reg-shift = <2>;
                reg-io-width = <4>;
-               id = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
                status = "disabled";
@@ -193,7 +198,6 @@
                clock-frequency = <24000000>;
                reg-shift = <2>;
                reg-io-width = <4>;
-               id = <1>;
                pinctrl-names = "default";
                pinctrl-0 = <&uart1_xfer &uart1_cts &uart1_rts>;
                status = "disabled";
@@ -207,7 +211,6 @@
                current-speed = <115200>;
                reg-shift = <2>;
                reg-io-width = <4>;
-               id = <2>;
                pinctrl-names = "default";
                pinctrl-0 = <&uart2_xfer>;
                status = "disabled";
@@ -220,7 +223,6 @@
                clock-frequency = <24000000>;
                reg-shift = <2>;
                reg-io-width = <4>;
-               id = <3>;
                pinctrl-names = "default";
                pinctrl-0 = <&uart3_xfer &uart3_cts &uart3_rts>;
                status = "disabled";

diff --git a/arch/arm/mach-rockchip/rk_fiq_debugger.c b/arch/arm/mach-rockchip/rk_fiq_debugger.c
index b8f37f221e95ece4f0b9667a6bcf39339cf299e7..f4d0de79d0e9ac19e5acb7291d24dde7bd77b17c 100644 (file)
--- a/arch/arm/mach-rockchip/rk_fiq_debugger.c
+++ b/arch/arm/mach-rockchip/rk_fiq_debugger.c
@@ -327,7 +327,8 @@ static int __init rk_fiq_debugger_init(void) {
        np = NULL;
        for (i = 0; i < 5; i++) {
                np = of_find_node_by_name(np, "serial");
-               if (np && !of_property_read_u32(np, "id", &id)) {
+               if (np) {
+                       id = of_alias_get_id(np, "serial");
                        if (id == serial_id) {
                                ok = 1;
                                break;

diff --git a/drivers/tty/serial/rk_serial.c b/drivers/tty/serial/rk_serial.c
index 561124349e38cb5dc8956001eb285e536f31f3de..3614ed9f74e25943ba5ebb6db9e13fdc99fe0412 100644 (file)
--- a/drivers/tty/serial/rk_serial.c
+++ b/drivers/tty/serial/rk_serial.c
@@ -1944,10 +1944,9 @@ static int serial_rk_remove_wakeup_irq(struct uart_rk_port *up) {
 #endif\r
 \r
 #ifdef CONFIG_OF\r
-static int of_rk_serial_parse_dt(const struct device_node *np, struct of_rk_serial *rks) {\r
+static int of_rk_serial_parse_dt(struct device_node *np, struct of_rk_serial *rks) {\r
        unsigned int val = 0;\r
-       if(!of_property_read_u32(np, "id", &val))\r
-               rks->id = val;\r
+       rks->id = of_alias_get_id(np, "serial");\r
        if(!of_property_read_u32(np, "clock-frequency", &val))\r
                rks->uartclk = val;\r
 #if USE_DMA\r