Merge branch 'ili2xxx-touchscreen' into next

Bring in improvements to ili2xxx driver, including support for
2117A/2118A controllers.