Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx7d-nitrogen7.dts

diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts
index 52167298984d72e387741cb2a49f2b9db8226016..70c53e50b2fcd2cd9cc4d1cfb91d43faa1dd588c 100644 (file)
--- a/arch/arm/boot/dts/imx7d-nitrogen7.dts
+++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts
@@ -49,8 +49,8 @@
        compatible = "boundary,imx7d-nitrogen7", "fsl,imx7d";
 
        aliases {
-               fb_lcd = &lcdif;
-               t_lcd = &t_lcd;
+               fb-lcd = &lcdif;
+               t-lcd = &t_lcd;
        };
 
        memory@80000000 {
@@ -144,7 +144,7 @@
 };
 
 &cpu0 {
-       arm-supply = <&sw1a_reg>;
+       cpu-supply = <&sw1a_reg>;
 };
 
 &fec1 {