kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi | ●●●●● patch | view | raw | blame | history | |
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi | ●●●●● patch | view | raw | blame | history |
kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
.. .. @@ -359,7 +359,7 @@ 359 359 phy-mode = "rgmii"; 360 360 clock_in_out = "output"; 361 361 362 - snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;362 + snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;363 363 snps,reset-active-low; 364 364 /* Reset time is 20ms, 100ms for rtl8211f */ 365 365 snps,reset-delays-us = <0 20000 100000>; .. .. @@ -379,7 +379,7 @@ 379 379 rx_delay = <0x2f>; 380 380 381 381 phy-handle = <&rgmii_phy0>; 382 - status = "disabled";382 + status = "okay";383 383 }; 384 384 385 385 &gmac1 { .. .. @@ -552,12 +552,6 @@ 552 552 rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>; 553 553 }; 554 554 }; 555 -556 - wireless-bluetooth {557 - uart1_gpios: uart1-gpios {558 - rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;559 - };560 - };561 555 562 556 nk_io_init{ 563 557 nk_io_gpio: nk-io-gpio{ .. .. @@ -674,17 +668,7 @@ 674 668 675 669 &wireless_bluetooth { 676 670 compatible = "bluetooth-platdata"; 677 - clocks = <&rk809 1>;678 - clock-names = "ext_clock";679 - //wifi-bt-power-toggle;680 - uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;681 - pinctrl-names = "default", "rts_gpio";682 - pinctrl-0 = <&uart1m0_rtsn>;683 - pinctrl-1 = <&uart1_gpios>;684 - BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;685 - BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;686 - BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;687 - status = "okay";671 + status = "disabled";688 672 }; 689 673 690 674 &uart0 { .. .. @@ -694,7 +678,7 @@ 694 678 &uart1 { 695 679 pinctrl-names = "default"; 696 680 pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>; 697 - status = "okay";681 + status = "disabled";698 682 }; 699 683 700 684 &uart3 { kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
.. .. @@ -352,22 +352,11 @@ 352 352 compatible = "wlan-platdata"; 353 353 rockchip,grf = <&grf>; 354 354 wifi_chip_type = "ap6398s"; 355 - status = "okay";355 + status = "disabled";356 356 }; 357 357 358 358 wireless_bluetooth: wireless-bluetooth { 359 - compatible = "bluetooth-platdata";360 - clocks = <&rk809 1>;361 - clock-names = "ext_clock";362 - //wifi-bt-power-toggle;363 - uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;364 - pinctrl-names = "default", "rts_gpio";365 - pinctrl-0 = <&uart8m0_rtsn>;366 - pinctrl-1 = <&uart8_gpios>;367 - BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;368 - BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;369 - BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;370 - status = "okay";359 + status = "disabled";371 360 }; 372 361 373 362 test-power { .. .. @@ -1532,11 +1521,6 @@ 1532 1521 }; 1533 1522 }; 1534 1523 1535 - wireless-bluetooth {1536 - uart8_gpios: uart8-gpios {1537 - rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;1538 - };1539 - };1540 1524 }; 1541 1525 1542 1526 /*