Merge tag 'at91-cleanup3' into at91-3.20-soc