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)
commitd60e4ddb2243a0309f8a40d6dac4161adfaef3ac
treef5a02f70d4a9155e11772681f1e34933987a554c
parent8dd16747c40c322ba89092e2fba5414a32697de6
parent1e9c640ea560a755879d1db1a4d6b2cf797246c1
Merge branch 'CR_1280_i2s_master_walker.chen' into 'jh7110-5.15.y-devel'

Fix the conflict between with i2s and pdm while using i2srx

See merge request sdk/linux!134