diff --git a/target/linux/rockchip/files-6.1/arch/arm64/boot/dts/rockchip/rk3568-opc-h68k.dts b/target/linux/rockchip/files-6.1/arch/arm64/boot/dts/rockchip/rk3568-opc-h68k.dts index b18147f9e..6aac88c70 100644 --- a/target/linux/rockchip/files-6.1/arch/arm64/boot/dts/rockchip/rk3568-opc-h68k.dts +++ b/target/linux/rockchip/files-6.1/arch/arm64/boot/dts/rockchip/rk3568-opc-h68k.dts @@ -1,81 +1,3 @@ -<<<<<<< HEAD -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -// Copyright (c) 2022 AmadeusGhost - -/dts-v1/; - -#include "rk3568-hinlink-opc.dtsi" - -/ { - model = "HINLINK OPC-H68K Board"; - compatible = "hinlink,opc-h68k", "rockchip,rk3568"; - - aliases { - ethernet0 = &gmac0; - ethernet1 = &gmac1; - }; -}; - -&gmac0 { - phy-mode = "rgmii"; - clock_in_out = "output"; - snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 20000 100000>; - assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>; - assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&cru CLK_MAC0_2TOP>; - assigned-clock-rates = <0>, <125000000>; - pinctrl-names = "default"; - pinctrl-0 = <&gmac0_miim - &gmac0_tx_bus2 - &gmac0_rx_bus2 - &gmac0_rgmii_clk - &gmac0_rgmii_bus>; - tx_delay = <0x19>; - rx_delay = <0x10>; - phy-handle = <&rgmii_phy0>; - status = "okay"; -}; - -&gmac1 { - phy-mode = "rgmii"; - clock_in_out = "output"; - snps,reset-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 20000 100000>; - assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>; - assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru CLK_MAC1_2TOP>; - assigned-clock-rates = <0>, <125000000>; - pinctrl-names = "default"; - pinctrl-0 = <&gmac1m1_miim - &gmac1m1_tx_bus2 - &gmac1m1_rx_bus2 - &gmac1m1_rgmii_clk - &gmac1m1_rgmii_bus>; - tx_delay = <0x4f>; - rx_delay = <0x26>; - phy-handle = <&rgmii_phy1>; - status = "okay"; -}; - -&mdio0 { - rgmii_phy0: ethernet-phy@0 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0x0>; - }; -}; - -&mdio1 { - rgmii_phy1: ethernet-phy@0 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0x0>; - }; -}; - -&vcc3v3_pcie { - gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; -}; -======= // SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (c) 2022 AmadeusGhost @@ -90,8 +12,6 @@ aliases { ethernet0 = &gmac0; ethernet1 = &gmac1; - ethernet2 = &rtl8125_2; - ethernet3 = &rtl8125_1; }; }; @@ -110,8 +30,8 @@ &gmac0_rx_bus2 &gmac0_rgmii_clk &gmac0_rgmii_bus>; - tx_delay = <0x3c>; - rx_delay = <0x2f>; + tx_delay = <0x19>; + rx_delay = <0x10>; phy-handle = <&rgmii_phy0>; status = "okay"; }; @@ -131,8 +51,8 @@ &gmac1m1_rx_bus2 &gmac1m1_rgmii_clk &gmac1m1_rgmii_bus>; - tx_delay = <0x4f>; - rx_delay = <0x26>; + tx_delay = <0x4f>; + rx_delay = <0x26>; phy-handle = <&rgmii_phy1>; status = "okay"; }; @@ -150,4 +70,7 @@ reg = <0x0>; }; }; ->>>>>>> 271b198000bb77f61616b8185b83e6ac8ab186cb + +&vcc3v3_pcie { + gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; +}; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index bd4f18656..06473d41f 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -30,7 +30,7 @@ define Device/embedfire_lubancat1 DEVICE_MODEL := LubanCat 1 SOC := rk3566 UBOOT_DEVICE_NAME := lubancat1-rk3566 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata + IMAGE/sysupgrade.img.gz := boot-common | boot-script rk356x | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-r8125 endef #TARGET_DEVICES += embedfire_lubancat1 @@ -40,7 +40,7 @@ define Device/embedfire_lubancat1n DEVICE_MODEL := LubanCat1N SOC := rk3566 UBOOT_DEVICE_NAME := lubancat1n-rk3566 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata + IMAGE/sysupgrade.img.gz := boot-common | boot-script rk356x | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-r8169 -urngd kmod-ata-ahci endef #TARGET_DEVICES += embedfire_lubancat1n @@ -50,7 +50,7 @@ define Device/embedfire_lubancat2 DEVICE_MODEL := LubanCat2 SOC := rk3568 UBOOT_DEVICE_NAME := lubancat2-rk3568 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata + IMAGE/sysupgrade.img.gz := boot-common | boot-script rk356x | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-ata-ahci kmod-ata-ahci-platform kmod-ata-core kmod-ata-ahci kmod-ata-ahci-platform kmod-ata-core endef #TARGET_DEVICES += embedfire_lubancat2 @@ -60,7 +60,7 @@ define Device/embedfire_lubancat2n DEVICE_MODEL := LubanCat2N SOC := rk3568 UBOOT_DEVICE_NAME := lubancat2n-rk3568 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata + IMAGE/sysupgrade.img.gz := boot-common | boot-script rk356x | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-r8125 kmod-ata-ahci kmod-ata-ahci-platform kmod-ata-core endef #TARGET_DEVICES += embedfire_lubancat2n @@ -68,7 +68,7 @@ endef define Device/hinlink_common DEVICE_VENDOR := HINLINK UBOOT_DEVICE_NAME := opc-h68k-rk3568 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata + IMAGE/sysupgrade.img.gz := boot-common | boot-script rk356x | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-ata-ahci-platform kmod-mt7921e kmod-r8125 kmod-usb-serial-cp210x wpad-openssl endef @@ -134,22 +134,22 @@ define Device/friendlyarm_nanopi-r4se endef TARGET_DEVICES += friendlyarm_nanopi-r4se -define Device/friendlyarm_nanopi-r5s +define Device/friendlyarm_rk356x DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi R5S SOC := rk3568 - UBOOT_DEVICE_NAME := nanopi-r5s-rk3568 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata + UBOOT_DEVICE_NAME := rk356x-rk3568 + IMAGE/sysupgrade.img.gz := boot-common | boot-script rk356x | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-scsi-core endef -#TARGET_DEVICES += friendlyarm_nanopi-r5s +#TARGET_DEVICES += friendlyarm_rk356x define Device/friendlyarm_nanopi-r5c DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi R5C SOC := rk3568 UBOOT_DEVICE_NAME := nanopi-r5c-rk3568 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata + IMAGE/sysupgrade.img.gz := boot-common | boot-script rk356x | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-r8125 endef #TARGET_DEVICES += friendlyarm_nanopi-r5c diff --git a/target/linux/rockchip/image/nanopi-r5s.bootscript b/target/linux/rockchip/image/rk356x.bootscript similarity index 100% rename from target/linux/rockchip/image/nanopi-r5s.bootscript rename to target/linux/rockchip/image/rk356x.bootscript