From a36159eec6ca17402b0e146b86efaf76568dc353 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Fri, 20 Sep 2024 01:41:23 +0000 Subject: [PATCH] 重命名 AX88772C_eeprom/asix.c 为 asix_mac.c --- kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi | 196 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 141 insertions(+), 55 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi index 92a194c..61008c7 100755 --- a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi @@ -89,6 +89,24 @@ regulator-boot-on; }; #endif + + leds: leds { + compatible = "gpio-leds"; + sig_led: sig_led { + gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + }; + + leds: leds { + compatible = "gpio-leds"; + err_led: err_led { + gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + }; + + ndj_io_init { compatible = "nk_io_control"; pinctrl-names = "default"; @@ -106,8 +124,18 @@ gpio_function = <0>; }; - hub_host2_rst { - gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3 + vcc_3.3v { + gpio_num = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3 + gpio_function = <0>; + }; + + ax88772_rst { + gpio_num = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>; //AX88772_RST_GPIO3_B5_3V3 + gpio_function = <3>; + }; + + ax88631_rst { + gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>; //AX88772_RST_GPIO3_B6_3V3 gpio_function = <3>; }; @@ -136,15 +164,56 @@ gpio_function = <0>; }; - hp_en { - gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3 - gpio_function = <0>; - }; + //gpio99 { + // gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3 + // gpio_function = <1>; + //}; wifi_power_en { gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8 gpio_function = <0>; }; + #if 0 + do1 { + gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; + gpio_function = <0>; + }; + + do2 { + gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + gpio_function = <0>; + }; + + do3 { + gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>; + gpio_function = <0>; + }; + + do4 { + gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>; + gpio_function = <0>; + }; + + do5 { + gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; + gpio_function = <0>; + }; + + do6 { + gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; + gpio_function = <0>; + }; + + do7 { + gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>; + gpio_function = <0>; + }; + + di1 { + gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>; + gpio_function = <1>; + }; + #endif }; #if 0 nk_io_init { @@ -185,8 +254,8 @@ nodka-lvds = <15>; display-timings { - native-mode = <&timing0>; - timing0: timing0 { + native-mode = <&timing>; + timing: timing { clock-frequency = <72500000>; hactive = <1280>; vactive = <800>; @@ -203,8 +272,8 @@ }; }; ports { - panel_in: endpoint { - remote-endpoint = <&edp_out>; + panel_in_lvds: endpoint { + remote-endpoint = <&lvds_out>; }; }; }; @@ -296,7 +365,7 @@ */ &video_phy1 { - status = "okay"; + status = "disabled"; }; &dsi1 { status = "disabled"; @@ -307,11 +376,11 @@ }; &dsi1_in_vp1 { - status = "okay"; + status = "disabled"; }; &dsi1_panel { - power-supply = <&vcc3v3_lcd1_n>; //MIPI_3V3EN_GPIO3_A3_d_3V3 +// power-supply = <&vcc3v3_lcd1_n>; //MIPI_3V3EN_GPIO3_A3_d_3V3 vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3 reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7 vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3 @@ -331,20 +400,11 @@ &edp { force-hpd; - status = "okay"; - ports { - port@1 { - reg = <1>; - edp_out: endpoint { - remote-endpoint = <&panel_in>; - }; - }; - }; + status = "disabled"; }; &edp_phy { - status = "okay"; - + status = "disabled"; }; &edp_in_vp0 { @@ -352,18 +412,40 @@ }; &edp_in_vp1 { - status = "okay"; + status = "disabled"; }; &route_edp { - status = "okay"; + status = "disabled"; connect = <&vp1_out_edp>; }; &route_edp { - status = "okay"; + status = "disabled"; }; + +&lvds { + status = "disabled"; + ports { + port@1 { + reg = <1>; + lvds_out:endpoint { + remote-endpoint = <&panel_in_lvds>; + }; + }; + }; +}; + +&route_lvds{ + status = "okay"; + connect = <&vp1_out_lvds>; +}; + +&lvds_in_vp1 { + status = "disabled"; +}; + /* * edp_end */ @@ -408,7 +490,7 @@ phy-mode = "rgmii"; clock_in_out = "output"; - snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>; + snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; snps,reset-active-low; /* Reset time is 20ms, 100ms for rtl8211f */ snps,reset-delays-us = <0 20000 100000>; @@ -428,7 +510,9 @@ rx_delay = <0x2f>; phy-handle = <&rgmii_phy0>; + status = "disabled"; + }; &gmac1 { @@ -462,9 +546,7 @@ * power-supply should switche to vcc3v3_lcd1_n * when mipi panel is connected to dsi1. */ ->1x { - power-supply = <&vcc3v3_lcd0_n>; -}; + &i2c3 { status = "okay"; @@ -483,7 +565,7 @@ }; &i2c4 { - status = "okay"; + status = "disabled"; gc8034: gc8034@37 { compatible = "galaxycore,gc8034"; status = "okay"; @@ -495,7 +577,6 @@ reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>; pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>; rockchip,grf = <&grf>; - power-domains = <&power RK3568_PD_VI>; rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; rockchip,camera-module-name = "RK-CMK-8M-2-v1"; @@ -529,7 +610,7 @@ }; }; ov5695: ov5695@36 { - status = "okay"; + status = "disabled"; compatible = "ovti,ov5695"; reg = <0x36>; clocks = <&cru CLK_CIF_OUT>; @@ -582,7 +663,7 @@ &pcie30phy { - status = "okay"; + status = "disabled"; }; &pcie2x1 { @@ -641,11 +722,21 @@ <3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>, <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>, <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>, + <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>, + <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>, + <3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>, - <2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3 - <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3 - <2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3 - <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3 + <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3 DO1 8 + <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3 DO2 11 + <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3 DO3 12 + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3 DO4 13 + <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3 DO5 14 + + <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3 DI1 16 + <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3 DI2 17 + <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3 DI3 18 + <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3 DI4 19 + <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3 DI5 21 <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -672,8 +763,6 @@ }; }; }; - - @@ -713,15 +802,6 @@ pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>; }; -&vcc3v3_lcd0_n { - gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; - enable-active-high; -}; - -&vcc3v3_lcd1_n { - gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3 - enable-active-high; -}; &wireless_wlan { pinctrl-names = "default"; @@ -741,17 +821,17 @@ BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - status = "okay"; + status = "disabled"; }; &uart0 { - status = "okay"; + status = "disabled"; }; &uart1 { pinctrl-names = "default"; pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>; - status = "okay"; + status = "disabled"; }; &uart3 { @@ -760,7 +840,7 @@ }; &uart4 { - status = "okay"; + status = "disabled"; pinctrl-0 = <&uart4m1_xfer>; }; @@ -769,12 +849,18 @@ pinctrl-0 = <&uart5m1_xfer>; }; + &uart7 { status = "okay"; pinctrl-0 = <&uart7m1_xfer>; }; +&uart8 { + status = "disabled"; + pinctrl-0 = <&uart8m1_xfer>; +}; + &uart9 { - status = "okay"; + status = "disabled"; pinctrl-0 = <&uart9m1_xfer>; }; -- Gitblit v1.6.2