merge to ti 3.14.18, note im probally going to maintaine the dts somewhere, the rebase is ugly...

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>