arm: dts: u8500: Update from Linux ux500-dts-for-v5.15
Update ste-dbx5x0.dtsi, ste-ab8500.dtsi and ste-ab8505.dtsi with the changes made in upstream Linux. They are taken from https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git/ branch "ux500-dts-for-v5.15" (pending merge for Linux 5.15). The only relevant change for U-Boot here is "ARM: dts: ux500: ab8500: Link USB PHY to USB controller node" [1] which links the USB PHY to the USB controller. This is necessary on U-Boot because the PHY driver is implemented as part of the generic PHY subsystem that makes use of these bindings. [1]: https://lore.kernel.org/linux-arm-kernel/20210709182234.47232-1-stephan@gerhold.net/ Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
This commit is contained in:
Stephan Gerhold
Tom Rini
parent
9f78ccf186
commit
1ae43a0e23
|
|
@ -42,15 +42,15 @@
|
|||
|
||||
ab8500-rtc {
|
||||
compatible = "stericsson,ab8500-rtc";
|
||||
interrupts = <17 IRQ_TYPE_LEVEL_HIGH
|
||||
18 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<18 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "60S", "ALARM";
|
||||
};
|
||||
|
||||
gpadc: ab8500-gpadc {
|
||||
compatible = "stericsson,ab8500-gpadc";
|
||||
interrupts = <32 IRQ_TYPE_LEVEL_HIGH
|
||||
39 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <32 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<39 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "HW_CONV_END", "SW_CONV_END";
|
||||
vddadc-supply = <&ab8500_ldo_tvout_reg>;
|
||||
#address-cells = <1>;
|
||||
|
|
@ -122,9 +122,11 @@
|
|||
|
||||
ab8500_temp {
|
||||
compatible = "stericsson,abx500-temp";
|
||||
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "ABX500_TEMP_WARM";
|
||||
io-channels = <&gpadc 0x06>,
|
||||
<&gpadc 0x07>;
|
||||
io-channel-name = "aux1", "aux2";
|
||||
io-channel-names = "aux1", "aux2";
|
||||
};
|
||||
|
||||
ab8500_battery: ab8500_battery {
|
||||
|
|
@ -134,29 +136,77 @@
|
|||
|
||||
ab8500_fg {
|
||||
compatible = "stericsson,ab8500-fg";
|
||||
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<8 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<28 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<27 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<26 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "NCONV_ACCU",
|
||||
"BATT_OVV",
|
||||
"LOW_BAT_F",
|
||||
"CC_INT_CALIB",
|
||||
"CCEOC";
|
||||
battery = <&ab8500_battery>;
|
||||
io-channels = <&gpadc 0x08>;
|
||||
io-channel-name = "main_bat_v";
|
||||
io-channel-names = "main_bat_v";
|
||||
};
|
||||
|
||||
ab8500_btemp {
|
||||
compatible = "stericsson,ab8500-btemp";
|
||||
interrupts = <20 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<80 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<83 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<81 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "BAT_CTRL_INDB",
|
||||
"BTEMP_LOW",
|
||||
"BTEMP_HIGH",
|
||||
"BTEMP_LOW_MEDIUM",
|
||||
"BTEMP_MEDIUM_HIGH";
|
||||
battery = <&ab8500_battery>;
|
||||
io-channels = <&gpadc 0x02>,
|
||||
<&gpadc 0x01>;
|
||||
io-channel-name = "btemp_ball",
|
||||
io-channel-names = "btemp_ball",
|
||||
"bat_ctrl";
|
||||
};
|
||||
|
||||
ab8500_charger {
|
||||
compatible = "stericsson,ab8500-charger";
|
||||
interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<11 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<0 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<107 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<106 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<14 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<15 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<79 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<105 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<104 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<89 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<22 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<21 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<16 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "MAIN_CH_UNPLUG_DET",
|
||||
"MAIN_CHARGE_PLUG_DET",
|
||||
"MAIN_EXT_CH_NOT_OK",
|
||||
"MAIN_CH_TH_PROT_R",
|
||||
"MAIN_CH_TH_PROT_F",
|
||||
"VBUS_DET_F",
|
||||
"VBUS_DET_R",
|
||||
"USB_LINK_STATUS",
|
||||
"USB_CH_TH_PROT_R",
|
||||
"USB_CH_TH_PROT_F",
|
||||
"USB_CHARGER_NOT_OKR",
|
||||
"VBUS_OVV",
|
||||
"CH_WD_EXP",
|
||||
"VBUS_CH_DROP_END";
|
||||
battery = <&ab8500_battery>;
|
||||
vddadc-supply = <&ab8500_ldo_tvout_reg>;
|
||||
io-channels = <&gpadc 0x03>,
|
||||
<&gpadc 0x0a>,
|
||||
<&gpadc 0x09>,
|
||||
<&gpadc 0x0b>;
|
||||
io-channel-name = "main_charger_v",
|
||||
io-channel-names = "main_charger_v",
|
||||
"main_charger_c",
|
||||
"vbus_v",
|
||||
"usb_charger_c";
|
||||
|
|
@ -167,15 +217,15 @@
|
|||
battery = <&ab8500_battery>;
|
||||
};
|
||||
|
||||
ab8500_usb {
|
||||
ab8500_usb: ab8500_usb {
|
||||
compatible = "stericsson,ab8500-usb";
|
||||
interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
|
||||
96 IRQ_TYPE_LEVEL_HIGH
|
||||
14 IRQ_TYPE_LEVEL_HIGH
|
||||
15 IRQ_TYPE_LEVEL_HIGH
|
||||
79 IRQ_TYPE_LEVEL_HIGH
|
||||
74 IRQ_TYPE_LEVEL_HIGH
|
||||
75 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<96 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<14 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<15 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<79 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<74 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<75 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "ID_WAKEUP_R",
|
||||
"ID_WAKEUP_F",
|
||||
"VBUS_DET_F",
|
||||
|
|
@ -188,12 +238,13 @@
|
|||
musb_1v8-supply = <&db8500_vsmps2_reg>;
|
||||
clocks = <&prcmu_clk PRCMU_SYSCLK>;
|
||||
clock-names = "sysclk";
|
||||
#phy-cells = <0>;
|
||||
};
|
||||
|
||||
ab8500-ponkey {
|
||||
compatible = "stericsson,ab8500-poweron-key";
|
||||
interrupts = <6 IRQ_TYPE_LEVEL_HIGH
|
||||
7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
|
||||
};
|
||||
|
||||
|
|
@ -201,7 +252,19 @@
|
|||
compatible = "stericsson,ab8500-sysctrl";
|
||||
};
|
||||
|
||||
ab8500-pwm {
|
||||
ab8500-pwm-1 {
|
||||
compatible = "stericsson,ab8500-pwm";
|
||||
clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
|
||||
clock-names = "intclk";
|
||||
};
|
||||
|
||||
ab8500-pwm-2 {
|
||||
compatible = "stericsson,ab8500-pwm";
|
||||
clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
|
||||
clock-names = "intclk";
|
||||
};
|
||||
|
||||
ab8500-pwm-3 {
|
||||
compatible = "stericsson,ab8500-pwm";
|
||||
clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
|
||||
clock-names = "intclk";
|
||||
|
|
@ -255,8 +318,8 @@
|
|||
|
||||
// supplies to the display/camera
|
||||
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
||||
regulator-min-microvolt = <2500000>;
|
||||
regulator-max-microvolt = <2900000>;
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-boot-on;
|
||||
/* BUG: If turned off MMC will be affected. */
|
||||
regulator-always-on;
|
||||
|
|
@ -324,5 +387,10 @@
|
|||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
};
|
||||
};
|
||||
|
||||
usb_per5@a03e0000 {
|
||||
phys = <&ab8500_usb>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@
|
|||
<&gpadc 0x08>, /* Main battery voltage */
|
||||
<&gpadc 0x09>, /* VBUS */
|
||||
<&gpadc 0x0b>, /* Charger current */
|
||||
<&gpadc 0x0c>; /* Backup battery voltage */
|
||||
<&gpadc 0x0c>, /* Backup battery voltage */
|
||||
<&gpadc 0x0d>; /* Die temperature */
|
||||
};
|
||||
|
||||
soc {
|
||||
|
|
@ -38,16 +39,15 @@
|
|||
|
||||
ab8500-rtc {
|
||||
compatible = "stericsson,ab8500-rtc";
|
||||
interrupts = <17 IRQ_TYPE_LEVEL_HIGH
|
||||
18 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<18 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "60S", "ALARM";
|
||||
};
|
||||
|
||||
gpadc: ab8500-gpadc {
|
||||
compatible = "stericsson,ab8500-gpadc";
|
||||
interrupts = <32 IRQ_TYPE_LEVEL_HIGH
|
||||
39 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "HW_CONV_END", "SW_CONV_END";
|
||||
interrupts = <39 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "SW_CONV_END";
|
||||
vddadc-supply = <&ab8500_ldo_adc_reg>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
|
@ -84,42 +84,93 @@
|
|||
bk_bat_v: channel@0c {
|
||||
reg = <0x0c>;
|
||||
};
|
||||
die_temp: channel@0d {
|
||||
reg = <0x0d>;
|
||||
};
|
||||
usb_id: channel@0e {
|
||||
reg = <0x0e>;
|
||||
};
|
||||
};
|
||||
|
||||
ab8500_battery: ab8500_battery {
|
||||
status = "disabled";
|
||||
stericsson,battery-type = "LIPO";
|
||||
thermistor-on-batctrl;
|
||||
};
|
||||
|
||||
ab8500_fg {
|
||||
status = "disabled";
|
||||
compatible = "stericsson,ab8500-fg";
|
||||
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<8 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<28 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<27 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<26 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "NCONV_ACCU",
|
||||
"BATT_OVV",
|
||||
"LOW_BAT_F",
|
||||
"CC_INT_CALIB",
|
||||
"CCEOC";
|
||||
battery = <&ab8500_battery>;
|
||||
io-channels = <&gpadc 0x08>;
|
||||
io-channel-name = "main_bat_v";
|
||||
io-channel-names = "main_bat_v";
|
||||
};
|
||||
|
||||
ab8500_btemp {
|
||||
status = "disabled";
|
||||
compatible = "stericsson,ab8500-btemp";
|
||||
interrupts = <20 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<80 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<83 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<81 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "BAT_CTRL_INDB",
|
||||
"BTEMP_LOW",
|
||||
"BTEMP_HIGH",
|
||||
"BTEMP_LOW_MEDIUM",
|
||||
"BTEMP_MEDIUM_HIGH";
|
||||
battery = <&ab8500_battery>;
|
||||
io-channels = <&gpadc 0x02>,
|
||||
<&gpadc 0x01>;
|
||||
io-channel-name = "btemp_ball",
|
||||
io-channel-names = "btemp_ball",
|
||||
"bat_ctrl";
|
||||
};
|
||||
|
||||
ab8500_charger {
|
||||
status = "disabled";
|
||||
compatible = "stericsson,ab8500-charger";
|
||||
interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<11 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<0 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<107 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<106 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<14 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<15 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<79 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<105 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<104 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<89 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<22 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<21 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<16 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "MAIN_CH_UNPLUG_DET",
|
||||
"MAIN_CHARGE_PLUG_DET",
|
||||
"MAIN_EXT_CH_NOT_OK",
|
||||
"MAIN_CH_TH_PROT_R",
|
||||
"MAIN_CH_TH_PROT_F",
|
||||
"VBUS_DET_F",
|
||||
"VBUS_DET_R",
|
||||
"USB_LINK_STATUS",
|
||||
"USB_CH_TH_PROT_R",
|
||||
"USB_CH_TH_PROT_F",
|
||||
"USB_CHARGER_NOT_OKR",
|
||||
"VBUS_OVV",
|
||||
"CH_WD_EXP",
|
||||
"VBUS_CH_DROP_END";
|
||||
battery = <&ab8500_battery>;
|
||||
vddadc-supply = <&ab8500_ldo_adc_reg>;
|
||||
io-channels = <&gpadc 0x09>,
|
||||
<&gpadc 0x0b>;
|
||||
io-channel-name = "vbus_v",
|
||||
io-channel-names = "vbus_v",
|
||||
"usb_charger_c";
|
||||
};
|
||||
|
||||
|
|
@ -131,13 +182,13 @@
|
|||
|
||||
ab8500_usb: ab8500_usb {
|
||||
compatible = "stericsson,ab8500-usb";
|
||||
interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
|
||||
96 IRQ_TYPE_LEVEL_HIGH
|
||||
14 IRQ_TYPE_LEVEL_HIGH
|
||||
15 IRQ_TYPE_LEVEL_HIGH
|
||||
79 IRQ_TYPE_LEVEL_HIGH
|
||||
74 IRQ_TYPE_LEVEL_HIGH
|
||||
75 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<96 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<14 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<15 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<79 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<74 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<75 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "ID_WAKEUP_R",
|
||||
"ID_WAKEUP_F",
|
||||
"VBUS_DET_F",
|
||||
|
|
@ -150,12 +201,13 @@
|
|||
musb_1v8-supply = <&db8500_vsmps2_reg>;
|
||||
clocks = <&prcmu_clk PRCMU_SYSCLK>;
|
||||
clock-names = "sysclk";
|
||||
#phy-cells = <0>;
|
||||
};
|
||||
|
||||
ab8500-ponkey {
|
||||
compatible = "stericsson,ab8500-poweron-key";
|
||||
interrupts = <6 IRQ_TYPE_LEVEL_HIGH
|
||||
7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
|
||||
};
|
||||
|
||||
|
|
@ -271,5 +323,10 @@
|
|||
vana-supply = <&ab8500_ldo_ana_reg>;
|
||||
};
|
||||
};
|
||||
|
||||
usb_per5@a03e0000 {
|
||||
phys = <&ab8500_usb>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@
|
|||
reg = <0x80150000 0x2000>;
|
||||
};
|
||||
|
||||
L2: l2-cache {
|
||||
L2: cache-controller {
|
||||
compatible = "arm,pl310-cache";
|
||||
reg = <0xa0412000 0x1000>;
|
||||
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
|
@ -883,7 +883,7 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi0_per1@80126000 {
|
||||
mmc@80126000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80126000 0x1000>;
|
||||
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
|
@ -899,7 +899,7 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi1_per2@80118000 {
|
||||
mmc@80118000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80118000 0x1000>;
|
||||
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
|
@ -915,7 +915,7 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi2_per3@80005000 {
|
||||
mmc@80005000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80005000 0x1000>;
|
||||
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
|
@ -931,7 +931,7 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi3_per2@80119000 {
|
||||
mmc@80119000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80119000 0x1000>;
|
||||
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
|
@ -947,7 +947,7 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi4_per2@80114000 {
|
||||
mmc@80114000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80114000 0x1000>;
|
||||
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
|
@ -963,7 +963,7 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi5_per3@80008000 {
|
||||
mmc@80008000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80008000 0x1000>;
|
||||
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
|
|
|||
Loading…
Reference in New Issue