Skip to content

Commit 5a793f8

Browse files
arndbarndb
committed
Merge tag 'omap-for-v6.17/dt-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/dt
arm: dts: OMAP updates for v6.17 - new board support: Seeed BeagleBone Green Eco - misc. fixups / cleanups * tag 'omap-for-v6.17/dt-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap: arm: dts: ti: omap: Fixup pinheader typo ARM: dts: am335x-pdu001: Fix RS-485 transceiver switching arm: dts: omap: Add support for BeagleBone Green Eco board dt-bindings: omap: Add Seeed BeagleBone Green Eco arm: dts: omap: am335x-bone-common: Rename tps to generic pmic node Revert "ARM: dts: Update pcie ranges for dra7" ARM: dts: omap: am335x: Use non-deprecated rts-gpios Link: https://lore.kernel.org/r/7h7c0gxczy.fsf@baylibre.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 96a96de + a3a4be3 commit 5a793f8

8 files changed

Lines changed: 190 additions & 25 deletions

File tree

‎Documentation/devicetree/bindings/arm/ti/omap.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ properties:
107107
- compulab,cm-t335
108108
- moxa,uc-8100-me-t
109109
- novatech,am335x-lxm
110+
- seeed,am335x-bone-green-eco
110111
- ti,am335x-bone
111112
- ti,am335x-evm
112113
- ti,am3359-icev2

‎arch/arm/boot/dts/ti/omap/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
9393
am335x-boneblue.dtb \
9494
am335x-bonegreen.dtb \
9595
am335x-bonegreen-wireless.dtb \
96+
am335x-bonegreen-eco.dtb \
9697
am335x-chiliboard.dtb \
9798
am335x-cm-t335.dtb \
9899
am335x-evm.dtb \

‎arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
status = "okay";
213213
clock-frequency = <400000>;
214214

215-
tps: tps@24 {
215+
tps: pmic@24 {
216216
reg = <0x24>;
217217
};
218218

‎arch/arm/boot/dts/ti/omap/am335x-boneblack.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"P9_18 [spi0_d1]",
3636
"P9_17 [spi0_cs0]",
3737
"[mmc0_cd]",
38-
"P8_42A [ecappwm0]",
38+
"P9_42A [ecappwm0]",
3939
"P8_35 [lcd d12]",
4040
"P8_33 [lcd d13]",
4141
"P8_31 [lcd d14]",

‎arch/arm/boot/dts/ti/omap/am335x-bonegreen-eco.dts‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
/*
3+
* Copyright (C) 2025 Bootlin
4+
*/
5+
/dts-v1/;
6+
7+
#include "am33xx.dtsi"
8+
#include "am335x-bone-common.dtsi"
9+
#include "am335x-bonegreen-common.dtsi"
10+
#include <dt-bindings/net/ti-dp83867.h>
11+
12+
/ {
13+
model = "Seeed Studio BeagleBone Green Eco";
14+
compatible = "seeed,am335x-bone-green-eco", "ti,am33xx";
15+
16+
cpus {
17+
cpu@0 {
18+
cpu0-supply = <&buck1>;
19+
};
20+
};
21+
22+
sys_5v: regulator-sys-5v {
23+
compatible = "regulator-fixed";
24+
regulator-name = "sys_5v";
25+
regulator-min-microvolt = <5000000>;
26+
regulator-max-microvolt = <5000000>;
27+
regulator-always-on;
28+
};
29+
30+
v3v3: regulator-v3v3 {
31+
compatible = "regulator-fixed";
32+
regulator-name = "v3v3";
33+
regulator-always-on;
34+
};
35+
};
36+
37+
&usb0 {
38+
interrupts-extended = <&intc 18>;
39+
interrupt-names = "mc";
40+
};
41+
42+
&baseboard_eeprom {
43+
vcc-supply = <&v3v3>;
44+
};
45+
46+
&i2c0 {
47+
/delete-node/ pmic@24;
48+
49+
tps65214: pmic@30 {
50+
compatible = "ti,tps65214";
51+
reg = <0x30>;
52+
buck1-supply = <&sys_5v>;
53+
buck2-supply = <&sys_5v>;
54+
buck3-supply = <&sys_5v>;
55+
ldo1-supply = <&sys_5v>;
56+
ldo2-supply = <&sys_5v>;
57+
58+
interrupt-parent = <&intc>;
59+
interrupts = <7>;
60+
pinctrl-0 = <&pmic_irq_pins_default>;
61+
62+
regulators {
63+
buck1: buck1 {
64+
regulator-name = "vdd_mpu";
65+
regulator-min-microvolt = <925000>;
66+
regulator-max-microvolt = <1298500>;
67+
regulator-boot-on;
68+
regulator-always-on;
69+
};
70+
71+
buck2: buck2 {
72+
regulator-name = "vdd_core";
73+
regulator-min-microvolt = <925000>;
74+
regulator-max-microvolt = <1150000>;
75+
regulator-boot-on;
76+
regulator-always-on;
77+
};
78+
79+
buck3: buck3 {
80+
regulator-name = "vdds_ddr";
81+
regulator-min-microvolt = <1350000>;
82+
regulator-max-microvolt = <1350000>;
83+
regulator-always-on;
84+
};
85+
86+
ldo1_reg: ldo1 {
87+
regulator-name = "vdd_1v8_1";
88+
regulator-min-microvolt = <1800000>;
89+
regulator-max-microvolt = <1800000>;
90+
regulator-boot-on;
91+
regulator-always-on;
92+
};
93+
94+
ldo2_reg: ldo2 {
95+
regulator-name = "vdd_1v8_2";
96+
regulator-min-microvolt = <1800000>;
97+
regulator-max-microvolt = <1800000>;
98+
regulator-boot-on;
99+
regulator-always-on;
100+
};
101+
};
102+
};
103+
};
104+
105+
&cpsw_port1 {
106+
phy-mode = "rgmii-id";
107+
phy-handle = <&dp83867_0>;
108+
ti,dual-emac-pvid = <1>;
109+
};
110+
111+
&mac_sw {
112+
pinctrl-0 = <&cpsw_b_default>;
113+
pinctrl-1 = <&cpsw_b_sleep>;
114+
};
115+
116+
&davinci_mdio_sw {
117+
/delete-node/ ethernet-phy@0;
118+
119+
dp83867_0: ethernet-phy@0 {
120+
reg = <0>;
121+
ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_50_NS>;
122+
ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_50_NS>;
123+
ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
124+
ti,min-output-impedance;
125+
ti,dp83867-rxctrl-strap-quirk;
126+
};
127+
};
128+
129+
&am33xx_pinmux {
130+
cpsw_b_default: cpsw-b-default-pins {
131+
pinctrl-single,pins = <
132+
AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2)
133+
AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE2)
134+
AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE2)
135+
AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE2)
136+
AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLDOWN, MUX_MODE2)
137+
AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_OUTPUT_PULLDOWN, MUX_MODE2)
138+
AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE2)
139+
AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_OUTPUT_PULLDOWN, MUX_MODE2)
140+
AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLDOWN, MUX_MODE2)
141+
AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLDOWN, MUX_MODE2)
142+
AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLDOWN, MUX_MODE2)
143+
AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLDOWN, MUX_MODE2)
144+
>;
145+
};
146+
147+
cpsw_b_sleep: cpsw-b-sleep-pins {
148+
pinctrl-single,pins = <
149+
AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
150+
AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE7)
151+
AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7)
152+
AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7)
153+
AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_INPUT_PULLDOWN, MUX_MODE7)
154+
AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_INPUT_PULLDOWN, MUX_MODE7)
155+
AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_INPUT_PULLDOWN, MUX_MODE7)
156+
AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_INPUT_PULLDOWN, MUX_MODE7)
157+
AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLDOWN, MUX_MODE7)
158+
AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLDOWN, MUX_MODE7)
159+
AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLDOWN, MUX_MODE7)
160+
AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLDOWN, MUX_MODE7)
161+
>;
162+
};
163+
164+
pmic_irq_pins_default: pmic-irq-default-pins {
165+
pinctrl-single,pins = <
166+
AM33XX_IOPAD(AM335X_PIN_NNMI, PIN_INPUT_PULLUP | MUX_MODE0)
167+
>;
168+
};
169+
};

‎arch/arm/boot/dts/ti/omap/am335x-nano.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
pinctrl-names = "default";
168168
pinctrl-0 = <&uart1_pins>;
169169
status = "okay";
170-
rts-gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
170+
rts-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
171171
rs485-rts-active-high;
172172
rs485-rx-during-tx;
173173
rs485-rts-delay = <1 1>;
@@ -178,7 +178,7 @@
178178
pinctrl-names = "default";
179179
pinctrl-0 = <&uart2_pins>;
180180
status = "okay";
181-
rts-gpio = <&gpio2 15 GPIO_ACTIVE_HIGH>;
181+
rts-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
182182
rs485-rts-active-high;
183183
rs485-rts-delay = <1 1>;
184184
linux,rs485-enabled-at-boot-time;
@@ -187,7 +187,7 @@
187187
&uart3 {
188188
pinctrl-names = "default";
189189
pinctrl-0 = <&uart3_pins>;
190-
rts-gpio = <&gpio2 17 GPIO_ACTIVE_HIGH>;
190+
rts-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>;
191191
rs485-rts-active-high;
192192
rs485-rx-during-tx;
193193
rs485-rts-delay = <1 1>;
@@ -198,7 +198,7 @@
198198
&uart4 {
199199
pinctrl-names = "default";
200200
pinctrl-0 = <&uart4_pins>;
201-
rts-gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>;
201+
rts-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
202202
rs485-rts-active-high;
203203
rs485-rx-during-tx;
204204
rs485-rts-delay = <1 1>;

‎arch/arm/boot/dts/ti/omap/am335x-pdu001.dts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,9 @@
256256
pinctrl-names = "default";
257257
pinctrl-0 = <&uart0_pins>;
258258

259-
rts-gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
259+
rts-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
260260
rs485-rts-active-high;
261+
rs485-rx-during-tx;
261262
rs485-rts-delay = <0 0>;
262263
linux,rs485-enabled-at-boot-time;
263264

‎arch/arm/boot/dts/ti/omap/dra7.dtsi‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -195,24 +195,22 @@
195195
clock-names = "fck", "phy-clk", "phy-clk-div";
196196
#size-cells = <1>;
197197
#address-cells = <1>;
198-
ranges = <0x51000000 0x51000000 0x3000>,
199-
<0x20000000 0x20000000 0x10000000>;
198+
ranges = <0x51000000 0x51000000 0x3000
199+
0x0 0x20000000 0x10000000>;
200200
dma-ranges;
201201
/**
202202
* To enable PCI endpoint mode, disable the pcie1_rc
203203
* node and enable pcie1_ep mode.
204204
*/
205205
pcie1_rc: pcie@51000000 {
206-
reg = <0x51000000 0x2000>,
207-
<0x51002000 0x14c>,
208-
<0x20001000 0x2000>;
206+
reg = <0x51000000 0x2000>, <0x51002000 0x14c>, <0x1000 0x2000>;
209207
reg-names = "rc_dbics", "ti_conf", "config";
210208
interrupts = <0 232 0x4>, <0 233 0x4>;
211209
#address-cells = <3>;
212210
#size-cells = <2>;
213211
device_type = "pci";
214-
ranges = <0x81000000 0 0x00000000 0x20003000 0 0x00010000>,
215-
<0x82000000 0 0x20013000 0x20013000 0 0x0ffed000>;
212+
ranges = <0x81000000 0 0 0x03000 0 0x00010000
213+
0x82000000 0 0x20013000 0x13000 0 0xffed000>;
216214
bus-range = <0x00 0xff>;
217215
#interrupt-cells = <1>;
218216
num-lanes = <1>;
@@ -235,10 +233,7 @@
235233
};
236234

237235
pcie1_ep: pcie_ep@51000000 {
238-
reg = <0x51000000 0x28>,
239-
<0x51002000 0x14c>,
240-
<0x51001000 0x28>,
241-
<0x20001000 0x10000000>;
236+
reg = <0x51000000 0x28>, <0x51002000 0x14c>, <0x51001000 0x28>, <0x1000 0x10000000>;
242237
reg-names = "ep_dbics", "ti_conf", "ep_dbics2", "addr_space";
243238
interrupts = <0 232 0x4>;
244239
num-lanes = <1>;
@@ -269,21 +264,19 @@
269264
reset-names = "rstctrl";
270265
#size-cells = <1>;
271266
#address-cells = <1>;
272-
ranges = <0x51800000 0x51800000 0x3000>,
273-
<0x30000000 0x30000000 0x10000000>;
267+
ranges = <0x51800000 0x51800000 0x3000
268+
0x0 0x30000000 0x10000000>;
274269
dma-ranges;
275270
status = "disabled";
276271
pcie2_rc: pcie@51800000 {
277-
reg = <0x51800000 0x2000>,
278-
<0x51802000 0x14c>,
279-
<0x30001000 0x2000>;
272+
reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>;
280273
reg-names = "rc_dbics", "ti_conf", "config";
281274
interrupts = <0 355 0x4>, <0 356 0x4>;
282275
#address-cells = <3>;
283276
#size-cells = <2>;
284277
device_type = "pci";
285-
ranges = <0x81000000 0 0x00000000 0x30003000 0 0x00010000>,
286-
<0x82000000 0 0x30013000 0x30013000 0 0x0ffed000>;
278+
ranges = <0x81000000 0 0 0x03000 0 0x00010000
279+
0x82000000 0 0x30013000 0x13000 0 0xffed000>;
287280
bus-range = <0x00 0xff>;
288281
#interrupt-cells = <1>;
289282
num-lanes = <1>;

0 commit comments

Comments
 (0)