Commit a352fe37 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v5.8/fixes-rc1' into fixes

parents 07c7b547 80bf7259

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

	};

};