Merge "ARM: dtsi: renaming the driver name and variable name in dt"