Skip to content

Commit 5a256cf

Browse files
committed
Merge tag 'ux500-dts-soc-for-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into soc/dt
More Ux500 device tree updates for v6.8 The HREF520 reference design had the wrong analog baseband defined causing a boot regression. Was AB8500, but this board has AB8505. Rearrange the device trees to make it possible to define a different AB and slot it in. * tag 'ux500-dts-soc-for-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: dts: ux500-href: Switch HREF520 to AB8505 ARM: dts: ux500-href: Push AB8500 config out ARM: dts: ux500-href: Push AB8500 inclusion to the top Link: https://lore.kernel.org/r/CACRpkdZ9wCV7oohF2KX6MFwmuSPR_i7et8O5SH=op6gyQ4mOvQ@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 6af50f5 + 4ecae2a commit 5a256cf

9 files changed

Lines changed: 543 additions & 56 deletions

arch/arm/boot/dts/st/ste-href-ab8500.dtsi

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,54 @@
99
soc {
1010
prcmu@80157000 {
1111
ab8500 {
12+
phy {
13+
pinctrl-names = "default", "sleep";
14+
pinctrl-0 = <&usb_a_1_default>;
15+
pinctrl-1 = <&usb_a_1_sleep>;
16+
};
17+
18+
regulator {
19+
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
20+
regulator-name = "V-DISPLAY";
21+
};
22+
23+
ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
24+
regulator-name = "V-eMMC1";
25+
};
26+
27+
ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
28+
regulator-name = "V-MMC-SD";
29+
};
30+
31+
ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
32+
regulator-name = "V-INTCORE";
33+
};
34+
35+
ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
36+
regulator-name = "V-TVOUT";
37+
};
38+
39+
ab8500_ldo_audio_reg: ab8500_ldo_audio {
40+
regulator-name = "V-AUD";
41+
};
42+
43+
ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
44+
regulator-name = "V-AMIC1";
45+
};
46+
47+
ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
48+
regulator-name = "V-AMIC2";
49+
};
50+
51+
ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
52+
regulator-name = "V-DMIC";
53+
};
54+
55+
ab8500_ldo_ana_reg: ab8500_ldo_ana {
56+
regulator-name = "V-CSI/DSI";
57+
};
58+
};
59+
1260
gpio {
1361
/* Hog a few default settings */
1462
pinctrl-names = "default";

0 commit comments

Comments
 (0)