enable-method = "psci";
                        clock-frequency = <2000000000>;
                        capacity-dmips-mhz = <382>;
-                       cpu-idle-states = <&cpu_off_l &cluster_off_l>;
+                       cpu-idle-states = <&cpu_ret_l &cpu_off_l>;
                        i-cache-size = <32768>;
                        i-cache-line-size = <64>;
                        i-cache-sets = <128>;
                        enable-method = "psci";
                        clock-frequency = <2000000000>;
                        capacity-dmips-mhz = <382>;
-                       cpu-idle-states = <&cpu_off_l &cluster_off_l>;
+                       cpu-idle-states = <&cpu_ret_l &cpu_off_l>;
                        i-cache-size = <32768>;
                        i-cache-line-size = <64>;
                        i-cache-sets = <128>;
                        enable-method = "psci";
                        clock-frequency = <2000000000>;
                        capacity-dmips-mhz = <382>;
-                       cpu-idle-states = <&cpu_off_l &cluster_off_l>;
+                       cpu-idle-states = <&cpu_ret_l &cpu_off_l>;
                        i-cache-size = <32768>;
                        i-cache-line-size = <64>;
                        i-cache-sets = <128>;
                        enable-method = "psci";
                        clock-frequency = <2000000000>;
                        capacity-dmips-mhz = <382>;
-                       cpu-idle-states = <&cpu_off_l &cluster_off_l>;
+                       cpu-idle-states = <&cpu_ret_l &cpu_off_l>;
                        i-cache-size = <32768>;
                        i-cache-line-size = <64>;
                        i-cache-sets = <128>;
                        enable-method = "psci";
                        clock-frequency = <2000000000>;
                        capacity-dmips-mhz = <382>;
-                       cpu-idle-states = <&cpu_off_l &cluster_off_l>;
+                       cpu-idle-states = <&cpu_ret_l &cpu_off_l>;
                        i-cache-size = <32768>;
                        i-cache-line-size = <64>;
                        i-cache-sets = <128>;
                        enable-method = "psci";
                        clock-frequency = <2000000000>;
                        capacity-dmips-mhz = <382>;
-                       cpu-idle-states = <&cpu_off_l &cluster_off_l>;
+                       cpu-idle-states = <&cpu_ret_l &cpu_off_l>;
                        i-cache-size = <32768>;
                        i-cache-line-size = <64>;
                        i-cache-sets = <128>;
                        enable-method = "psci";
                        clock-frequency = <2050000000>;
                        capacity-dmips-mhz = <1024>;
-                       cpu-idle-states = <&cpu_off_b &cluster_off_b>;
+                       cpu-idle-states = <&cpu_ret_b &cpu_off_b>;
                        i-cache-size = <65536>;
                        i-cache-line-size = <64>;
                        i-cache-sets = <256>;
                        enable-method = "psci";
                        clock-frequency = <2050000000>;
                        capacity-dmips-mhz = <1024>;
-                       cpu-idle-states = <&cpu_off_b &cluster_off_b>;
+                       cpu-idle-states = <&cpu_ret_b &cpu_off_b>;
                        i-cache-size = <65536>;
                        i-cache-line-size = <64>;
                        i-cache-sets = <256>;
                idle-states {
                        entry-method = "psci";
 
-                       cpu_off_l: cpu-off-l {
+                       cpu_ret_l: cpu-retention-l {
                                compatible = "arm,idle-state";
                                arm,psci-suspend-param = <0x00010001>;
                                local-timer-stop;
                                min-residency-us = <1600>;
                        };
 
-                       cpu_off_b: cpu-off-b {
+                       cpu_ret_b: cpu-retention-b {
                                compatible = "arm,idle-state";
                                arm,psci-suspend-param = <0x00010001>;
                                local-timer-stop;
                                min-residency-us = <1400>;
                        };
 
-                       cluster_off_l: cluster-off-l {
+                       cpu_off_l: cpu-off-l {
                                compatible = "arm,idle-state";
                                arm,psci-suspend-param = <0x01010001>;
                                local-timer-stop;
                                min-residency-us = <2100>;
                        };
 
-                       cluster_off_b: cluster-off-b {
+                       cpu_off_b: cpu-off-b {
                                compatible = "arm,idle-state";
                                arm,psci-suspend-param = <0x01010001>;
                                local-timer-stop;