Skip to content

Commit 17fd01a

Browse files
committed
Merge tag 'omap-for-v6.5/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes
Fixes for omaps A fix external abort on non-linefetch for am335x that is fixed with a flush of posted write. And two networking fixes for beaglebone mostly for revision c3 to do phy reset with a gpio and to fix a boot time warning. * tag 'omap-for-v6.5/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am335x-bone-common: Add vcc-supply for on-board eeprom ARM: dts: am335x-bone-common: Add GPIO PHY reset on revision C3 board bus: ti-sysc: Flush posted write on enable before reset Link: https://lore.kernel.org/r/pull-1692158536-457318@atomide.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents e7c1216 + 7aff940 commit 17fd01a

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@
145145
/* MDIO */
146146
AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
147147
AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
148+
/* Added to support GPIO controlled PHY reset */
149+
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE7)
148150
>;
149151
};
150152

@@ -153,6 +155,8 @@
153155
/* MDIO reset value */
154156
AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
155157
AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
158+
/* Added to support GPIO controlled PHY reset */
159+
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)
156160
>;
157161
};
158162

@@ -215,6 +219,7 @@
215219
baseboard_eeprom: baseboard_eeprom@50 {
216220
compatible = "atmel,24c256";
217221
reg = <0x50>;
222+
vcc-supply = <&ldo4_reg>;
218223

219224
#address-cells = <1>;
220225
#size-cells = <1>;
@@ -377,6 +382,10 @@
377382

378383
ethphy0: ethernet-phy@0 {
379384
reg = <0>;
385+
/* Support GPIO reset on revision C3 boards */
386+
reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
387+
reset-assert-us = <300>;
388+
reset-deassert-us = <6500>;
380389
};
381390
};
382391

drivers/bus/ti-sysc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2142,6 +2142,8 @@ static int sysc_reset(struct sysc *ddata)
21422142
sysc_val = sysc_read_sysconfig(ddata);
21432143
sysc_val |= sysc_mask;
21442144
sysc_write(ddata, sysc_offset, sysc_val);
2145+
/* Flush posted write */
2146+
sysc_val = sysc_read_sysconfig(ddata);
21452147
}
21462148

21472149
if (ddata->cfg.srst_udelay)

0 commit comments

Comments
 (0)