Mark's DTS patches after resolving conflicts with future DT patches

Signed-off-by: Joel Fernandes <joelf@ti.com>