Unverified Commit 17fd01a2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.5/fixes-signed' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents e7c12167 7aff940e

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

+9 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ 
			/* MDIO */

			AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)

			AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)

			/* Added to support GPIO controlled PHY reset */

			AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE7)

		>;

	};
@@ -153,6 +155,8 @@ 
			/* MDIO reset value */

			AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)

			AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)

			/* Added to support GPIO controlled PHY reset */

			AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)

		>;

	};
@@ -215,6 +219,7 @@ 
	baseboard_eeprom: baseboard_eeprom@50 {

		compatible = "atmel,24c256";

		reg = <0x50>;

		vcc-supply = <&ldo4_reg>;



		#address-cells = <1>;

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


	ethphy0: ethernet-phy@0 {

		reg = <0>;

		/* Support GPIO reset on revision C3 boards */

		reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;

		reset-assert-us = <300>;

		reset-deassert-us = <6500>;

	};

};

drivers/bus/ti-sysc.c

+2 −0
Original line number Diff line number Diff line
@@ -2142,6 +2142,8 @@ static int sysc_reset(struct sysc *ddata) 
		sysc_val = sysc_read_sysconfig(ddata);

		sysc_val |= sysc_mask;

		sysc_write(ddata, sysc_offset, sysc_val);

		/* Flush posted write */

		sysc_val = sysc_read_sysconfig(ddata);

	}



	if (ddata->cfg.srst_udelay)