> Perhaps is it better that I resent a version which use of_device_get_match_data() ?

I'd like that for both of your patches anyhow. It is more concise and
better to read IMO.