brcm63xx: update variant detection patches and fix VARID shift