Merge tag 'for-linus-5.15-1' of git://github.com/cminyard/linux-ipmi

[linux-2.6-microblaze.git] / arch / arm / boot / dts / ste-ab8500.dtsi

diff --git a/arch/arm/boot/dts/ste-ab8500.dtsi b/arch/arm/boot/dts/ste-ab8500.dtsi
index d0fe3f9..9baf927 100644 (file)
--- a/arch/arm/boot/dts/ste-ab8500.dtsi
+++ b/arch/arm/boot/dts/ste-ab8500.dtsi
@@ -58,46 +58,46 @@
                                        #io-channel-cells = <1>;
 
                                        /* GPADC channels */
-                                       bat_ctrl: channel@01 {
+                                       bat_ctrl: channel@1 {
                                                reg = <0x01>;
                                        };
-                                       btemp_ball: channel@02 {
+                                       btemp_ball: channel@2 {
                                                reg = <0x02>;
                                        };
-                                       main_charger_v: channel@03 {
+                                       main_charger_v: channel@3 {
                                                reg = <0x03>;
                                        };
-                                       acc_detect1: channel@04 {
+                                       acc_detect1: channel@4 {
                                                reg = <0x04>;
                                        };
-                                       acc_detect2: channel@05 {
+                                       acc_detect2: channel@5 {
                                                reg = <0x05>;
                                        };
-                                       adc_aux1: channel@06 {
+                                       adc_aux1: channel@6 {
                                                reg = <0x06>;
                                        };
-                                       adc_aux2: channel@07 {
+                                       adc_aux2: channel@7 {
                                                reg = <0x07>;
                                        };
-                                       main_batt_v: channel@08 {
+                                       main_batt_v: channel@8 {
                                                reg = <0x08>;
                                        };
-                                       vbus_v: channel@09 {
+                                       vbus_v: channel@9 {
                                                reg = <0x09>;
                                        };
-                                       main_charger_c: channel@0a {
+                                       main_charger_c: channel@a {
                                                reg = <0x0a>;
                                        };
-                                       usb_charger_c: channel@0b {
+                                       usb_charger_c: channel@b {
                                                reg = <0x0b>;
                                        };
-                                       bk_bat_v: channel@0c {
+                                       bk_bat_v: channel@c {
                                                reg = <0x0c>;
                                        };
-                                       die_temp: channel@0d {
+                                       die_temp: channel@d {
                                                reg = <0x0d>;
                                        };
-                                       usb_id: channel@0e {
+                                       usb_id: channel@e {
                                                reg = <0x0e>;
                                        };
                                        xtal_temp: channel@12 {
@@ -217,7 +217,7 @@
                                        battery         = <&ab8500_battery>;
                                };
 
-                               ab8500_usb {
+                               ab8500_usb: ab8500_usb {
                                        compatible = "stericsson,ab8500-usb";
                                        interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,
                                                     <96 IRQ_TYPE_LEVEL_HIGH>,
@@ -238,6 +238,7 @@
                                        musb_1v8-supply = <&db8500_vsmps2_reg>;
                                        clocks = <&prcmu_clk PRCMU_SYSCLK>;
                                        clock-names = "sysclk";
+                                       #phy-cells = <0>;
                                };
 
                                ab8500-ponkey {
@@ -386,5 +387,10 @@
                                vana-supply = <&ab8500_ldo_ana_reg>;
                        };
                };
+
+               usb_per5@a03e0000 {
+                       phys = <&ab8500_usb>;
+                       phy-names = "usb";
+               };
        };
 };