From a81260738c943b13c31d3627faff98284a0da5d0 Mon Sep 17 00:00:00 2001 From: Eric Lee Date: Tue, 27 Mar 2018 14:05:14 +0800 Subject: [PATCH] Fix boot time Tux logo doesn't show up and eth1 does not bring up problem --- arch/arm/boot/dts/am437x-smarct437x.dts | 3 ++- drivers/video/logo/logo.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am437x-smarct437x.dts b/arch/arm/boot/dts/am437x-smarct437x.dts index d9e116e..8600661 100644 --- a/arch/arm/boot/dts/am437x-smarct437x.dts +++ b/arch/arm/boot/dts/am437x-smarct437x.dts @@ -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>; }; diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index b6bc4a0..4d50bfd 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -34,7 +34,7 @@ static int __init fb_logo_late_init(void) 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 -- 1.9.1