8e99bbda19
Refreshed patches, removed upstreamed patch: 260-configs-a64-olinuxino-emmc-add-eMMC-boot-part-config.patch Boot tested on a64-olinuxino-emmc. Cc: Zoltan HERPAI <wigyori@uid0.hu> Signed-off-by: Petr Štetiar <ynezz@true.cz>
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
|
|
+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
|
|
@@ -8,6 +8,8 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
|
|
CONFIG_USB0_VBUS_PIN="PC17"
|
|
CONFIG_USB0_VBUS_DET="PH5"
|
|
CONFIG_I2C1_ENABLE=y
|
|
+CONFIG_PHY_MICREL=y
|
|
+CONFIG_PHY_MICREL_KSZ90X1=y
|
|
CONFIG_SATAPWR="PC3"
|
|
CONFIG_SPL_SPI_SUNXI=y
|
|
CONFIG_AHCI=y
|
|
--- a/configs/A20-OLinuXino-Lime2_defconfig
|
|
+++ b/configs/A20-OLinuXino-Lime2_defconfig
|
|
@@ -7,6 +7,8 @@ CONFIG_MMC0_CD_PIN="PH1"
|
|
CONFIG_USB0_VBUS_PIN="PC17"
|
|
CONFIG_USB0_VBUS_DET="PH5"
|
|
CONFIG_I2C1_ENABLE=y
|
|
+CONFIG_PHY_MICREL=y
|
|
+CONFIG_PHY_MICREL_KSZ90X1=y
|
|
CONFIG_SATAPWR="PC3"
|
|
CONFIG_AHCI=y
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
--- a/drivers/net/phy/micrel_ksz90x1.c
|
|
+++ b/drivers/net/phy/micrel_ksz90x1.c
|
|
@@ -14,6 +14,8 @@
|
|
#include <errno.h>
|
|
#include <micrel.h>
|
|
#include <phy.h>
|
|
+#include <asm/io.h>
|
|
+#include <asm/arch/clock.h>
|
|
|
|
/*
|
|
* KSZ9021 - KSZ9031 common
|
|
@@ -344,6 +346,10 @@ static int ksz9031_phy_extwrite(struct p
|
|
static int ksz9031_config(struct phy_device *phydev)
|
|
{
|
|
int ret;
|
|
+ struct sunxi_ccm_reg *const ccm =
|
|
+ (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
|
|
+
|
|
+ setbits_le32(&ccm->gmac_clk_cfg, CCM_GMAC_CTRL_TX_CLK_DELAY(4));
|
|
|
|
ret = ksz9031_of_config(phydev);
|
|
if (ret)
|