hc
2023-11-20 210d832bd23475d819321da7f0b6b3278dc0d17d
enable gmac0
2 files modified
44 ■■■■ changed files
kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi 24 ●●●● patch | view | raw | blame | history
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi 20 ●●●● patch | view | raw | blame | history
kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
....@@ -359,7 +359,7 @@
359359 phy-mode = "rgmii";
360360 clock_in_out = "output";
361361
362
- snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
362
+ snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
363363 snps,reset-active-low;
364364 /* Reset time is 20ms, 100ms for rtl8211f */
365365 snps,reset-delays-us = <0 20000 100000>;
....@@ -379,7 +379,7 @@
379379 rx_delay = <0x2f>;
380380
381381 phy-handle = <&rgmii_phy0>;
382
- status = "disabled";
382
+ status = "okay";
383383 };
384384
385385 &gmac1 {
....@@ -552,12 +552,6 @@
552552 rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
553553 };
554554 };
555
-
556
- wireless-bluetooth {
557
- uart1_gpios: uart1-gpios {
558
- rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
559
- };
560
- };
561555
562556 nk_io_init{
563557 nk_io_gpio: nk-io-gpio{
....@@ -674,17 +668,7 @@
674668
675669 &wireless_bluetooth {
676670 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";
688672 };
689673
690674 &uart0 {
....@@ -694,7 +678,7 @@
694678 &uart1 {
695679 pinctrl-names = "default";
696680 pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
697
- status = "okay";
681
+ status = "disabled";
698682 };
699683
700684 &uart3 {
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
....@@ -352,22 +352,11 @@
352352 compatible = "wlan-platdata";
353353 rockchip,grf = <&grf>;
354354 wifi_chip_type = "ap6398s";
355
- status = "okay";
355
+ status = "disabled";
356356 };
357357
358358 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";
371360 };
372361
373362 test-power {
....@@ -1532,11 +1521,6 @@
15321521 };
15331522 };
15341523
1535
- wireless-bluetooth {
1536
- uart8_gpios: uart8-gpios {
1537
- rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1538
- };
1539
- };
15401524 };
15411525
15421526 /*