Skip to content

Commit a352fe3

Browse files
committed
Merge branch 'omap-for-v5.8/fixes-rc1' into fixes
2 parents 07c7b54 + 80bf725 commit a352fe3

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
8989
AM33XX_PADCONF(AM335X_PIN_MMC0_CMD, PIN_INPUT_PULLUP, MUX_MODE0)
9090
AM33XX_PADCONF(AM335X_PIN_MMC0_CLK, PIN_INPUT_PULLUP, MUX_MODE0)
91-
AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT, MUX_MODE4) /* (B12) mcasp0_aclkr.mmc0_sdwp */
9291
>;
9392
};
9493

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@
505505

506506
&cpsw_emac0 {
507507
phy-handle = <&phy0>;
508-
phy-mode = "rgmii";
508+
phy-mode = "rgmii-rxid";
509509
};
510510

511511
&ocp {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
ethernet@gpmc {
140140
reg = <5 0 0xff>;
141141
interrupt-parent = <&gpio2>;
142-
interrupts = <12 IRQ_TYPE_EDGE_FALLING>; /* gpio_44 */
142+
interrupts = <12 IRQ_TYPE_LEVEL_LOW>; /* gpio_44 */
143143

144144
phy-mode = "mii";
145145

arch/arm/boot/dts/omap4.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,6 @@
662662
ti,no-idle;
663663
timer@0 {
664664
assigned-clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>;
665-
assigned-clock-parents = <&sys_clkin_ck>;
665+
assigned-clock-parents = <&sys_32k_ck>;
666666
};
667667
};

0 commit comments

Comments
 (0)