Merge branch 'CR_1280_i2s_master_walker.chen' into 'jh7110-5.15.y-devel'
authorandy.hu <andy.hu@starfivetech.com>
Tue, 21 Jun 2022 12:05:47 +0000 (12:05 +0000)
committerandy.hu <andy.hu@starfivetech.com>
Tue, 21 Jun 2022 12:05:47 +0000 (12:05 +0000)
Fix the conflict between with i2s and pdm while using i2srx

See merge request sdk/linux!134


Trivial merge