[lgirdwood]

Reverts #6787

[marc-hb]

Should fix regression #6787

Devices unfortunately not available in https://sof-ci.01.org/sofpr/PR6953/build3368/devicetest/index.html, restarting hardware testing

[marc-hb]

SOFCI TEST

[marc-hb]

Lots of devices missing again in https://sof-ci.01.org/sofpr/PR6953/build3370/devicetest/index.html again, this is starting to look suspicious... @greg-intel , @fredoh9 ?

[marc-hb]

SOFCI TEST

[greg-intel]

@marc-hb I saw three instances of "ERROR: Failed to retrieve Topology resource from..." (in the device testflows) for testplan 19889

[marc-hb]

So https://sof-ci.01.org/sofpr/PR6953/build3371/devicetest/index.html is mostly empty again

As mentioned by Greg, job/testflow/61036 tries to download tplg/topology2/avs-tplg/sof-adl-rt711-4ch.tplg but it's NOT in the sof/PR6953-3370/build3370/tplg/topology2/avs-tplg/ folder in storage.

[marc-hb]

Just to be on the safe side I fetched this and made sure it reverts #6787 exactly. So from that perspective: approved.

Obviously can't be merged as long as all tests are failing.

[marc-hb]

I built both/after this revert and yes the revert does remove topology/topology2/avs-tplg/sof-adl-rt711-4ch.tplg (and others). So there's likely a "revert" required on the CI side too.

[bardliao]

#6946 will fix #6947 and #6957 will fix the topology issue on ADL RVP. There is no need to revert #6787