These devices use the same dtb, I expected them to have different firmware, but according to #2703 it works, so we can combine them
This also makes naming consistent with lenovo-21bx.
closes #2709