Skip to content

Commit 5d080aa

Browse files
lokeshvutlatmlind
lokeshvutla
authored and
tmlind
committed
ARM: dts: dra72: Add separate dtsi for tps65917
dra72-evm-common.dtsi consolidates dra72-evm.dts and dra72-evm-revc.dts which also include tps65917 pmic support as both the evms uses the same pmic. But, dra71-evm has mostly similar features with a different pmic. In order to exploit dra72-evm-common.dtsi, creating a separate dtsi for tps65915 support and including it in respective board files. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
1 parent e9a05fb commit 5d080aa

File tree

4 files changed

+154
-143
lines changed

4 files changed

+154
-143
lines changed

‎arch/arm/boot/dts/dra72-evm-common.dtsi

Lines changed: 0 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -214,123 +214,6 @@
214214
status = "okay";
215215
clock-frequency = <400000>;
216216

217-
tps65917: tps65917@58 {
218-
compatible = "ti,tps65917";
219-
reg = <0x58>;
220-
221-
interrupts = <GIC_SPI 2 IRQ_TYPE_NONE>; /* IRQ_SYS_1N */
222-
interrupt-controller;
223-
#interrupt-cells = <2>;
224-
225-
ti,system-power-controller;
226-
227-
tps65917_pmic {
228-
compatible = "ti,tps65917-pmic";
229-
230-
smps1-in-supply = <&vsys_3v3>;
231-
smps2-in-supply = <&vsys_3v3>;
232-
smps3-in-supply = <&vsys_3v3>;
233-
smps4-in-supply = <&vsys_3v3>;
234-
smps5-in-supply = <&vsys_3v3>;
235-
ldo1-in-supply = <&vsys_3v3>;
236-
ldo2-in-supply = <&vsys_3v3>;
237-
ldo3-in-supply = <&vsys_3v3>;
238-
ldo4-in-supply = <&evm_5v0>;
239-
ldo5-in-supply = <&vsys_3v3>;
240-
241-
tps65917_regulators: regulators {
242-
smps1_reg: smps1 {
243-
/* VDD_MPU */
244-
regulator-name = "smps1";
245-
regulator-min-microvolt = <850000>;
246-
regulator-max-microvolt = <1250000>;
247-
regulator-always-on;
248-
regulator-boot-on;
249-
};
250-
251-
smps2_reg: smps2 {
252-
/* VDD_CORE */
253-
regulator-name = "smps2";
254-
regulator-min-microvolt = <850000>;
255-
regulator-max-microvolt = <1150000>;
256-
regulator-boot-on;
257-
regulator-always-on;
258-
};
259-
260-
smps3_reg: smps3 {
261-
/* VDD_GPU IVA DSPEVE */
262-
regulator-name = "smps3";
263-
regulator-min-microvolt = <850000>;
264-
regulator-max-microvolt = <1250000>;
265-
regulator-boot-on;
266-
regulator-always-on;
267-
};
268-
269-
smps4_reg: smps4 {
270-
/* VDDS1V8 */
271-
regulator-name = "smps4";
272-
regulator-min-microvolt = <1800000>;
273-
regulator-max-microvolt = <1800000>;
274-
regulator-always-on;
275-
regulator-boot-on;
276-
};
277-
278-
smps5_reg: smps5 {
279-
/* VDD_DDR */
280-
regulator-name = "smps5";
281-
regulator-min-microvolt = <1350000>;
282-
regulator-max-microvolt = <1350000>;
283-
regulator-boot-on;
284-
regulator-always-on;
285-
};
286-
287-
ldo1_reg: ldo1 {
288-
/* LDO1_OUT --> SDIO */
289-
regulator-name = "ldo1";
290-
regulator-min-microvolt = <1800000>;
291-
regulator-max-microvolt = <3300000>;
292-
regulator-always-on;
293-
regulator-boot-on;
294-
regulator-allow-bypass;
295-
};
296-
297-
ldo3_reg: ldo3 {
298-
/* VDDA_1V8_PHY */
299-
regulator-name = "ldo3";
300-
regulator-min-microvolt = <1800000>;
301-
regulator-max-microvolt = <1800000>;
302-
regulator-boot-on;
303-
regulator-always-on;
304-
};
305-
306-
ldo5_reg: ldo5 {
307-
/* VDDA_1V8_PLL */
308-
regulator-name = "ldo5";
309-
regulator-min-microvolt = <1800000>;
310-
regulator-max-microvolt = <1800000>;
311-
regulator-always-on;
312-
regulator-boot-on;
313-
};
314-
315-
ldo4_reg: ldo4 {
316-
/* VDDA_3V_USB: VDDA_USBHS33 */
317-
regulator-name = "ldo4";
318-
regulator-min-microvolt = <3300000>;
319-
regulator-max-microvolt = <3300000>;
320-
regulator-boot-on;
321-
};
322-
};
323-
};
324-
325-
tps65917_power_button {
326-
compatible = "ti,palmas-pwrbutton";
327-
interrupt-parent = <&tps65917>;
328-
interrupts = <1 IRQ_TYPE_NONE>;
329-
wakeup-source;
330-
ti,palmas-long-press-seconds = <6>;
331-
};
332-
};
333-
334217
pcf_gpio_21: gpio@21 {
335218
compatible = "ti,pcf8575", "nxp,pcf8575";
336219
reg = <0x21>;
@@ -480,14 +363,6 @@
480363
};
481364
};
482365

483-
&usb2_phy1 {
484-
phy-supply = <&ldo4_reg>;
485-
};
486-
487-
&usb2_phy2 {
488-
phy-supply = <&ldo4_reg>;
489-
};
490-
491366
&omap_dwc3_1 {
492367
extcon = <&extcon_usb1>;
493368
};
@@ -509,7 +384,6 @@
509384
pinctrl-names = "default";
510385
pinctrl-0 = <&mmc1_pins_default>;
511386
vmmc-supply = <&evm_3v3_sd>;
512-
vmmc_aux-supply = <&ldo1_reg>;
513387
bus-width = <4>;
514388
/*
515389
* SDCD signal is not being used here - using the fact that GPIO mode
@@ -606,8 +480,6 @@
606480

607481
&dss {
608482
status = "ok";
609-
610-
vdda_video-supply = <&ldo5_reg>;
611483
};
612484

613485
&hdmi {

‎arch/arm/boot/dts/dra72-evm-revc.dts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,22 @@
1717
};
1818
};
1919

20-
&tps65917_regulators {
21-
ldo2_reg: ldo2 {
22-
/* LDO2_OUT --> VDDA_1V8_PHY2 */
23-
regulator-name = "ldo2";
24-
regulator-min-microvolt = <1800000>;
25-
regulator-max-microvolt = <1800000>;
26-
regulator-always-on;
27-
regulator-boot-on;
20+
&i2c1 {
21+
tps65917: tps65917@58 {
22+
reg = <0x58>;
23+
24+
interrupts = <GIC_SPI 2 IRQ_TYPE_NONE>; /* IRQ_SYS_1N */
2825
};
2926
};
3027

28+
#include "dra72-evm-tps65917.dtsi"
29+
30+
&ldo2_reg {
31+
/* LDO2_OUT --> VDDA_1V8_PHY2 */
32+
regulator-always-on;
33+
regulator-boot-on;
34+
};
35+
3136
&hdmi {
3237
vdda-supply = <&ldo2_reg>;
3338
};

‎arch/arm/boot/dts/dra72-evm-tps65917.dtsi

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
/*
2+
* Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/
3+
*
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License version 2 as
6+
* published by the Free Software Foundation.
7+
*/
8+
9+
/*
10+
* Integrated Power Management Chip
11+
* http://www.ti.com/lit/ds/symlink/tps65917-q1.pdf
12+
*/
13+
14+
&tps65917 {
15+
compatible = "ti,tps65917";
16+
17+
interrupt-controller;
18+
#interrupt-cells = <2>;
19+
20+
ti,system-power-controller;
21+
22+
tps65917_pmic {
23+
compatible = "ti,tps65917-pmic";
24+
25+
smps1-in-supply = <&vsys_3v3>;
26+
smps2-in-supply = <&vsys_3v3>;
27+
smps3-in-supply = <&vsys_3v3>;
28+
smps4-in-supply = <&vsys_3v3>;
29+
smps5-in-supply = <&vsys_3v3>;
30+
ldo1-in-supply = <&vsys_3v3>;
31+
ldo2-in-supply = <&vsys_3v3>;
32+
ldo3-in-supply = <&vsys_3v3>;
33+
ldo4-in-supply = <&evm_5v0>;
34+
ldo5-in-supply = <&vsys_3v3>;
35+
36+
tps65917_regulators: regulators {
37+
smps1_reg: smps1 {
38+
/* VDD_MPU */
39+
regulator-name = "smps1";
40+
regulator-min-microvolt = <850000>;
41+
regulator-max-microvolt = <1250000>;
42+
regulator-always-on;
43+
regulator-boot-on;
44+
};
45+
46+
smps2_reg: smps2 {
47+
/* VDD_CORE */
48+
regulator-name = "smps2";
49+
regulator-min-microvolt = <850000>;
50+
regulator-max-microvolt = <1150000>;
51+
regulator-boot-on;
52+
regulator-always-on;
53+
};
54+
55+
smps3_reg: smps3 {
56+
/* VDD_GPU IVA DSPEVE */
57+
regulator-name = "smps3";
58+
regulator-min-microvolt = <850000>;
59+
regulator-max-microvolt = <1250000>;
60+
regulator-boot-on;
61+
regulator-always-on;
62+
};
63+
64+
smps4_reg: smps4 {
65+
/* VDDS1V8 */
66+
regulator-name = "smps4";
67+
regulator-min-microvolt = <1800000>;
68+
regulator-max-microvolt = <1800000>;
69+
regulator-always-on;
70+
regulator-boot-on;
71+
};
72+
73+
smps5_reg: smps5 {
74+
/* VDD_DDR */
75+
regulator-name = "smps5";
76+
regulator-min-microvolt = <1350000>;
77+
regulator-max-microvolt = <1350000>;
78+
regulator-boot-on;
79+
regulator-always-on;
80+
};
81+
82+
ldo1_reg: ldo1 {
83+
/* LDO1_OUT --> SDIO */
84+
regulator-name = "ldo1";
85+
regulator-min-microvolt = <1800000>;
86+
regulator-max-microvolt = <3300000>;
87+
regulator-always-on;
88+
regulator-boot-on;
89+
regulator-allow-bypass;
90+
};
91+
92+
ldo2_reg: ldo2 {
93+
regulator-name = "ldo2";
94+
regulator-min-microvolt = <1800000>;
95+
regulator-max-microvolt = <1800000>;
96+
regulator-allow-bypass;
97+
};
98+
99+
ldo3_reg: ldo3 {
100+
/* VDDA_1V8_PHY */
101+
regulator-name = "ldo3";
102+
regulator-min-microvolt = <1800000>;
103+
regulator-max-microvolt = <1800000>;
104+
regulator-boot-on;
105+
regulator-always-on;
106+
};
107+
108+
ldo5_reg: ldo5 {
109+
/* VDDA_1V8_PLL */
110+
regulator-name = "ldo5";
111+
regulator-min-microvolt = <1800000>;
112+
regulator-max-microvolt = <1800000>;
113+
regulator-always-on;
114+
regulator-boot-on;
115+
};
116+
117+
ldo4_reg: ldo4 {
118+
/* VDDA_3V_USB: VDDA_USBHS33 */
119+
regulator-name = "ldo4";
120+
regulator-min-microvolt = <3300000>;
121+
regulator-max-microvolt = <3300000>;
122+
regulator-boot-on;
123+
};
124+
};
125+
};
126+
127+
tps65917_power_button {
128+
compatible = "ti,palmas-pwrbutton";
129+
interrupt-parent = <&tps65917>;
130+
interrupts = <1 IRQ_TYPE_NONE>;
131+
wakeup-source;
132+
ti,palmas-long-press-seconds = <6>;
133+
};
134+
};

‎arch/arm/boot/dts/dra72-evm.dts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
};
1616
};
1717

18-
&tps65917_regulators {
19-
ldo2_reg: ldo2 {
20-
/* LDO2_OUT --> TP1017 (UNUSED) */
21-
regulator-name = "ldo2";
22-
regulator-min-microvolt = <1800000>;
23-
regulator-max-microvolt = <3300000>;
24-
regulator-allow-bypass;
18+
&i2c1 {
19+
tps65917: tps65917@58 {
20+
reg = <0x58>;
21+
22+
interrupts = <GIC_SPI 2 IRQ_TYPE_NONE>; /* IRQ_SYS_1N */
2523
};
2624
};
2725

26+
#include "dra72-evm-tps65917.dtsi"
27+
2828
&hdmi {
2929
vdda-supply = <&ldo3_reg>;
3030
};

0 commit comments

Comments
 (0)