arm64: rockchip: fix tb_8846 boot

uart_dbg status default disabled
disabe wireless-wlan
bootargs remove vmalloc=512M console=ttyS2
remove memory node

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rk3368-tb_8846.dts b/arch/arm64/boot/dts/rk3368-tb_8846.dts
index 70dcb148aff02fdcaa727978549c19cc013869d1..c6551899878f2c747bc8cf19934ea8f5b3a2bb35 100644 (file)
--- a/arch/arm64/boot/dts/rk3368-tb_8846.dts
+++ b/arch/arm64/boot/dts/rk3368-tb_8846.dts
@@ -7,12 +7,7 @@
 
 / {
        chosen {
-               bootargs = "vmalloc=512M console=ttyS2 earlyprintk=uart8250-32bit,0xff690000 clk_ignore_unused";
-       };
-
-       memory@00000000 {
-               device_type = "memory";
-               reg = <0x0 0x00000000 0x0 0x80000000>;
+               bootargs = "earlyprintk=uart8250-32bit,0xff690000 clk_ignore_unused";
        };
 
        wireless-wlan {
@@ -43,7 +38,7 @@
                WIFI,host_wake_irq = <&gpio3 GPIO_A6 GPIO_ACTIVE_HIGH>;
                //WIFI,reset_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
 
-               status = "okay";
+               status = "disabled";
        };
 
        wireless-bluetooth {
@@ -381,6 +376,10 @@
        */
 };
 
+&uart_dbg {
+       status = "okay";
+};
+
 &uart_bt {
        status = "okay";
        dma-names = "!tx", "!rx";

diff --git a/arch/arm64/boot/dts/rk3368.dtsi b/arch/arm64/boot/dts/rk3368.dtsi
index a7a37ba4663bc4108a3f852a92bb9d40eeff0f4d..de0fa254c7019f42fbdc4049a2a6b3b4cae76b12 100644 (file)
--- a/arch/arm64/boot/dts/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rk3368.dtsi
@@ -406,7 +406,7 @@
                //#dma-cells = <2>;
                pinctrl-names = "default";
                pinctrl-0 = <&uart2_xfer>;
-               //status = "disabled";
+               status = "disabled";
        };
 
        uart_gps: serial@ff1b0000 {