Merge tag 'omap-for-v5.8/fixes-rc1-signed' of... (d528945d) · Commits · 戴 / test

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>

arch/arm/boot/dts/am335x-pocketbeagle.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -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 */
		>;
		};

arch/arm/boot/dts/am5729-beagleboneai.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -505,7 +505,7 @@

		&cpsw_emac0 {
		phy-handle = <&phy0>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-rxid";
		};

		&ocp {

arch/arm/boot/dts/omap4-duovero-parlor.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -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";

arch/arm/boot/dts/omap4.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>;
		};
		};

Admin message