[openwrt/openwrt] realtek: copy dts directory for Kernel 5.10

LEDE Commits lede-commits at lists.infradead.org
Sat Sep 25 15:37:34 PDT 2021


adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0de230bd0ce1c011a6d57ce7692b1b7898e7b735

commit 0de230bd0ce1c011a6d57ce7692b1b7898e7b735
Author: INAGAKI Hiroshi <musashino.open at gmail.com>
AuthorDate: Wed Aug 11 20:23:06 2021 +0900

    realtek: copy dts directory for Kernel 5.10
    
    This patch adds "dts-5.10" directory to use backported drivers.
    There are several specification changes in the new drivers, so there
    are some compatibility issues in using dts/dtsi files for 5.4.
    
    The old DTS files are moved to "dts-5.4", so their corresponding
    kernel version is obvious as well.
    
    Signed-off-by: INAGAKI Hiroshi <musashino.open at gmail.com>
    [change "dts" to "dts-5.4", adjust Makefile]
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 target/linux/realtek/{dts => dts-5.10}/rtl8380_netgear_gigabit.dtsi     | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_netgear_gigabit_1xx.dtsi | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_netgear_gigabit_3xx.dtsi | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_netgear_gs108t-v3.dts    | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_netgear_gs110tpp-v1.dts  | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_netgear_gs308t-v1.dts    | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_netgear_gs310tp-v1.dts   | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_zyxel_gs1900-10hp.dts    | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_zyxel_gs1900-8.dts       | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_zyxel_gs1900-8hp-v1.dts  | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_zyxel_gs1900-8hp-v2.dts  | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8380_zyxel_gs1900.dtsi        | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8382_allnet_all-sg8208m.dts   | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8382_d-link_dgs-1210-10p.dts  | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8382_d-link_dgs-1210-16.dts   | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8382_d-link_dgs-1210-28.dts   | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8382_d-link_dgs-1210.dtsi     | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8382_inaba_aml2-17gp.dts      | 0
 target/linux/realtek/{dts => dts-5.10}/rtl8382_zyxel_gs1900-24hp-v2.dts | 0
 target/linux/realtek/{dts => dts-5.10}/rtl838x.dtsi                     | 0
 target/linux/realtek/{dts => dts-5.10}/rtl930x.dtsi                     | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_netgear_gigabit.dtsi      | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_netgear_gigabit_1xx.dtsi  | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_netgear_gigabit_3xx.dtsi  | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_netgear_gs108t-v3.dts     | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_netgear_gs110tpp-v1.dts   | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_netgear_gs308t-v1.dts     | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_netgear_gs310tp-v1.dts    | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_zyxel_gs1900-10hp.dts     | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_zyxel_gs1900-8.dts        | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_zyxel_gs1900-8hp-v1.dts   | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_zyxel_gs1900-8hp-v2.dts   | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8380_zyxel_gs1900.dtsi         | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8382_allnet_all-sg8208m.dts    | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8382_d-link_dgs-1210-10p.dts   | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8382_d-link_dgs-1210-16.dts    | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8382_d-link_dgs-1210-28.dts    | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8382_d-link_dgs-1210.dtsi      | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8382_inaba_aml2-17gp.dts       | 0
 target/linux/realtek/{dts => dts-5.4}/rtl8382_zyxel_gs1900-24hp-v2.dts  | 0
 target/linux/realtek/{dts => dts-5.4}/rtl838x.dtsi                      | 0
 target/linux/realtek/{dts => dts-5.4}/rtl930x.dtsi                      | 0
 target/linux/realtek/image/Makefile                                     | 2 +-
 43 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi b/target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit.dtsi
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi
copy to target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit.dtsi
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gigabit_1xx.dtsi b/target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit_1xx.dtsi
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_netgear_gigabit_1xx.dtsi
copy to target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit_1xx.dtsi
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gigabit_3xx.dtsi b/target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit_3xx.dtsi
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_netgear_gigabit_3xx.dtsi
copy to target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit_3xx.dtsi
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs108t-v3.dts b/target/linux/realtek/dts-5.10/rtl8380_netgear_gs108t-v3.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_netgear_gs108t-v3.dts
copy to target/linux/realtek/dts-5.10/rtl8380_netgear_gs108t-v3.dts
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts b/target/linux/realtek/dts-5.10/rtl8380_netgear_gs110tpp-v1.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
copy to target/linux/realtek/dts-5.10/rtl8380_netgear_gs110tpp-v1.dts
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs308t-v1.dts b/target/linux/realtek/dts-5.10/rtl8380_netgear_gs308t-v1.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_netgear_gs308t-v1.dts
copy to target/linux/realtek/dts-5.10/rtl8380_netgear_gs308t-v1.dts
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts b/target/linux/realtek/dts-5.10/rtl8380_netgear_gs310tp-v1.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts
copy to target/linux/realtek/dts-5.10/rtl8380_netgear_gs310tp-v1.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts b/target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900-10hp.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
copy to target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900-10hp.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8.dts b/target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900-8.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8.dts
copy to target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900-8.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v1.dts b/target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900-8hp-v1.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v1.dts
copy to target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900-8hp-v1.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v2.dts b/target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900-8hp-v2.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v2.dts
copy to target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900-8hp-v2.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi b/target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900.dtsi
similarity index 100%
copy from target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi
copy to target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900.dtsi
diff --git a/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts b/target/linux/realtek/dts-5.10/rtl8382_allnet_all-sg8208m.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
copy to target/linux/realtek/dts-5.10/rtl8382_allnet_all-sg8208m.dts
diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
copy to target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts
diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-16.dts b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-16.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8382_d-link_dgs-1210-16.dts
copy to target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-16.dts
diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-28.dts b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-28.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8382_d-link_dgs-1210-28.dts
copy to target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-28.dts
diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210.dtsi
similarity index 100%
copy from target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi
copy to target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210.dtsi
diff --git a/target/linux/realtek/dts/rtl8382_inaba_aml2-17gp.dts b/target/linux/realtek/dts-5.10/rtl8382_inaba_aml2-17gp.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8382_inaba_aml2-17gp.dts
copy to target/linux/realtek/dts-5.10/rtl8382_inaba_aml2-17gp.dts
diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts b/target/linux/realtek/dts-5.10/rtl8382_zyxel_gs1900-24hp-v2.dts
similarity index 100%
copy from target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts
copy to target/linux/realtek/dts-5.10/rtl8382_zyxel_gs1900-24hp-v2.dts
diff --git a/target/linux/realtek/dts/rtl838x.dtsi b/target/linux/realtek/dts-5.10/rtl838x.dtsi
similarity index 100%
copy from target/linux/realtek/dts/rtl838x.dtsi
copy to target/linux/realtek/dts-5.10/rtl838x.dtsi
diff --git a/target/linux/realtek/dts/rtl930x.dtsi b/target/linux/realtek/dts-5.10/rtl930x.dtsi
similarity index 100%
copy from target/linux/realtek/dts/rtl930x.dtsi
copy to target/linux/realtek/dts-5.10/rtl930x.dtsi
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi b/target/linux/realtek/dts-5.4/rtl8380_netgear_gigabit.dtsi
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi
rename to target/linux/realtek/dts-5.4/rtl8380_netgear_gigabit.dtsi
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gigabit_1xx.dtsi b/target/linux/realtek/dts-5.4/rtl8380_netgear_gigabit_1xx.dtsi
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_netgear_gigabit_1xx.dtsi
rename to target/linux/realtek/dts-5.4/rtl8380_netgear_gigabit_1xx.dtsi
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gigabit_3xx.dtsi b/target/linux/realtek/dts-5.4/rtl8380_netgear_gigabit_3xx.dtsi
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_netgear_gigabit_3xx.dtsi
rename to target/linux/realtek/dts-5.4/rtl8380_netgear_gigabit_3xx.dtsi
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs108t-v3.dts b/target/linux/realtek/dts-5.4/rtl8380_netgear_gs108t-v3.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_netgear_gs108t-v3.dts
rename to target/linux/realtek/dts-5.4/rtl8380_netgear_gs108t-v3.dts
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts b/target/linux/realtek/dts-5.4/rtl8380_netgear_gs110tpp-v1.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
rename to target/linux/realtek/dts-5.4/rtl8380_netgear_gs110tpp-v1.dts
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs308t-v1.dts b/target/linux/realtek/dts-5.4/rtl8380_netgear_gs308t-v1.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_netgear_gs308t-v1.dts
rename to target/linux/realtek/dts-5.4/rtl8380_netgear_gs308t-v1.dts
diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts b/target/linux/realtek/dts-5.4/rtl8380_netgear_gs310tp-v1.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts
rename to target/linux/realtek/dts-5.4/rtl8380_netgear_gs310tp-v1.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts b/target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900-10hp.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
rename to target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900-10hp.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8.dts b/target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900-8.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8.dts
rename to target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900-8.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v1.dts b/target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900-8hp-v1.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v1.dts
rename to target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900-8hp-v1.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v2.dts b/target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900-8hp-v2.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v2.dts
rename to target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900-8hp-v2.dts
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi b/target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900.dtsi
similarity index 100%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi
rename to target/linux/realtek/dts-5.4/rtl8380_zyxel_gs1900.dtsi
diff --git a/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts b/target/linux/realtek/dts-5.4/rtl8382_allnet_all-sg8208m.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
rename to target/linux/realtek/dts-5.4/rtl8382_allnet_all-sg8208m.dts
diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts b/target/linux/realtek/dts-5.4/rtl8382_d-link_dgs-1210-10p.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
rename to target/linux/realtek/dts-5.4/rtl8382_d-link_dgs-1210-10p.dts
diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-16.dts b/target/linux/realtek/dts-5.4/rtl8382_d-link_dgs-1210-16.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8382_d-link_dgs-1210-16.dts
rename to target/linux/realtek/dts-5.4/rtl8382_d-link_dgs-1210-16.dts
diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-28.dts b/target/linux/realtek/dts-5.4/rtl8382_d-link_dgs-1210-28.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8382_d-link_dgs-1210-28.dts
rename to target/linux/realtek/dts-5.4/rtl8382_d-link_dgs-1210-28.dts
diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi b/target/linux/realtek/dts-5.4/rtl8382_d-link_dgs-1210.dtsi
similarity index 100%
rename from target/linux/realtek/dts/rtl8382_d-link_dgs-1210.dtsi
rename to target/linux/realtek/dts-5.4/rtl8382_d-link_dgs-1210.dtsi
diff --git a/target/linux/realtek/dts/rtl8382_inaba_aml2-17gp.dts b/target/linux/realtek/dts-5.4/rtl8382_inaba_aml2-17gp.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8382_inaba_aml2-17gp.dts
rename to target/linux/realtek/dts-5.4/rtl8382_inaba_aml2-17gp.dts
diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts b/target/linux/realtek/dts-5.4/rtl8382_zyxel_gs1900-24hp-v2.dts
similarity index 100%
rename from target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts
rename to target/linux/realtek/dts-5.4/rtl8382_zyxel_gs1900-24hp-v2.dts
diff --git a/target/linux/realtek/dts/rtl838x.dtsi b/target/linux/realtek/dts-5.4/rtl838x.dtsi
similarity index 100%
rename from target/linux/realtek/dts/rtl838x.dtsi
rename to target/linux/realtek/dts-5.4/rtl838x.dtsi
diff --git a/target/linux/realtek/dts/rtl930x.dtsi b/target/linux/realtek/dts-5.4/rtl930x.dtsi
similarity index 100%
rename from target/linux/realtek/dts/rtl930x.dtsi
rename to target/linux/realtek/dts-5.4/rtl930x.dtsi
diff --git a/target/linux/realtek/image/Makefile b/target/linux/realtek/image/Makefile
index 5900750797..5e4b4cde80 100644
--- a/target/linux/realtek/image/Makefile
+++ b/target/linux/realtek/image/Makefile
@@ -20,7 +20,7 @@ define Device/Default
   PROFILES = Default
   KERNEL := kernel-bin | append-dtb | gzip | uImage gzip
   KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | uImage gzip
-  DEVICE_DTS_DIR := ../dts
+  DEVICE_DTS_DIR := ../dts-$(KERNEL_PATCHVER)
   DEVICE_DTS = $$(SOC)_$(1)
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | \



More information about the lede-commits mailing list