Hi, The second version comes with an improtant update - revert changes in AHCI nodes done in v5.11 Linux device tree, which broke compatibility with all OSs (v5.11 Linux included...). Other than that, there is minor cleanup modification and 10G ports enablement for Cn913xDB.
First patch should be merged to edk2-platforms and the remaining ones to the edk2-non-osi. The changes had to be sent together due to their strict dependency. The patches are also available in public branches: https://github.com/semihalf-wojtas-marcin/edk2-platforms/commits/dt-upstream-r20210318 https://github.com/semihalf-wojtas-marcin/edk2-non-osi/commits/dt-upstream-r20210322 Any comments would be welcome. Best regards, Marcin Changelog: v1->v2: * Revert ahci nodes changes for Armada7k8k and OcteonTx * Remove unused ICU-related defines and armada-ap807.dtsi from Armada7k8k DT sources * Enable 10G ports on Cn913xDB Marcin Wojtas (4): [edk2-platforms] Marvell/Armada7k8k: Remove device tree sources from edk2-platforms [edk2-non-osi] Marvell/Armada7k8k: Import device tree sources from edk2-platforms Marvell/Armada7k8k: Update device trees Marvell/OcteonTx: Update device trees Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf | 22 + Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf | 22 + Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf | 22 + Silicon/Marvell/OcteonTx/DeviceTree/T91/Cn9130DbA.inf | 2 +- Silicon/Marvell/OcteonTx/DeviceTree/T91/Cn9131DbA.inf | 2 +- Silicon/Marvell/OcteonTx/DeviceTree/T91/Cn9132DbA.inf | 2 +- Silicon/Marvell/Armada7k8k/DeviceTree/armada-7020.dtsi | 16 + Silicon/Marvell/Armada7k8k/DeviceTree/armada-7040-db.dts | 301 ++++++++++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-7040.dtsi | 40 ++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-70x0.dtsi | 64 ++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-8020.dtsi | 26 + Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-db.dts | 357 +++++++++++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-mcbin.dts | 45 ++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-mcbin.dtsi | 375 ++++++++++++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040.dtsi | 61 ++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-80x0.dtsi | 108 ++++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-ap806-dual.dtsi | 61 ++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-ap806-quad.dtsi | 93 +++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-ap806.dtsi | 30 + Silicon/Marvell/Armada7k8k/DeviceTree/armada-ap807-quad.dtsi | 93 +++ Silicon/Marvell/{OcteonTx/DeviceTree/T91/armada-ap806.dtsi => Armada7k8k/DeviceTree/armada-ap80x.dtsi} | 241 +++++++- Silicon/Marvell/Armada7k8k/DeviceTree/armada-common.dtsi | 11 + Silicon/Marvell/Armada7k8k/DeviceTree/armada-cp110.dtsi | 12 + Silicon/Marvell/Armada7k8k/DeviceTree/armada-cp115.dtsi | 12 + Silicon/Marvell/Armada7k8k/DeviceTree/armada-cp11x.dtsi | 632 ++++++++++++++++++++ Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-ap806-quad.dtsi | 43 -- Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-ap807-quad.dtsi | 93 +++ Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-ap807.dtsi | 35 ++ Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-ap80x.dtsi | 473 +++++++++++++++ Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-common.dtsi | 3 +- Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-cp110.dtsi | 552 ----------------- Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-cp115.dtsi | 12 + Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-cp11x.dtsi | 632 ++++++++++++++++++++ Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9130-db-A.dts | 185 ------ Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9130-db.dts | 403 +++++++++++++ Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9130.dtsi | 143 +---- Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9131-db-A.dts | 29 - Silicon/Marvell/OcteonTx/DeviceTree/T91/{cn9131-db.dtsi => cn9131-db.dts} | 93 ++- Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9132-db-A.dts | 70 --- Silicon/Marvell/OcteonTx/DeviceTree/T91/{cn9132-db.dtsi => cn9132-db.dts} | 126 +++- 40 files changed, 4462 insertions(+), 1080 deletions(-) create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-7020.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-7040-db.dts create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-7040.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-70x0.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-8020.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-db.dts create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-mcbin.dts create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-mcbin.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-80x0.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-ap806-dual.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-ap806-quad.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-ap806.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-ap807-quad.dtsi rename Silicon/Marvell/{OcteonTx/DeviceTree/T91/armada-ap806.dtsi => Armada7k8k/DeviceTree/armada-ap80x.dtsi} (51%) create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-common.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-cp110.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-cp115.dtsi create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/armada-cp11x.dtsi delete mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-ap806-quad.dtsi create mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-ap807-quad.dtsi create mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-ap807.dtsi create mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-ap80x.dtsi delete mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-cp110.dtsi create mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-cp115.dtsi create mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/armada-cp11x.dtsi delete mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9130-db-A.dts create mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9130-db.dts delete mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9131-db-A.dts rename Silicon/Marvell/OcteonTx/DeviceTree/T91/{cn9131-db.dtsi => cn9131-db.dts} (66%) delete mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9132-db-A.dts rename Silicon/Marvell/OcteonTx/DeviceTree/T91/{cn9132-db.dtsi => cn9132-db.dts} (54%) -- 2.29.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73058): https://edk2.groups.io/g/devel/message/73058 Mute This Topic: https://groups.io/mt/81515078/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-