July 2016 - U-Boot

[U-Boot] Pull request: u-boot-spi/master
by Jagan Teki 12 Jul '16

12 Jul '16

Hi Tom, Please take this series. thanks! Jagan. The following changes since commit e8009beff6d5c55c1bf1ae8184791f167e6378b0: Merge git://git.denx.de/u-boot-arc (2016-07-04 11:46:21 -0400) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 96907c0fe50a856f66f60ade68864a2d7949bf15: dm: spi: Read default speed and mode values from DT (2016-07-09 20:16:34 +0530) ---------------------------------------------------------------- Anatolij Gustschin (1): spi: spi-uclass: fix typo in debug output Vignesh R (18): dm: core: implement dev_map_physmem() spi: davinci_spi: Convert to driver to adapt to DM keystone2: spi: do not define DM_SPI and DM_SPI_FLASH for SPL build ARM: dts: keystone2: add SPI aliases for davinci SPI nodes ARM: dts: k2hk: Enable Davinci SPI controller defconfig: k2hk_evm_defconfig: enable SPI driver model ARM: dts: k2e: Enable Davinci SPI controller defconfig: k2e_evm_defconfig: enable SPI driver model ARM: dts: k2l: Enable Davinci SPI controller defconfig: k2l_evm_defconfig: enable SPI driver model ARM: dts: k2g: add support for Davinci SPI controller defconfig: k2g_evm_defconfig: enable SPI driver model spi: cadence_qspi_apb: Support 32 bit AHB address spi: cadence_quadspi: Enable QUAD mode based on DT data ARM: dts: K2G: Add support for QSPI controller defconfig: k2g_evm_defconfig: Enable Cadence QSPI controller ARM: dts: dra7x: Support QSPI MODE-0 operation at 64MHz dm: spi: Read default speed and mode values from DT arch/arm/dts/dra7-evm.dts | 6 +- arch/arm/dts/dra72-evm.dts | 6 +- arch/arm/dts/k2e-evm.dts | 3 +- arch/arm/dts/k2g-evm.dts | 69 ++++++++ arch/arm/dts/k2g.dtsi | 61 +++++++ arch/arm/dts/k2hk-evm.dts | 3 +- arch/arm/dts/k2l-evm.dts | 3 +- arch/arm/dts/keystone.dtsi | 3 + cmd/sf.c | 2 + common/env_sf.c | 8 +- configs/k2e_evm_defconfig | 2 + configs/k2g_evm_defconfig | 4 + configs/k2hk_evm_defconfig | 2 + configs/k2l_evm_defconfig | 2 + drivers/core/device.c | 11 ++ drivers/spi/cadence_qspi.c | 3 +- drivers/spi/cadence_qspi.h | 2 +- drivers/spi/cadence_qspi_apb.c | 15 +- drivers/spi/davinci_spi.c | 329 +++++++++++++++++++++++++---------- drivers/spi/spi-uclass.c | 10 +- include/configs/k2g_evm.h | 6 + include/configs/ti_armv7_keystone2.h | 4 + include/dm/device.h | 13 ++ 23 files changed, 450 insertions(+), 117 deletions(-)

2 2

[U-Boot] Please pull u-boot-dm
by Simon Glass 12 Jul '16

12 Jul '16

Hi Tom, This includes the MMC block-device stuff (which needs lots of testing time), cleaning up some fdtdec COMPAT strings and some patman improvements. The following changes since commit 19ce924ff914f315dc2fdf79f357825c513aed6e: Prepare v2016.07 (2016-07-11 15:01:01 -0400) are available in the git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 94fbd3e37d6bdbf5490a185607ca20f862637220: tools: patman: Handle missing 'END' in non-last commit of a series (2016-07-11 14:06:44 -0600) ---------------------------------------------------------------- Bin Meng (6): dm: Sort the uclass id in alphabetical order tools: patman: Use cover_match for 'Cover-letter' tools: patman: Handle tag sections without an 'END' tools: patman: Generate cover letter correctly when 'END' is missing tools: patman: Handle missing blank line for 'Series-changes' tools: patman: Handle missing 'END' in non-last commit of a series Hamish Martin (1): dm: gpio: MPC85XX GPIO platform data support Simon Glass (26): dm: mmc: dwmmc: Add comments to the dwmmc setup functions rockchip: Use 'select' instead of defaults in Kconfig mmc: Add function declarations for mmc_bread() and mmc_switch_part() dm: mmc: Move CONFIG_BLK code into the mmc uclass dm: mmc: Move non-CONFIG_BLK code into mmc_legacy.c mmc: Move MMC boot code into its own file dm: mmc: rockchip: Support only CONFIG_BLK mmc: Move tracing code into separate functions rockchip: Disable CONFIG_SDHCI dm: mmc: Add a way to use driver model for MMC operations dm: mmc: dwmmc: Support CONFIG_DM_MMC_OPS dm: mmc: rockchip: Enable CONFIG_DM_MMC_OPS for all boards rockchip: Add MAINTAINER files for kylin_rk3036, evb_rk3036 dm: sandbox: Convert to use CONFIG_CMD_MMC_OPS dm: mmc: sdhci: Refactor configuration setup to support DM dm: mmc: sdhci: Support CONFIG_BLK and CONFIG_DM_MMC_OPS dm: mmc: msm_sdhci: Support CONFIG_BLK and CONFIG_DM_MMC_OPS dm: mmc: Move dragonboard410c to use CONFIG_BLK and CONFIG_DM_MMC_OPS dm: mmc: msmsdhic: Drop old MMC code dm: spl: mmc: Support CONFIG_BLK in SPL MMC dm: dfu: mmc: Support CONFIG_BLK in DFU for MMC x86: fdt: Drop the unused compatible strings in fdtdec fdt: Drop unused exynos compatible strings fdt: Add a note to avoid adding new compatible strings fdt: x86: Tidy up a few COMPAT string definitions sandbox: Find keyboard driver using driver model Xu Ziyuan (1): common: block: fix compiler error with CONFIG_FASTBOOT_FLASH_MMC_DEV arch/Kconfig | 1 + arch/arm/Kconfig | 11 +++ arch/arm/mach-rockchip/Kconfig | 27 ------ arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 6 ++ arch/x86/cpu/ivybridge/lpc.c | 6 -- board/evb_rk3036/evb_rk3036/MAINTAINERS | 6 ++ board/kylin/kylin_rk3036/MAINTAINERS | 6 ++ common/fb_mmc.c | 2 +- common/spl/spl_mmc.c | 6 +- configs/dragonboard410c_defconfig | 2 + configs/sandbox_defconfig | 4 +- drivers/dfu/dfu_mmc.c | 11 ++- drivers/gpio/mpc85xx_gpio.c | 37 ++++++-- drivers/misc/cros_ec_sandbox.c | 11 ++- drivers/mmc/Kconfig | 11 ++- drivers/mmc/Makefile | 3 + drivers/mmc/dw_mmc.c | 33 +++++++ drivers/mmc/mmc-uclass.c | 146 +++++++++++++++++++++++++++++++ drivers/mmc/mmc.c | 371 +++++++++++-------------------------------------------------------------------- drivers/mmc/mmc_boot.c | 131 ++++++++++++++++++++++++++++ drivers/mmc/mmc_legacy.c | 91 ++++++++++++++++++++ drivers/mmc/mmc_private.h | 47 ++++++++++ drivers/mmc/msm_sdhci.c | 35 +++++++- drivers/mmc/rockchip_dw_mmc.c | 14 +-- drivers/mmc/sandbox_mmc.c | 17 ++-- drivers/mmc/sdhci.c | 147 ++++++++++++++++++++----------- include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/dm/uclass-id.h | 4 +- include/dwmmc.h | 73 ++++++++++++++++ include/fdtdec.h | 8 -- include/mmc.h | 66 +++++++++++++- include/sdhci.h | 80 +++++++++++++++++ lib/fdtdec.c | 19 ++-- tools/patman/patchstream.py | 38 +++++++- 35 files changed, 995 insertions(+), 477 deletions(-) create mode 100644 drivers/mmc/mmc_boot.c Regards, Simon

2 1

[U-Boot] [PATCH] net: rtl8169: Fix return value for rtl_send_common
by Oleksandr Tymoshenko 12 Jul '16

12 Jul '16

Return value of rtl_send_common propogates unmodified all the way up to eth_send and further to API consumer if CONFIG_API is enabled. Previously rtl_send_common returned number of bytes sent on success which was erroneouly detected as error condition by API consumers that checked for operation success by comparing return value with 0. Switch rtl_send_common to use common convention: return 0 on success and negative value for failure. Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Signed-off-by: Oleksandr Tymoshenko <gonzo(a)bluezbox.com> --- drivers/net/rtl8169.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 843b083..1cc0b40 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -666,12 +666,12 @@ static int rtl_send_common(pci_dev_t dev, unsigned long dev_iobase, puts("tx timeout/error\n"); printf("%s elapsed time : %lu\n", __func__, currticks()-stime); #endif - ret = 0; + ret = -ETIMEDOUT; } else { #ifdef DEBUG_RTL8169_TX puts("tx done\n"); #endif - ret = length; + ret = 0; } /* Delay to make net console (nc) work properly */ udelay(20); -- 2.7.4

4 5

[U-Boot] [PATCH] net: Fix incorrect RPC packets on 64-bit systems
by Ralf Hubert 12 Jul '16

12 Jul '16

This patch fixes incorrect RPC packet layout caused by 'long' type size difference on 64 and 32-bit architectures. Signed-off-by: Ralf Hubert <r.hubert(a)technisat.de> --- net/nfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/nfs.c b/net/nfs.c index 381b75f..dd4a3dc 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -131,7 +131,7 @@ dirname(char *path) /************************************************************************** RPC_ADD_CREDENTIALS - Add RPC authentication/verifier entries **************************************************************************/ -static long *rpc_add_credentials(long *p) +static uint32_t *rpc_add_credentials(uint32_t *p) { int hl; int hostnamelen; @@ -243,7 +243,7 @@ nfs_mount_req(char *path) pathlen = strlen(path); p = &(data[0]); - p = (uint32_t *)rpc_add_credentials((long *)p); + p = rpc_add_credentials(p); *p++ = htonl(pathlen); if (pathlen & 3) @@ -271,7 +271,7 @@ nfs_umountall_req(void) return; p = &(data[0]); - p = (uint32_t *)rpc_add_credentials((long *)p); + p = rpc_add_credentials(p); len = (uint32_t *)p - (uint32_t *)&(data[0]); @@ -293,7 +293,7 @@ nfs_readlink_req(void) int len; p = &(data[0]); - p = (uint32_t *)rpc_add_credentials((long *)p); + p = rpc_add_credentials(p); memcpy(p, filefh, NFS_FHSIZE); p += (NFS_FHSIZE / 4); @@ -317,7 +317,7 @@ nfs_lookup_req(char *fname) fnamelen = strlen(fname); p = &(data[0]); - p = (uint32_t *)rpc_add_credentials((long *)p); + p = rpc_add_credentials(p); memcpy(p, dirfh, NFS_FHSIZE); p += (NFS_FHSIZE / 4); @@ -343,7 +343,7 @@ nfs_read_req(int offset, int readlen) int len; p = &(data[0]); - p = (uint32_t *)rpc_add_credentials((long *)p); + p = rpc_add_credentials(p); memcpy(p, filefh, NFS_FHSIZE); p += (NFS_FHSIZE / 4); -- 1.9.1

3 2

[U-Boot] [Patch v2] driver: net: phylib: add support for aquantia AQR106/107 PHY
by Gong Qianyu 12 Jul '16

12 Jul '16

From: Mingkai Hu <mingkai.hu(a)nxp.com> This patch adds support for aquantia AQR106/107 PHY. Signed-off-by: Mingkai Hu <mingkai.hu(a)nxp.com> Signed-off-by: Gong Qianyu <Qianyu.Gong(a)nxp.com> --- drivers/net/phy/aquantia.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index f90c2ae..ad12f6d 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -147,6 +147,32 @@ struct phy_driver aqr105_driver = { .shutdown = &gen10g_shutdown, }; +struct phy_driver aqr106_driver = { + .name = "Aquantia AQR106", + .uid = 0x3a1b4d0, + .mask = 0xfffffff0, + .features = PHY_10G_FEATURES, + .mmds = (MDIO_MMD_PMAPMD | MDIO_MMD_PCS| + MDIO_MMD_PHYXS | MDIO_MMD_AN | + MDIO_MMD_VEND1), + .config = &aquantia_config, + .startup = &aquantia_startup, + .shutdown = &gen10g_shutdown, +}; + +struct phy_driver aqr107_driver = { + .name = "Aquantia AQR107", + .uid = 0x3a1b4e0, + .mask = 0xfffffff0, + .features = PHY_10G_FEATURES, + .mmds = (MDIO_MMD_PMAPMD | MDIO_MMD_PCS| + MDIO_MMD_PHYXS | MDIO_MMD_AN | + MDIO_MMD_VEND1), + .config = &aquantia_config, + .startup = &aquantia_startup, + .shutdown = &gen10g_shutdown, +}; + struct phy_driver aqr405_driver = { .name = "Aquantia AQR405", .uid = 0x3a1b4b2, @@ -165,6 +191,8 @@ int phy_aquantia_init(void) phy_register(&aq1202_driver); phy_register(&aq2104_driver); phy_register(&aqr105_driver); + phy_register(&aqr106_driver); + phy_register(&aqr107_driver); phy_register(&aqr405_driver); return 0; -- 2.1.0.27.g96db324

3 2

[U-Boot] [PATCH] net: designware: Make driver independent from DM_GPIO again
by Alexey Brodkin 12 Jul '16

12 Jul '16

Commit 90b7fc924adf "net: designware: support phy reset device-tree bindings" made DW GMAC driver dependent on DM_GPIO by unconditional usage of purely DM_GPIO stuff like: * dm_gpio_XXX() * gpio_request_by_name() But since that driver as of today might be easily used without DM_GPIO (that's the case for Synopsys AXS10x boards) we're shielding all DM_GPIO things by ifdefs. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Beniamino Galvani <b.galvani(a)gmail.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> Cc: Sonic Zhang <sonic.zhang(a)analog.com> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Marek Vasut <marex(a)denx.de> --- drivers/net/designware.c | 10 ++++++++-- drivers/net/designware.h | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 8858f07..8ba72e3 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -80,7 +80,7 @@ static int dw_mdio_write(struct mii_dev *bus, int addr, int devad, int reg, return ret; } -#if CONFIG_DM_ETH +#if defined(CONFIG_DM_ETH) && defined(CONFIG_DM_GPIO) static int dw_mdio_reset(struct mii_dev *bus) { struct udevice *dev = bus->priv; @@ -126,7 +126,7 @@ static int dw_mdio_init(const char *name, void *priv) bus->read = dw_mdio_read; bus->write = dw_mdio_write; snprintf(bus->name, sizeof(bus->name), "%s", name); -#ifdef CONFIG_DM_ETH +#if defined(CONFIG_DM_ETH) && defined(CONFIG_DM_GPIO) bus->reset = dw_mdio_reset; #endif @@ -690,11 +690,15 @@ static const struct eth_ops designware_eth_ops = { static int designware_eth_ofdata_to_platdata(struct udevice *dev) { struct dw_eth_pdata *dw_pdata = dev_get_platdata(dev); +#ifdef CONFIG_DM_GPIO struct dw_eth_dev *priv = dev_get_priv(dev); +#endif struct eth_pdata *pdata = &dw_pdata->eth_pdata; const char *phy_mode; const fdt32_t *cell; +#ifdef CONFIG_DM_GPIO int reset_flags = GPIOD_IS_OUT; +#endif int ret = 0; pdata->iobase = dev_get_addr(dev); @@ -712,6 +716,7 @@ static int designware_eth_ofdata_to_platdata(struct udevice *dev) if (cell) pdata->max_speed = fdt32_to_cpu(*cell); +#ifdef CONFIG_DM_GPIO if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "snps,reset-active-low")) reset_flags |= GPIOD_ACTIVE_LOW; @@ -724,6 +729,7 @@ static int designware_eth_ofdata_to_platdata(struct udevice *dev) } else if (ret == -ENOENT) { ret = 0; } +#endif return ret; } diff --git a/drivers/net/designware.h b/drivers/net/designware.h index 51ba769..d345c5b 100644 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@ -8,7 +8,9 @@ #ifndef _DW_ETH_H #define _DW_ETH_H -#include <asm/gpio.h> +#ifdef CONFIG_DM_GPIO +#include <asm-generic/gpio.h> +#endif #define CONFIG_TX_DESCR_NUM 16 #define CONFIG_RX_DESCR_NUM 16 @@ -234,7 +236,10 @@ struct dw_eth_dev { #ifndef CONFIG_DM_ETH struct eth_device *dev; #endif +#ifdef CONFIG_DM_GPIO struct gpio_desc reset_gpio; +#endif + struct phy_device *phydev; struct mii_dev *bus; }; -- 2.5.5

4 4

Re: [U-Boot] (no subject)
by Joe Hershberger 12 Jul '16

12 Jul '16

Hi , https://patchwork.ozlabs.org/patch/4c64c4d/ was applied to u-boot-net.git. Thanks! -Joe

1 0

Re: [U-Boot] (no subject)
by Joe Hershberger 12 Jul '16

12 Jul '16

Hi , https://patchwork.ozlabs.org/patch/e4ead4a/ was applied to u-boot-net.git. Thanks! -Joe

1 0

Re: [U-Boot] (no subject)
by Joe Hershberger 12 Jul '16

12 Jul '16

Hi , https://patchwork.ozlabs.org/patch/19c9dda/ was applied to u-boot-net.git. Thanks! -Joe

1 0

Re: [U-Boot] (no subject)
by Joe Hershberger 12 Jul '16

12 Jul '16

Hi , https://patchwork.ozlabs.org/patch/66d027e/ was applied to u-boot-net.git. Thanks! -Joe

1 0