UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Few dts fixes for omaps for v5.8 

Few fixes for various devices:
 
 - Prevent pocketgeagle header line signal from accidentally setting
   micro-SD write protection signal by removing the default mux
 
 - Fix NFSroot flakeyness after resume for duover by switching the
   smsc911x gpio interrupt to back to level sensitive
 
 - Fix regression for omap4 clockevent source after recent system
   timer changes
 
 - Yet another ethernet regression fix for the "rgmii" vs "rgmii-rxid"
   phy-mode
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAl7rm/YRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXOEHQ/+IECeutbxcTw131o45gCTyEgpQalpPpSv
 Erq/esxiUpGNSoyQyl3iprVTo3yPzJyS7CLBt0bAGN2jLCbaBvlqgFlN9VXO/jBS
 +4vlAyWTXNuADZE6lQsPTisR2foaqq5Nhpj6QeTQPMe9xRZkF9yAgTYyOcTPSGnN
 rIlTE9gWNk0MpQRM5ItPEqr+rsyU1ti9xr5hmqI0SxbG+bHluN5HJ+EDRGMZgaSv
 Qy5635/fLAvqWQZ79HsdCxpaZSQAN9ly2I3tKjH+slJ7tpA5UQnMPdE9kZGahwhg
 RRbXZrIgu4QUh7B1lrBG+VxvMqcRFPKsRUDvYodceYfjev1qe0zbG3RUVmLLseDJ
 gjrCW9tFd4dOXuqq9axC+vMmKm9EihDZ50ScMzcGif6G2P4SG2ENbaVvUnqLeD4A
 t2eU3BJv2yRP587fZv5k+VwyW2VyiN0PoqXAIyxPP9C2WDjS+RHuRBrfE09AzrNM
 H/8kWTXY3f2rpq3SXq4Ej0HMBhbNJMgcrZOVyRKTcbizTp/WTZ53BlGdd2LjRbym
 sx0fJaog04iF0/Cscq02V3SJnNyg36nS84K0FseymoflUj5aCuNhLQrlAveV3aKk
 aqn18hZ+pv3+NzAottUEyzU0BUz0UqK4QqsBAbjCHJ1J+DbbGU3lHk+bBqSn8wTA
 79Fdb5WGXOw=
 =Hqfw
 -----END PGP SIGNATURE-----

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

Few dts fixes for omaps for v5.8

Few fixes for various devices:

- Prevent pocketgeagle header line signal from accidentally setting
  micro-SD write protection signal by removing the default mux

- Fix NFSroot flakeyness after resume for duover by switching the
  smsc911x gpio interrupt to back to level sensitive

- Fix regression for omap4 clockevent source after recent system
  timer changes

- Yet another ethernet regression fix for the "rgmii" vs "rgmii-rxid"
  phy-mode

* tag 'omap-for-v5.8/fixes-rc1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am5729: beaglebone-ai: fix rgmii phy-mode
  ARM: dts: Fix omap4 system timer source clocks
  ARM: dts: Fix duovero smsc interrupt for suspend
  ARM: dts: am335x-pocketbeagle: Fix mmc0 Write Protect

Link: https://lore.kernel.org/r/pull-1592499282-121092@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-06-28 14:45:05 +02:00
parent 8705ed2f72 a352fe3710
commit d528945d77
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/am335x-pocketbeagle.dts
View File

@ -88,7 +88,6 @@
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MMC0_CMD, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MMC0_CLK, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT, MUX_MODE4) /* (B12) mcasp0_aclkr.mmc0_sdwp */
>;
};

2
arch/arm/boot/dts/am5729-beagleboneai.dts
View File

@ -505,7 +505,7 @@
&cpsw_emac0 {
phy-handle = <&phy0>;
phy-mode = "rgmii";
phy-mode = "rgmii-rxid";
};
&ocp {

2
arch/arm/boot/dts/omap4-duovero-parlor.dts
View File

@ -139,7 +139,7 @@
ethernet@gpmc {
reg = <5 0 0xff>;
interrupt-parent = <&gpio2>;
interrupts = <12 IRQ_TYPE_EDGE_FALLING>; /* gpio_44 */
interrupts = <12 IRQ_TYPE_LEVEL_LOW>; /* gpio_44 */
phy-mode = "mii";

2
arch/arm/boot/dts/omap4.dtsi
View File

@ -662,6 +662,6 @@
ti,no-idle;
timer@0 {
assigned-clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>;
assigned-clock-parents = <&sys_clkin_ck>;
assigned-clock-parents = <&sys_32k_ck>;
};
};