diff options
Diffstat (limited to 'arch/arm/boards')
-rw-r--r-- | arch/arm/boards/nxp-imx8mq-evk/ddr_init.c | 4 | ||||
-rw-r--r-- | arch/arm/boards/qemu-virt64/Kconfig | 8 | ||||
-rw-r--r-- | arch/arm/boards/wago-pfc-am35xx/board.c | 45 |
3 files changed, 47 insertions, 10 deletions
diff --git a/arch/arm/boards/nxp-imx8mq-evk/ddr_init.c b/arch/arm/boards/nxp-imx8mq-evk/ddr_init.c index 44103b5e26..39addea973 100644 --- a/arch/arm/boards/nxp-imx8mq-evk/ddr_init.c +++ b/arch/arm/boards/nxp-imx8mq-evk/ddr_init.c @@ -12,7 +12,7 @@ void ddr_cfg_phy(void); void ddr_init(void) { volatile unsigned int tmp, tmp_t; - + /** Initialize DDR clock and DDRC registers **/ reg32_write(0x3038a088,0x7070000); reg32_write(0x3038a084,0x4030000); @@ -177,7 +177,7 @@ void ddr_init(void) reg32_write(DDRC_SWCTL(0), 0x0000); /* * ------------------- 9 ------------------- - * Set DFIMISC.dfi_init_start to 1 + * Set DFIMISC.dfi_init_start to 1 * ----------------------------------------- */ reg32_write(DDRC_DFIMISC(0), 0x00000030); diff --git a/arch/arm/boards/qemu-virt64/Kconfig b/arch/arm/boards/qemu-virt64/Kconfig deleted file mode 100644 index b7bee3a245..0000000000 --- a/arch/arm/boards/qemu-virt64/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ - -if MACH_QEMU - -config ARCH_TEXT_BASE - hex - default 0x40000000 - -endif diff --git a/arch/arm/boards/wago-pfc-am35xx/board.c b/arch/arm/boards/wago-pfc-am35xx/board.c index 2bad40912d..c0a039ba50 100644 --- a/arch/arm/boards/wago-pfc-am35xx/board.c +++ b/arch/arm/boards/wago-pfc-am35xx/board.c @@ -3,6 +3,7 @@ * Copyright (C) 2014 WAGO Kontakttechnik GmbH & Co. KG <http://global.wago.com> * Author: Heinrich Toews <heinrich.toews@wago.com> */ +#define pr_fmt(fmt) "pfc200: " fmt #include <common.h> #include <init.h> @@ -10,6 +11,8 @@ #include <gpio.h> #include <linux/sizes.h> #include <linux/err.h> +#include <linux/phy.h> +#include <linux/micrel_phy.h> #include <asm/memory.h> #include <mach/generic.h> @@ -23,6 +26,48 @@ static int pfc200_mem_init(void) } mem_initcall(pfc200_mem_init); +#define BMCR_HP_MDIX 0x20 + +static int pfc200_phy_fixup(struct mii_bus *mii, int phyadr) +{ + struct phy_device *phydev; + int ret; + + phydev = mdiobus_scan(mii, phyadr); + + if (IS_ERR(phydev)) { + pr_err("Cannot find phydev %d on mii bus\n", phyadr); + return PTR_ERR(phydev); + } + + ret = phy_write(phydev, MII_BMCR, BMCR_ANENABLE | BMCR_HP_MDIX); + if (ret) + pr_err("Failed to write to phy: %s\n", strerror(-ret)); + + return ret; +} + +static int pfc200_late_init(void) +{ + struct mii_bus *mii; + + if (!of_machine_is_compatible("ti,pfc200")) + return 0; + + mii = mdiobus_get_bus(0); + if (!mii) { + pr_err("Cannot find mii bus 0\n"); + return -ENODEV; + } + + pfc200_phy_fixup(mii, 1); + pfc200_phy_fixup(mii, 2); + + return 0; +} +late_initcall(pfc200_late_init); + + #define GPIO_KSZ886x_RESET 136 static int pfc200_devices_init(void) |