Fix boot time Tux logo doesn't show up and eth1 does not bring up problem

Eric Lee
1 parent ee02bdddf7
Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff
arch/arm/boot/dts/am437x-smarct437x.dts
drivers/video/logo/logo.c
@@ -918,6 +918,7 @@
         pinctrl-0 = <&cpsw_default>;
         pinctrl-1 = <&cpsw_sleep>;
         dual_emac = <1>;
+        active_slave = <1>;
         status = "okay";
 };
  
@@ -936,7 +937,7 @@
  
 &cpsw_emac1 {
         phy_id = <&davinci_mdio>, <7>;
-        phy-mode = "rgmii";
+        phy-mode = "rgmii-txid";
         dual_emac_res_vlan = <2>;
 };
  
@@ -34,7 +34,7 @@
 	return 0;
 }
  
-late_initcall(fb_logo_late_init);
+late_initcall_sync(fb_logo_late_init);
  
 /* logo's are marked __initdata. Use __ref to tell
  * modpost that it is intended that this function uses data
...	...	@@ -918,6 +918,7 @@
918	918	pinctrl-0 = <&cpsw_default>;
919	919	pinctrl-1 = <&cpsw_sleep>;
920	920	dual_emac = <1>;
	921	+ active_slave = <1>;
921	922	status = "okay";
922	923	};
923	924
...	...	@@ -936,7 +937,7 @@
936	937
937	938	&cpsw_emac1 {
938	939	phy_id = <&davinci_mdio>, <7>;
939		- phy-mode = "rgmii";
	940	+ phy-mode = "rgmii-txid";
940	941	dual_emac_res_vlan = <2>;
941	942	};
942	943
...	...	@@ -34,7 +34,7 @@
34	34	return 0;
35	35	}
36	36
37		-late_initcall(fb_logo_late_init);
	37	+late_initcall_sync(fb_logo_late_init);
38	38
39	39	/* logo's are marked __initdata. Use __ref to tell
40	40	* modpost that it is intended that this function uses data