3.12: beaglebone: rebase patchset with what is in Benoit Cousson for_3.13/dts branch

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