Merge branch 'am335x-evm-port-fix' into omap-for-v4.20/dt