redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Fixes for omap variants for v5.5-rc1 cycle

Browse source 
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
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAl3ygEcRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXOS1RAA3q7vi6sWakiZfUA6oYxwBqM2A0TcLLdD
 UI9CbXvxfL0bO7VEAJesvmh6w/4rMc+s21lWYrEdmm90Rc3EOdEHXxIpXdJRo5VL
 tRmrgj+3rYHKZFhIeGDyYD1BUTskBCPX5/x4KSuFkGMoPbm+zTFGIm4rXhen5n08
 UxXIqmgf3LgEihPs3tQ3vJzqC0ZizabEK/D/7J/7Ygr8B5i9eIeQjjZ/CSkychSb
 HXw+vqgUo7vq7cHEQ9vKFCBcG1ID4jKSQhfn5Qr2gakw+83h6wshxH3GQzBc31U+
 ZxjG03CW/4De1XYy1iwQKVfDraY7cq68l6Au4Au+MuztVZAYnIVQ+e7jkIhRlWSm
 0AUe4oLHgzR+5kI7u6nwrsI56EVYLG4856pyrEvAeazzk9ckAdAzhf5NzUnv5F8p
 04FpzLFKfexgtzcBt4EcmCgyK93WCTrGiJxJnnbz1OStOBQZju5+uoM/EU+7R6d6
 +JrcQny3eH/Fy+96Ivv3CDInsUSxnAGMhOA5Czuva/psAP9Gbg83sWaaDKKa1Aqz
 +q5rWpVko8L41TNlCdcomXKJZZ/Iq1nN76TvS0zzdOUJ5g0L5FSX+cWuBKJjjfy5
 esn7DiRQdwx0DwhxNsCIRJydiOmYjGbbz5apxPQheUCASrk47JDQ/zNOPucxARLN
 4vJPVaxZuTA=
 =3muQ
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-12-13 12:43:33 -08:00
parent 89f33b984a e709ed70d1
commit 9a4b814856
6 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/am335x-sancloud-bbe.dts
View file

@ -108,7 +108,7 @@
&cpsw_emac0 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
};
&i2c0 {

2
arch/arm/boot/dts/am437x-gp-evm.dts
View file

@ -86,7 +86,7 @@
};
lcd0: display {
compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";
label = "lcd";
backlight = <&lcd_bl>;

2
arch/arm/boot/dts/am43x-epos-evm.dts
View file

@ -42,7 +42,7 @@
};
lcd0: display {
compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";
label = "lcd";
backlight = <&lcd_bl>;

4
arch/arm/configs/omap2plus_defconfig
View file

@ -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

7
drivers/bus/ti-sysc.c
View file

@ -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);

1
include/linux/platform_data/ti-sysc.h
View file

@ -49,6 +49,7 @@ struct sysc_regbits {
s8 emufree_shift;
};
#define SYSC_QUIRK_FORCE_MSTANDBY BIT(20)
#define SYSC_MODULE_QUIRK_AESS BIT(19)
#define SYSC_MODULE_QUIRK_SGX BIT(18)
#define SYSC_MODULE_QUIRK_HDQ1W BIT(17)