[PATCH 1/1] Squashed 'dts/upstream/' changes from 20e0f0897ea2..3347eecf3408