April 2016 - U-Boot

[U-Boot] [PATCH 1/3] usb: bcm_udc_otg: enable clocks
by Steve Rae 21 Apr '16

21 Apr '16

Turn on the USB OTG clocks. Signed-off-by: Steve Rae <srae(a)broadcom.com> --- drivers/usb/gadget/bcm_udc_otg_phy.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c index 10b2e13..877f162 100644 --- a/drivers/usb/gadget/bcm_udc_otg_phy.c +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c @@ -8,12 +8,16 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/sysmap.h> +#include <asm/kona-common/clk.h> #include "dwc2_udc_otg_priv.h" #include "bcm_udc_otg.h" void otg_phy_init(struct dwc2_udc *dev) { + /* turn on the USB OTG clocks */ + clk_usb_otg_enable((void *)HSOTG_BASE_ADDR); + /* set Phy to driving mode */ wfld_clear(HSOTG_CTRL_BASE_ADDR + HSOTG_CTRL_PHY_P1CTL_OFFSET, HSOTG_CTRL_PHY_P1CTL_NON_DRIVING_MASK); -- 1.8.5

4 9

[U-Boot] [PATCH 0/5] omap_hsmmc: add cd/wp gpio request, mmc dt fixes and enable mmc dm for dra74/dra72 evms
by Mugunthan V N 21 Apr '16

21 Apr '16

When omap_hsmmc was converted to DM, card detect and write protect gpios request were not implemented due to gpio failures [3], now as it is working adding cd/wp gpio request in probe. Also fixing the gpio active level in DT as done in kernel DT and enabling of DM_MMC for dra74 amd dra72 evm configs With this patch when card is remove and trying mmc rescan gives error message like card is not present instead of select voltage failed as earlier. Pushed a branch for others for testing [1] and logs at [2] [1] - git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git dm-mmc-gpio [2] - http://pastebin.ubuntu.com/15611123/ [3] - http://lists.denx.de/pipermail/u-boot/2015-September/227962.html Mugunthan V N (5): drivers: mmc: omap_hsmmc: request cd and wp gpios when DM_MMC is defined ARM: dts: am43xx: fix cd-gpios definition as per hardware design and dt binding docs ARM: dts: dra7xx: am57xx: fix cd-gpios definition as per hardware design and dt binding docs configs: dra72_evm: enable mmc driver model configs: dra74_evm: enable mmc driver model arch/arm/dts/am437x-gp-evm.dts | 2 +- arch/arm/dts/am437x-sk-evm.dts | 2 +- arch/arm/dts/am57xx-beagle-x15.dts | 2 +- arch/arm/dts/dra7-evm.dts | 5 +++++ arch/arm/dts/dra72-evm.dts | 2 +- configs/dra72_evm_defconfig | 1 + configs/dra74_evm_defconfig | 1 + drivers/mmc/omap_hsmmc.c | 5 +++++ 8 files changed, 16 insertions(+), 4 deletions(-) -- 2.8.0.rc3.9.g44915db

3 17

[U-Boot] [PATCH] drivers: mmc: omap_hsmmc: Fix conversion of address to a pointer
by Mugunthan V N 21 Apr '16

21 Apr '16

omap_hsmmc driver directly typecasts fdt_addr_t to a pointer. This is not strictly correct, as it gives a build warning when fdt_addr_t is u64. So, use map_physmem for a proper typecasts. This is inspired by commit 167efe01bc5a9 ("dm: ns16550: Use an address instead of a pointer for the uart base") drivers/mmc/omap_hsmmc.c: In function ‘omap_hsmmc_ofdata_to_platdata’: drivers/mmc/omap_hsmmc.c:776:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] priv->base_addr = (struct hsmmc *)dev_get_addr(dev); ^ Signed-off-by: Mugunthan V N <mugunthanvnm(a)ti.com> --- drivers/mmc/omap_hsmmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index d191736..85a832b 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -773,7 +773,8 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) struct mmc_config *cfg; int val; - priv->base_addr = (struct hsmmc *)dev_get_addr(dev); + priv->base_addr = map_physmem(dev_get_addr(dev), sizeof(struct hsmmc *), + MAP_NOCACHE); cfg = &priv->cfg; cfg->host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS; -- 2.8.0.rc3.9.g44915db

2 2

[U-Boot] [PATCH V3] common: env: support sata device
by Peng Fan 21 Apr '16

21 Apr '16

Introduce env support for sata device. 1. Implement write_env/read_env/env_relocate_spec/saveenv/sata_get_env_dev 2. If want to enable this feature, define CONFIG_ENV_IS_IN_SATA, and define CONFIG_SYS_SATA_ENV_DEV or implement your own sata_get_ev_dev. Signed-off-by: Peng Fan <van.freenix(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> Cc: Stuart Longland <stuartl(a)vrt.com.au> Cc: Maxime Ripard <maxime.ripard(a)free-electrons.com> Cc: Tom Rini <trini(a)konsulko.com> --- V3: Discard the ENV_IS_EMBEDDED test which was missed to removed in V2. V2: Add error msg when ENV REDUND, since not supported now. Discard ent_ptr Use blk_dread/blk_dwrite cmd/nvedit.c | 3 +- common/Makefile | 1 + common/env_sata.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 common/env_sata.c diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 9cf884e..b67563b 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -49,12 +49,13 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_NAND) && \ !defined(CONFIG_ENV_IS_IN_NVRAM) && \ !defined(CONFIG_ENV_IS_IN_ONENAND) && \ + !defined(CONFIG_ENV_IS_IN_SATA) && \ !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ !defined(CONFIG_ENV_IS_IN_REMOTE) && \ !defined(CONFIG_ENV_IS_IN_UBI) && \ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\ -SPI_FLASH|NVRAM|MMC|FAT|EXT4|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE +SATA|SPI_FLASH|NVRAM|MMC|FAT|EXT4|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE #endif /* diff --git a/common/Makefile b/common/Makefile index 9a4b817..b23f312 100644 --- a/common/Makefile +++ b/common/Makefile @@ -50,6 +50,7 @@ obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o obj-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o +obj-$(CONFIG_ENV_IS_IN_SATA) += env_sata.o obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o diff --git a/common/env_sata.c b/common/env_sata.c new file mode 100644 index 0000000..b0cee35 --- /dev/null +++ b/common/env_sata.c @@ -0,0 +1,127 @@ +/* + * (C) Copyright 2010-2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* #define DEBUG */ + +#include <common.h> + +#include <command.h> +#include <environment.h> +#include <linux/stddef.h> +#include <errno.h> +#include <memalign.h> +#include <sata.h> +#include <search.h> + +#if defined(CONFIG_ENV_SIZE_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) +#error ENV REDUND not supported +#endif + +#if !defined(CONFIG_ENV_OFFSET) || !defined(CONFIG_ENV_SIZE) +#error CONFIG_ENV_OFFSET or CONFIG_ENV_SIZE not defined +#endif + +char *env_name_spec = "SATA"; + +DECLARE_GLOBAL_DATA_PTR; + +__weak int sata_get_env_dev(void) +{ + return CONFIG_SYS_SATA_ENV_DEV; +} + +int env_init(void) +{ + /* use default */ + gd->env_addr = (ulong)&default_environment[0]; + gd->env_valid = 1; + + return 0; +} + +#ifdef CONFIG_CMD_SAVEENV +static inline int write_env(struct blk_desc *sata, unsigned long size, + unsigned long offset, void *buffer) +{ + uint blk_start, blk_cnt, n; + + blk_start = ALIGN(offset, sata->blksz) / sata->blksz; + blk_cnt = ALIGN(size, sata->blksz) / sata->blksz; + + n = blk_dwrite(sata, blk_start, blk_cnt, buffer); + + return (n == blk_cnt) ? 0 : -1; +} + +int saveenv(void) +{ + ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); + struct blk_desc *sata = NULL; + int env_sata, ret; + + if (sata_initialize()) + return 1; + + env_sata = sata_get_env_dev(); + + sata = sata_get_dev(env_sata); + if (sata == NULL) { + printf("Unknown SATA(%d) device for environment!\n", + env_sata); + return 1; + } + + ret = env_export(env_new); + if (ret) + return 1; + + printf("Writing to SATA(%d)...", env_sata); + if (write_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, &env_new)) { + puts("failed\n"); + return 1; + } + + puts("done\n"); + return 0; +} +#endif /* CONFIG_CMD_SAVEENV */ + +static inline int read_env(struct blk_desc *sata, unsigned long size, + unsigned long offset, void *buffer) +{ + uint blk_start, blk_cnt, n; + + blk_start = ALIGN(offset, sata->blksz) / sata->blksz; + blk_cnt = ALIGN(size, sata->blksz) / sata->blksz; + + n = blk_dread(sata, blk_start, blk_cnt, buffer); + + return (n == blk_cnt) ? 0 : -1; +} + +void env_relocate_spec(void) +{ + ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE); + struct blk_desc *sata = NULL; + int env_sata; + + if (sata_initialize()) + return; + + env_sata = sata_get_env_dev(); + + sata = sata_get_dev(env_sata); + if (sata == NULL) { + printf("Unknown SATA(%d) device for environment!\n", + env_sata); + return; + } + + if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) + return set_default_env(NULL); + + env_import(buf, 1); +} -- 2.6.2

3 4

[U-Boot] [PATCH] ubifs: fix memory corruption in super.c
by Heiko Schocher 21 Apr '16

21 Apr '16

In list "super_blocks" ubifs collects allocated super_block structs. U-Boot frees on unmount the allocated struct, so the pointer stored in this list is free after the umount. On a new ubifs mount, the new allocated super_block struct get inserted into the super_blocks list ... which contains now a freed pointer, and the list_add_tail() corrupts the freed memory ... 2 solutions are possible: - remove the super_block from the super_blocks list on umount - as U-Boot does not use the super_blocks list ... remove it complete for U-Boot. Both solutions should not introduce problems for porting to newer linux version, so this patch removes the unused super_blocks list, as it saves code size and execution time. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- pollux:u-boot hs [work] $ ./tools/buildman/buildman arm -s boards.cfg is up to date. Nothing to do. Summary of current source for 546 boards (8 threads, 1 job per thread) (no errors to report) pollux:u-boot hs [work] $ fs/ubifs/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index dcf3a47..effa8d9 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -48,7 +48,6 @@ struct vfsmount; #define INODE_LOCKED_MAX 64 struct super_block *ubifs_sb; -LIST_HEAD(super_blocks); static struct inode *inodes_locked_down[INODE_LOCKED_MAX]; @@ -2425,10 +2424,10 @@ retry: s->s_type = type; #ifndef __UBOOT__ strlcpy(s->s_id, type->name, sizeof(s->s_id)); + list_add_tail(&s->s_list, &super_blocks); #else strncpy(s->s_id, type->name, sizeof(s->s_id)); #endif - list_add_tail(&s->s_list, &super_blocks); hlist_add_head(&s->s_instances, &type->fs_supers); #ifndef __UBOOT__ spin_unlock(&sb_lock); -- 2.5.0

1 0

Re: [U-Boot] [PATCH v3] dm: spi: Read default speed and mode values from DT
by Qianyu Gong 21 Apr '16

21 Apr '16

Hi Vignesh, > Date: Wed, 13 Apr 2016 15:40:53 +0530 > From: Vignesh R <vigneshr(a)ti.com<mailto:vigneshr@ti.com>> > To: Jagan Teki <jteki(a)openedev.com<mailto:jteki@openedev.com>>, Tom Rini <trini(a)konsulko.com<mailto:trini@konsulko.com>> > Cc: u-boot(a)lists.denx.de<mailto:u-boot@lists.denx.de>, Stefan Roese <sr(a)denx.de<mailto:sr@denx.de>> > Subject: [U-Boot] [PATCH v3] dm: spi: Read default speed and mode > values from DT > Message-ID: <1460542253-10580-1-git-send-email-vigneshr(a)ti.com<mailto:1460542253-10580-1-git-send-email-vigneshr@ti.com>> > Content-Type: text/plain > > In case of DT boot, don't read default speed and mode for SPI from > CONFIG_*, instead read from DT node. This will make sure that boards > with multiple SPI/QSPI controllers can be probed at different > bus frequencies and SPI modes. > > Signed-off-by: Vignesh R <vigneshr(a)ti.com<mailto:vigneshr@ti.com>> > --- > > v3: Update commit message to mention SPI mode changes > > v2: Initialize speed, mode to 0 instead of -1 > > cmd/sf.c | 2 ++ > drivers/spi/spi-uclass.c | 8 ++++++-- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/cmd/sf.c b/cmd/sf.c > index 42862d9d921a..286906c3a151 100644 > --- a/cmd/sf.c > +++ b/cmd/sf.c > @@ -88,6 +88,8 @@ static int do_spi_flash_probe(int argc, char * const argv[]) > #ifdef CONFIG_DM_SPI_FLASH > struct udevice *new, *bus_dev; > int ret; > + /* In DM mode defaults will be taken from DT */ > + speed = 0, mode = 0; > #else > struct spi_flash *new; > #endif > diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c > index 5561f36762f9..5fb5630e2981 100644 > --- a/drivers/spi/spi-uclass.c > +++ b/drivers/spi/spi-uclass.c > @@ -264,6 +264,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int > mode, > struct udevice **busp, struct spi_slave **devp) > { > struct udevice *bus, *dev; > + struct dm_spi_slave_platdata *plat; > bool created = false; > int ret; > > @@ -280,8 +281,6 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int > mode, > * SPI flash chip - we will bind to the correct driver. > */ > if (ret == -ENODEV && drv_name) { > - struct dm_spi_slave_platdata *plat; > - > debug("%s: Binding new device '%s', busnum=%d, cs=%d, > driver=%s\n", > __func__, dev_name, busnum, cs, drv_name); > ret = device_bind_driver(bus, drv_name, dev_name, &dev); > @@ -308,6 +307,11 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int > mode, > slave->dev = dev; > } > > + plat = dev_get_parent_platdata(dev); > + if (!speed) { > + speed = plat->max_hz; > + mode = plat->mode; > + } > ret = spi_set_speed_mode(bus, speed, mode); > if (ret) > goto err; > -- I just doubt if spi_set_speed_mode() has really made a difference to the actual transfer. Seems that if the device is inactive, calling device_probe() would also call spi_set_speed_mode() and do the data transfer. Even if it's active, setting speed and mode for it again would not be necessary. Regards, Qianyu

2 4

[U-Boot] [PATCH v3 00/11] ARM: uniphier: add ARMv8 SoCs support
by Masahiro Yamada 21 Apr '16

21 Apr '16

Masahiro Yamada (11): pinctrl: uniphier: rename function/array names pinctrl: uniphier: fix NAND and SD pin-mux settings for PH1-LD11/LD20 ARM: uniphier: avoid unaligned access to DT on 64bit SoC ARM: dts: uniphier: use Ref Daughter board on PH1-LD20 Ref board ARM: dts: uniphier: move aliases node up to satisfy fdtgrep ARM: uniphier: add sg_set_iectrl_range() ARM: uniphier: add PH1-LD20 SoC support ARM: uniphier: reserve the last 64 byte of SDRAM ARM: dts: uniphier: add SD controller node for PH1-LD20 clk: uniphier: add Media I/O clock driver support for PH1-LD20 ARM: uniphier: increase image load speed from NOR device arch/arm/dts/uniphier-ph1-ld11-ref.dts | 18 +- arch/arm/dts/uniphier-ph1-ld20-ref.dts | 19 +- arch/arm/dts/uniphier-ph1-ld20.dtsi | 17 ++ arch/arm/mach-uniphier/Kconfig | 5 + arch/arm/mach-uniphier/Makefile | 1 + arch/arm/mach-uniphier/arm64/Makefile | 10 + arch/arm/mach-uniphier/arm64/arm-cci500.c | 41 +++ arch/arm/mach-uniphier/arm64/mem_map.c | 28 ++ arch/arm/mach-uniphier/arm64/smp.S | 19 ++ arch/arm/mach-uniphier/arm64/smp_kick_cpus.c | 31 +++ arch/arm/mach-uniphier/arm64/timer.c | 38 +++ arch/arm/mach-uniphier/board_common.c | 6 +- arch/arm/mach-uniphier/board_early_init_f.c | 8 + arch/arm/mach-uniphier/board_late_init.c | 2 +- arch/arm/mach-uniphier/boards.c | 25 ++ arch/arm/mach-uniphier/boot-mode/Makefile | 1 + arch/arm/mach-uniphier/boot-mode/boot-device.h | 2 + arch/arm/mach-uniphier/boot-mode/boot-mode-ld20.c | 77 ++++++ arch/arm/mach-uniphier/boot-mode/boot-mode.c | 4 + arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c | 5 + arch/arm/mach-uniphier/clk/Makefile | 1 + arch/arm/mach-uniphier/clk/clk-ld20.c | 14 + arch/arm/mach-uniphier/cpu_info.c | 2 +- arch/arm/mach-uniphier/dram/Makefile | 1 + arch/arm/mach-uniphier/dram/ddrphy-ld20-regs.h | 41 +++ arch/arm/mach-uniphier/dram/umc-ld20-regs.h | 73 ++++++ arch/arm/mach-uniphier/dram/umc-ld20.c | 306 ++++++++++++++++++++++ arch/arm/mach-uniphier/dram_init.c | 10 +- arch/arm/mach-uniphier/early-clk/Makefile | 1 + arch/arm/mach-uniphier/early-clk/early-clk-ld20.c | 30 +++ arch/arm/mach-uniphier/init.h | 7 + arch/arm/mach-uniphier/init/Makefile | 1 + arch/arm/mach-uniphier/init/init-ld20.c | 53 ++++ arch/arm/mach-uniphier/init/init.c | 5 + arch/arm/mach-uniphier/memconf/Makefile | 1 + arch/arm/mach-uniphier/memconf/memconf-pxs2.c | 3 + arch/arm/mach-uniphier/pinctrl/Makefile | 1 + arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c | 46 ++++ arch/arm/mach-uniphier/sbc/Makefile | 1 + arch/arm/mach-uniphier/sg-regs.h | 11 +- configs/uniphier_ld20_defconfig | 28 ++ drivers/clk/uniphier/clk-uniphier-mio.c | 4 + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 8 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 34 +-- drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 34 +-- drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 34 +-- drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 34 +-- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 34 +-- drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 34 +-- include/configs/uniphier.h | 52 +++- 50 files changed, 1119 insertions(+), 142 deletions(-) create mode 100644 arch/arm/mach-uniphier/arm64/Makefile create mode 100644 arch/arm/mach-uniphier/arm64/arm-cci500.c create mode 100644 arch/arm/mach-uniphier/arm64/mem_map.c create mode 100644 arch/arm/mach-uniphier/arm64/smp.S create mode 100644 arch/arm/mach-uniphier/arm64/smp_kick_cpus.c create mode 100644 arch/arm/mach-uniphier/arm64/timer.c create mode 100644 arch/arm/mach-uniphier/boot-mode/boot-mode-ld20.c create mode 100644 arch/arm/mach-uniphier/clk/clk-ld20.c create mode 100644 arch/arm/mach-uniphier/dram/ddrphy-ld20-regs.h create mode 100644 arch/arm/mach-uniphier/dram/umc-ld20-regs.h create mode 100644 arch/arm/mach-uniphier/dram/umc-ld20.c create mode 100644 arch/arm/mach-uniphier/early-clk/early-clk-ld20.c create mode 100644 arch/arm/mach-uniphier/init/init-ld20.c create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c create mode 100644 configs/uniphier_ld20_defconfig -- 1.9.1

1 11

[U-Boot] [PATCH V2 1/3] dm: spi: soft_spi bug fix
by Peng Fan 21 Apr '16

21 Apr '16

When doing xfer, should use device->parent, but not device When doing bit xfer, should use "!!(tmpdout & 0x80)", but not "(tmpdout & 0x80)" Signed-off-by: Peng Fan <van.freenix(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- V2: Follow Simon's comments, split bug fix into seperate patch. drivers/spi/soft_spi.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index aa4abcc..8cdb520 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -34,7 +34,8 @@ struct soft_spi_priv { static int soft_spi_scl(struct udevice *dev, int bit) { - struct soft_spi_platdata *plat = dev->platdata; + struct udevice *bus = dev_get_parent(dev); + struct soft_spi_platdata *plat = dev_get_platdata(bus); dm_gpio_set_value(&plat->sclk, bit); @@ -43,7 +44,8 @@ static int soft_spi_scl(struct udevice *dev, int bit) static int soft_spi_sda(struct udevice *dev, int bit) { - struct soft_spi_platdata *plat = dev->platdata; + struct udevice *bus = dev_get_parent(dev); + struct soft_spi_platdata *plat = dev_get_platdata(bus); dm_gpio_set_value(&plat->mosi, bit); @@ -52,7 +54,8 @@ static int soft_spi_sda(struct udevice *dev, int bit) static int soft_spi_cs_activate(struct udevice *dev) { - struct soft_spi_platdata *plat = dev->platdata; + struct udevice *bus = dev_get_parent(dev); + struct soft_spi_platdata *plat = dev_get_platdata(bus); dm_gpio_set_value(&plat->cs, 0); dm_gpio_set_value(&plat->sclk, 0); @@ -63,7 +66,8 @@ static int soft_spi_cs_activate(struct udevice *dev) static int soft_spi_cs_deactivate(struct udevice *dev) { - struct soft_spi_platdata *plat = dev->platdata; + struct udevice *bus = dev_get_parent(dev); + struct soft_spi_platdata *plat = dev_get_platdata(bus); dm_gpio_set_value(&plat->cs, 0); @@ -100,8 +104,9 @@ static int soft_spi_release_bus(struct udevice *dev) static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { - struct soft_spi_priv *priv = dev_get_priv(dev); - struct soft_spi_platdata *plat = dev->platdata; + struct udevice *bus = dev_get_parent(dev); + struct soft_spi_priv *priv = dev_get_priv(bus); + struct soft_spi_platdata *plat = dev_get_platdata(bus); uchar tmpdin = 0; uchar tmpdout = 0; const u8 *txd = dout; @@ -134,7 +139,7 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen, if (!cpha) soft_spi_scl(dev, 0); - soft_spi_sda(dev, tmpdout & 0x80); + soft_spi_sda(dev, !!(tmpdout & 0x80)); udelay(plat->spi_delay_us); if (cpha) soft_spi_scl(dev, 0); -- 2.6.2

2 6

[U-Boot] U-Boot for Galileo Gen 1 Board
by Pablo Fonovich 21 Apr '16

21 Apr '16

Hi: I previously worked with u-boot for beaglebone black for booting a custom linux system. Now the university got a donnation of some galileo boards, and we want to do something similar. The problem is that we don't know what we need to put into the sd card to make the board boot from it... With beaglebone i had to copy the u-boot.img and MLO, but is not the same with galileo an we don't know where to find that information. We used galileo_defconfig and instructions in README_x86 for building u-boot, but now we do not know how to proceed. Anyone could give me some hints? Thanks

3 3

[U-Boot] [RFC 1/2] mmc: introduce mmc_power_init and pwrup hook function
by Peng Fan 21 Apr '16

21 Apr '16

In device tree, there is vmmc-supply property for SD/MMC. Introduce mmc_power_init function and pwrup hook function to let the specific drivers handle vmmc-supply. mmc_power_init will first invoke board_mmc_power_init to avoid break boards which already implement board_mmc_power_init. Then if pwrup hook functions have been implemented for different mmc drivers, pwrup will be invoked. Signed-off-by: Peng Fan <van.freenix(a)gmail.com> Cc: Pantelis Antoniou <panto(a)antoniou-consulting.com> Cc: Andrew Gabbasov <andrew_gabbasov(a)mentor.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Clemens Gruber <clemens.gruber(a)pqgruber.com> Cc: Eric Nelson <eric(a)nelint.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> --- drivers/mmc/mmc.c | 15 ++++++++++++++- include/mmc.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index ede5d6e..f6d5c6f 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1594,6 +1594,16 @@ __weak void board_mmc_power_init(void) { } +__weak int mmc_power_init(struct mmc *mmc) +{ + board_mmc_power_init(); + + if (mmc->cfg->ops->pwrup) + return mmc->cfg->ops->pwrup(mmc); + + return 0; +} + int mmc_start_init(struct mmc *mmc) { int err; @@ -1613,7 +1623,10 @@ int mmc_start_init(struct mmc *mmc) #ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT mmc_adapter_card_type_ident(); #endif - board_mmc_power_init(); + + err = mmc_power_init(mmc); + if (err) + return err; /* made sure it's not NULL earlier */ err = mmc->cfg->ops->init(mmc); diff --git a/include/mmc.h b/include/mmc.h index d652c14..111ff75 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -329,6 +329,7 @@ struct mmc_ops { int (*init)(struct mmc *mmc); int (*getcd)(struct mmc *mmc); int (*getwp)(struct mmc *mmc); + int (*pwrup)(struct mmc *mmc); }; struct mmc_config { -- 2.6.2

2 6