Merge branch 'CR_1404_gpioconflict_jianlong' into 'jh7110-5.15.y-devel'
authorandy.hu <andy.hu@starfivetech.com>
Tue, 28 Jun 2022 10:34:16 +0000 (10:34 +0000)
committerandy.hu <andy.hu@starfivetech.com>
Tue, 28 Jun 2022 10:34:16 +0000 (10:34 +0000)
commit3c5c72a8a75f53a0c75028b7c1a073fa5b8b61cf
treeaa9863e31f6a403633753832a6d8312ac1e08147
parentaff52ba4ccc3b73e4ad4ba7222c1e1ba41d930c8
parent10f6f076b9f683d240a38e205078e20edeaf2331
Merge branch 'CR_1404_gpioconflict_jianlong' into 'jh7110-5.15.y-devel'

CR_1404 dts: starfive: Fix overlay-rgb2hdmi gpio conflict

See merge request sdk/linux!180