Commit 9a4b8148 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'omap-for-v5.5/fixes-rc1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes

Fixes for omap variants for v5.5-rc1 cycle

This series of changes contains fixes for issues recently noticed:

- The ti-sysc interconnect target module driver needs fixes for
  mstandby quirk handling and reset delay

- We need to configure am335x-sancloud-bbe to use rgmii-id mode because of
  the phy changes done earlier

- NET_SWITCHDEV is no longer selected in Kconfig but a dependency and we
  must enable CONFIG_NET_SWITCHDEV to have TI_CPSW_SWITCHDEV

- We are still relying on DEBUG_FS at least for PM configuration, let's
  add it back

- We need to update compatible for am437x-gp/epos-evm because of the
  recent changes to use generic panels

* tag 'omap-for-v5.5/fixes-rc1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  bus: ti-sysc: Fix missing reset delay handling
  ARM: dts: am437x-gp/epos-evm: fix panel compatible
  ARM: omap2plus_defconfig: Add back DEBUG_FS
  ARM: omap2plus_defconfig: enable NET_SWITCHDEV
  ARM: dts: am335x-sancloud-bbe: fix phy mode
  bus: ti-sysc: Fix missing force mstandby quirk handling

Link: https://lore.kernel.org/r/pull-1576254925-709310@atomide.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 89f33b98 e709ed70

arch/arm/boot/dts/am335x-sancloud-bbe.dts

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 


&cpsw_emac0 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

};



&i2c0 {

arch/arm/boot/dts/am437x-gp-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
		};



	lcd0: display {

		compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";

		compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";

		label = "lcd";



		backlight = <&lcd_bl>;

arch/arm/boot/dts/am43x-epos-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
	};



	lcd0: display {

		compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";

		compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";

		label = "lcd";



		backlight = <&lcd_bl>;

arch/arm/configs/omap2plus_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_IP_PNP_RARP=y

CONFIG_NETFILTER=y

CONFIG_PHONET=m

CONFIG_NET_SWITCHDEV=y

CONFIG_CAN=m

CONFIG_CAN_C_CAN=m

CONFIG_CAN_C_CAN_PLATFORM=m
@@ -181,6 +182,7 @@ CONFIG_SMSC911X=y 
# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_TI_DAVINCI_EMAC=y

CONFIG_TI_CPSW=y

CONFIG_TI_CPSW_SWITCHDEV=y

CONFIG_TI_CPTS=y

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set
@@ -554,6 +556,6 @@ CONFIG_DEBUG_INFO=y 
CONFIG_DEBUG_INFO_SPLIT=y

CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_SCHEDSTATS=y

# CONFIG_DEBUG_BUGVERBOSE is not set
 
CONFIG_TI_CPSW_SWITCHDEV=y

drivers/bus/ti-sysc.c

+6 −1
Original line number Diff line number Diff line
@@ -981,7 +981,8 @@ static int sysc_disable_module(struct device *dev) 
		return ret;

	}



	if (ddata->cfg.quirks & SYSC_QUIRK_SWSUP_MSTANDBY)

	if (ddata->cfg.quirks & (SYSC_QUIRK_SWSUP_MSTANDBY) ||

	    ddata->cfg.quirks & (SYSC_QUIRK_FORCE_MSTANDBY))

		best_mode = SYSC_IDLE_FORCE;



	reg &= ~(SYSC_IDLE_MASK << regbits->midle_shift);
@@ -1583,6 +1584,10 @@ static int sysc_reset(struct sysc *ddata) 
	sysc_val |= sysc_mask;

	sysc_write(ddata, sysc_offset, sysc_val);



	if (ddata->cfg.srst_udelay)

		usleep_range(ddata->cfg.srst_udelay,

			     ddata->cfg.srst_udelay * 2);



	if (ddata->clk_enable_quirk)

		ddata->clk_enable_quirk(ddata);

CRA Git | Maintained and supported by SUSTech CRA and CCSE