June 2017 - U-Boot

[U-Boot] [PATCH v10 0/6] Add Intel Arria 10 SoC FPGA driver
by tien.fong.chee＠intel.com 28 Jun '17

28 Jun '17

From: Tien Fong Chee <tien.fong.chee(a)intel.com> This is the 10th version of patchset to adds support for Intel Arria 10 SoC FPGA driver. This version mainly resolved comments from Marek in [v9]. This series is working on top of u-boot-socfpga.git - http://git.denx.de/u-boot-socfpga.git [v9]: https://www.mail-archive.com/u-boot@lists.denx.de/msg252422.html v9 -> v10 changes: ----------------- - Moved astro_mcf5373_defocnfig into patch 3(v10). - Keep fpga_manager intact by removing patch 6(v9) and patch 7(v9). Patchset history ---------------- [v1]: https://www.mail-archive.com/u-boot@lists.denx.de/msg247788.html [v2]: https://www.mail-archive.com/u-boot@lists.denx.de/msg248541.html [v3]: https://www.mail-archive.com/u-boot@lists.denx.de/msg249160.html [v4]: https://www.mail-archive.com/u-boot@lists.denx.de/msg250149.html [v5]: https://www.mail-archive.com/u-boot@lists.denx.de/msg250517.html [v6]: https://www.mail-archive.com/u-boot@lists.denx.de/msg250687.html [v7]: https://www.mail-archive.com/u-boot@lists.denx.de/msg251213.html [v8]: https://www.mail-archive.com/u-boot@lists.denx.de/msg252196.html Tien Fong Chee (6): arm: socfpga: Remove unused passing parameter of socfpga_bridges_reset arm: socfpga: Restructure FPGA driver in the preparation to support A10 arm: socfpga: Convert FPGA and FPGA_ALTERA configuration to Kconfig arm: socfpga: Convert FPGA_SOCFPGA configuration to Kconfig drivers: Enable FPGA driver build on SPL arm: socfpga: Add FPGA driver support for Arria 10 arch/arm/mach-socfpga/Makefile | 2 +- arch/arm/mach-socfpga/include/mach/fpga_manager.h | 70 +-- .../include/mach/fpga_manager_arria10.h | 100 +++++ .../mach/{fpga_manager.h => fpga_manager_gen5.h} | 69 ++- .../include/mach/reset_manager_arria10.h | 2 +- arch/arm/mach-socfpga/reset_manager_arria10.c | 4 +- configs/astro_mcf5373l_defconfig | 1 + configs/socfpga_arria10_defconfig | 2 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de10_nano_defconfig | 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/theadorable_defconfig | 1 + drivers/Makefile | 1 + drivers/fpga/Kconfig | 8 + drivers/fpga/Makefile | 2 + drivers/fpga/socfpga.c | 241 +---------- drivers/fpga/socfpga_arria10.c | 479 +++++++++++++++++++++ drivers/fpga/{socfpga.c => socfpga_gen5.c} | 54 +-- include/configs/astro_mcf5373l.h | 2 - include/configs/socfpga_common.h | 6 +- include/configs/theadorable.h | 2 - 30 files changed, 660 insertions(+), 398 deletions(-) create mode 100644 arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h copy arch/arm/mach-socfpga/include/mach/{fpga_manager.h => fpga_manager_gen5.h} (57%) create mode 100644 drivers/fpga/socfpga_arria10.c copy drivers/fpga/{socfpga.c => socfpga_gen5.c} (83%) -- 2.2.0

3 12

[U-Boot] Please pull u-boot-x86
by Bin Meng 27 Jun '17

27 Jun '17

Hi Tom, The following changes since commit 7df4ff2c2689a6d3c16eb0c3cce098fcac622b0c: Merge branch 'master' of git://git.denx.de/u-boot-rockchip (2017-06-23 11:02:21 -0400) are available in the git repository at: git://git.denx.de/u-boot-x86.git for you to fetch changes up to da2364cc14a0b34411c4a228ae687a23504afe04: Revert "x86: Convert MMC to driver model" (2017-06-27 16:31:30 +0800) ---------------------------------------------------------------- Bin Meng (1): Revert "x86: Convert MMC to driver model" arch/Kconfig | 1 - arch/x86/cpu/baytrail/valleyview.c | 12 ++++++++++++ arch/x86/cpu/quark/quark.c | 10 ++++++++++ arch/x86/cpu/queensbay/Makefile | 2 +- arch/x86/cpu/queensbay/topcliff.c | 20 ++++++++++++++++++++ drivers/mmc/pci_mmc.c | 86 ++++++++++++++++++++++++++------------------------------------------------------------ include/mmc.h | 12 ++++++++++++ 7 files changed, 81 insertions(+), 62 deletions(-) create mode 100644 arch/x86/cpu/queensbay/topcliff.c Regards, Bin

2 1

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 27 Jun '17

27 Jun '17

Hi Tom, this should be my last PR for the release. I checked which fixes should go into release and all other patches can wait. I am starting to merge pending patches into -next. Most of commits are fixes (mx25, pciimx,..). Exception is pico-imx7d: I merged since a lot of time, and I convinced I have already sent a PR...sorry, for that. For all imxers: let me know if I missed aome patches that *must* flow into 2017.07. IMHO all of the pending patches can wait and I merge now in -next. The following changes since commit ccbbada0a59fead35495409d0c2c7bcb22a40278: Merge branch 'master' of git://git.denx.de/u-boot-mmc (2017-05-30 14:07:23 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 65496a34835cb4c9547bd02dd15b018c333add9d: mx6: soc: Fix typo in temperature unit name (2017-06-27 09:06:09 +0200) ---------------------------------------------------------------- Benoît Thébaudeau (4): mmc: fsl_esdhc: Allow all supported prescaler values mx25: Fix imx_get_perclk() mx25: Add function to set PER clocks mx25pdk: Set the eSDHC PER clock to 48 MHz Fabio Estevam (5): mx7dsabresd: Increase CONFIG_ENV_OFFSET mx6sabresd: Rename target to mx6sabresd_defconfig mx6sabresd: Update the config file mx6sabresd: Update to SPL only mode mx6: soc: Fix typo in temperature unit name Jagan Teki (9): mmc: fsl_esdhc: Move non DM_MMC code in #ifndef CONFIG_DM_MMC engicam: Move SPL mmc configs under CONFIG_SPL_BUILD icorem6: Recover missing nand defconfig drivers: net: Kconfig: Add PHY_MICREL_KSZ9021 entry engicam: Move PHY configs to defconfig icorem6: Remove unused FEC configs engicam: Set console env on board_late_init engicam: Add fdt_addr env value based on cpu_type engicam: Generate single config file Lothar Waßmann (1): arm: mx6: remove unused config variable CONFIG_SPL_NAND_MXS Peng Fan (2): regulator: pfuze100: add SPDX License regulator: pfuze100: unsigned compared against 0 Tim Harvey (1): drivers: pci: imx: add imx_pcie_remove function Vanessa Maegima (1): pico-imx7d: Add initial support arch/arm/cpu/arm926ejs/mx25/generic.c | 30 +++++++++- arch/arm/cpu/armv7/mx6/soc.c | 2 +- arch/arm/cpu/armv7/mx7/Kconfig | 8 +++ arch/arm/imx-common/cpu.c | 3 + arch/arm/include/asm/arch-mx25/clock.h | 1 + board/engicam/common/board.c | 5 ++ board/engicam/geam6ul/Kconfig | 2 +- board/engicam/icorem6/Kconfig | 2 +- board/engicam/icorem6_rqs/Kconfig | 2 +- board/engicam/isiotmx6ul/Kconfig | 2 +- board/freescale/mx25pdk/mx25pdk.c | 6 ++ board/freescale/mx6sabresd/MAINTAINERS | 4 +- board/freescale/mx6sabresd/README | 84 ++++++++++------------------ board/technexion/pico-imx7d/Kconfig | 15 +++++ board/technexion/pico-imx7d/MAINTAINERS | 7 +++ board/technexion/pico-imx7d/Makefile | 6 ++ board/technexion/pico-imx7d/README | 49 ++++++++++++++++ board/technexion/pico-imx7d/imximage.cfg | 98 ++++++++++++++++++++++++++++++++ board/technexion/pico-imx7d/pico-imx7d.c | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configs/imx6qdl_icore_mmc_defconfig | 2 + configs/imx6qdl_icore_nand_defconfig | 47 ++++++++++++++++ configs/imx6qdl_icore_rqs_mmc_defconfig | 3 + configs/imx6ul_geam_mmc_defconfig | 2 + configs/imx6ul_geam_nand_defconfig | 2 + configs/imx6ul_isiot_emmc_defconfig | 2 + configs/imx6ul_isiot_mmc_defconfig | 2 + configs/imx6ul_isiot_nand_defconfig | 2 + configs/{mx6sabresd_spl_defconfig => mx6sabresd_defconfig} | 0 configs/pico-imx7d_defconfig | 35 ++++++++++++ drivers/mmc/fsl_esdhc.c | 53 +++++++++--------- drivers/net/phy/Kconfig | 8 +++ drivers/pci/pcie_imx.c | 38 +++++++++++++ drivers/power/regulator/pfuze100.c | 14 ++++- include/configs/{imx6qdl_icore.h => imx6-engicam.h} | 47 +++++++++++----- include/configs/imx6_spl.h | 5 -- include/configs/imx6qdl_icore_rqs.h | 147 ------------------------------------------------ include/configs/imx6ul_geam.h | 195 ---------------------------------------------------------------- include/configs/imx6ul_isiot.h | 196 ---------------------------------------------------------------- include/configs/mx7dsabresd.h | 2 +- include/configs/pico-imx7d.h | 143 +++++++++++++++++++++++++++++++++++++++++++++++ include/pci.h | 4 ++ scripts/config_whitelist.txt | 1 - 42 files changed, 912 insertions(+), 653 deletions(-) create mode 100644 board/technexion/pico-imx7d/Kconfig create mode 100644 board/technexion/pico-imx7d/MAINTAINERS create mode 100644 board/technexion/pico-imx7d/Makefile create mode 100644 board/technexion/pico-imx7d/README create mode 100644 board/technexion/pico-imx7d/imximage.cfg create mode 100644 board/technexion/pico-imx7d/pico-imx7d.c create mode 100644 configs/imx6qdl_icore_nand_defconfig rename configs/{mx6sabresd_spl_defconfig => mx6sabresd_defconfig} (100%) create mode 100644 configs/pico-imx7d_defconfig rename include/configs/{imx6qdl_icore.h => imx6-engicam.h} (84%) delete mode 100644 include/configs/imx6qdl_icore_rqs.h delete mode 100644 include/configs/imx6ul_geam.h delete mode 100644 include/configs/imx6ul_isiot.h create mode 100644 include/configs/pico-imx7d.h Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 27 Jun '17

27 Jun '17

Hello Tom, please pull from u-boot-i2c.git master The following changes since commit 7df4ff2c2689a6d3c16eb0c3cce098fcac622b0c: Merge branch 'master' of git://git.denx.de/u-boot-rockchip (2017-06-23 11:02:21 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 5e75ea15067ab8118a16f5b5f278ccae87819683: i2c_eeprom: add static to i2c_eeprom_std_ops/probe (2017-06-26 07:12:47 +0200) ---------------------------------------------------------------- Masahiro Yamada (1): i2c_eeprom: add static to i2c_eeprom_std_ops/probe drivers/misc/i2c_eeprom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(- bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [GIT PULL] u-boot-uniphier/master
by Masahiro Yamada 27 Jun '17

27 Jun '17

Hi Tom, Please pull some more UniPhier SoC updates: - fix sparse warnings - sync DT with Linux - add new board support (LD11/LD20 global) The following changes since commit 431c66a3bad13e13c1d44ef4ec3638f95e72e11d: Merge git://www.denx.de/git/u-boot-marvell (2017-06-23 08:23:14 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git for you to fetch changes up to 7bf378043f653d4edd0dc4a54a0a4c43fa8914c2: arm64: dts: uniphier: add support for LD20 Global board (2017-06-25 06:06:09 +0900) ---------------------------------------------------------------- Kunihiko Hayashi (2): arm64: dts: uniphier: add support for LD11 Global board arm64: dts: uniphier: add support for LD20 Global board Masahiro Yamada (2): ARM: uniphier: fix various sparse warnings ARM: dts: uniphier: sync DT with Linux next-20170622 arch/arm/dts/Makefile | 2 + arch/arm/dts/uniphier-ld11-global.dts | 79 +++++++++++++++++++++++++++++++++++ arch/arm/dts/uniphier-ld11-ref.dts | 2 +- arch/arm/dts/uniphier-ld11.dtsi | 40 +----------------- arch/arm/dts/uniphier-ld20-global.dts | 61 +++++++++++++++++++++++++++ arch/arm/dts/uniphier-ld20-ref.dts | 2 +- arch/arm/dts/uniphier-ld20.dtsi | 40 +----------------- arch/arm/dts/uniphier-ld4-ref.dts | 2 +- arch/arm/dts/uniphier-ld4.dtsi | 38 +---------------- arch/arm/dts/uniphier-ld6b-ref.dts | 2 +- arch/arm/dts/uniphier-ld6b.dtsi | 2 +- arch/arm/dts/uniphier-pinctrl.dtsi | 2 +- arch/arm/dts/uniphier-pro4-ace.dts | 4 +- arch/arm/dts/uniphier-pro4-ref.dts | 2 +- arch/arm/dts/uniphier-pro4-sanji.dts | 4 +- arch/arm/dts/uniphier-pro4.dtsi | 38 +---------------- arch/arm/dts/uniphier-pro5-4kbox.dts | 2 +- arch/arm/dts/uniphier-pro5.dtsi | 38 +---------------- arch/arm/dts/uniphier-pxs2-gentil.dts | 4 +- arch/arm/dts/uniphier-pxs2-vodka.dts | 2 +- arch/arm/dts/uniphier-pxs2.dtsi | 38 +---------------- arch/arm/dts/uniphier-ref-daughter.dtsi | 2 +- arch/arm/dts/uniphier-sld3-ref.dts | 2 +- arch/arm/dts/uniphier-sld3.dtsi | 38 +---------------- arch/arm/dts/uniphier-sld8-ref.dts | 2 +- arch/arm/dts/uniphier-sld8.dtsi | 38 +---------------- arch/arm/dts/uniphier-support-card.dtsi | 38 +---------------- arch/arm/mach-uniphier/arm64/arm-cci500.c | 2 + arch/arm/mach-uniphier/arm64/smp_kick_cpus.c | 2 + arch/arm/mach-uniphier/board_init.c | 2 +- arch/arm/mach-uniphier/clk/pll-pxs3.c | 2 + arch/arm/mach-uniphier/dram/umc-ld11.c | 14 +++---- arch/arm/mach-uniphier/dram/umc-pxs2.c | 2 +- arch/arm/mach-uniphier/dram_init.c | 1 + arch/arm/mach-uniphier/init.h | 2 +- drivers/clk/uniphier/clk-uniphier-core.c | 2 +- drivers/reset/reset-uniphier.c | 18 ++++---- 37 files changed, 198 insertions(+), 373 deletions(-) create mode 100644 arch/arm/dts/uniphier-ld11-global.dts create mode 100644 arch/arm/dts/uniphier-ld20-global.dts -- Best Regards Masahiro Yamada

2 1

[U-Boot] Porting issue
by Dan 27 Jun '17

27 Jun '17

I'm trying to port u-boot from the freescale mx6ul_14x14_evk to a custom board. Right now I'm just trying to setup the same build under the new target name. I've followed a porting guide document and created a new board directory, header file, and config file, but I'm getting the following error when I try to make. Where can I start looking to figure out what's causing this? scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config.h CFG u-boot.cfg In file included from include/config.h:6:0, from ./include/common.h:21: include/configs/mx6ul_customboard_v1.h:11:31: fatal error: asm/arch/imx-regs.h: No such file or directory compilation terminated. scripts/Makefile.autoconf:79: recipe for target 'u-boot.cfg' failed make[1]: *** [u-boot.cfg] Error 1 make: *** No rule to make target 'include/config/auto.conf', needed by 'include/config/uboot.release'. Stop.

1 0

[U-Boot] wrong location of CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT in cpu-dt.c for armv8
by Chevalier, Bruno (EXT - BE/Antwerp) 27 Jun '17

27 Jun '17

Hi, We are doing some quick prototyping and noticing some issues. Look at the latest changeset ( http://git.denx.de/?p=u-boot.git;a=commit;h=026f30ec3e846edb85b5df8265d8cad… ) that changed arch/arm/cpu/armv8/cpu-dt.c We can find the diff here: http://git.denx.de/?p=u-boot.git;a=blobdiff;f=arch/arm/cpu/armv8/cpu-dt.c;h… For some reason #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT Was moved to the line before the start of the definition of psci_update_dt(void *fdt). Our prototyping board uses PSCI, but we currently do not make use of CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT. >From the changeset's commit message: PSCI can be used on both multiple and single core socs. Current implementation only allows PSCI to work on multiple core socs. This patch removes this restriction so that PSCI can work on single core socs as well. Can somebody explain to me why the function definition of psci_update_dt is removed when CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT is not defined? According to me, the only thing that should have been removed (based on the commit message) is #ifdef CONFIG_MP . Kind regards, Bruno Chevalier

1 0

[U-Boot] [PATCH] Revert "x86: Convert MMC to driver model"
by Bin Meng 27 Jun '17

27 Jun '17

This reverts commit ddb3ac3c716f56cead695444e65a7ba7b0946555. With MMC converted to driver model, SCSI driver is broken due to zero address access at (ops->read) in block_dread() function. The fix (SCSI driver converted to DM) is ready in u-boot-dm branch, but it is too late for this relese to get that in. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/Kconfig | 1 - arch/x86/cpu/baytrail/valleyview.c | 12 ++++++ arch/x86/cpu/quark/quark.c | 10 +++++ arch/x86/cpu/queensbay/Makefile | 2 +- arch/x86/cpu/queensbay/topcliff.c | 20 +++++++++ drivers/mmc/pci_mmc.c | 86 ++++++++++++-------------------------- include/mmc.h | 12 ++++++ 7 files changed, 81 insertions(+), 62 deletions(-) create mode 100644 arch/x86/cpu/queensbay/topcliff.c diff --git a/arch/Kconfig b/arch/Kconfig index e447671..d04ab9f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -96,7 +96,6 @@ config X86 select DM_SPI select DM_SPI_FLASH select USB_EHCI_HCD - select DM_MMC if MMC imply CMD_FPGA_LOADMK imply CMD_GETTIME imply CMD_IO diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c index c58f6a8..87ba849 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -11,6 +11,18 @@ #include <asm/mrccache.h> #include <asm/post.h> +static struct pci_device_id mmc_supported[] = { + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT_SDIO }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT_SD }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT_EMMC2 }, + {}, +}; + +int cpu_mmc_init(bd_t *bis) +{ + return pci_mmc_init("ValleyView SDHCI", mmc_supported); +} + #ifndef CONFIG_EFI_APP int arch_cpu_init(void) { diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index c36a589..0c2cea4 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -16,6 +16,11 @@ #include <asm/arch/msg_port.h> #include <asm/arch/quark.h> +static struct pci_device_id mmc_supported[] = { + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QRK_SDIO }, + {}, +}; + static void quark_setup_mtrr(void) { u32 base, mask; @@ -323,6 +328,11 @@ int arch_early_init_r(void) return 0; } +int cpu_mmc_init(bd_t *bis) +{ + return pci_mmc_init("Quark SDHCI", mmc_supported); +} + int arch_misc_init(void) { #ifdef CONFIG_ENABLE_MRC_CACHE diff --git a/arch/x86/cpu/queensbay/Makefile b/arch/x86/cpu/queensbay/Makefile index c068199..af3ffad 100644 --- a/arch/x86/cpu/queensbay/Makefile +++ b/arch/x86/cpu/queensbay/Makefile @@ -5,4 +5,4 @@ # obj-y += fsp_configs.o irq.o -obj-y += tnc.o +obj-y += tnc.o topcliff.o diff --git a/arch/x86/cpu/queensbay/topcliff.c b/arch/x86/cpu/queensbay/topcliff.c new file mode 100644 index 0000000..b76dd7d --- /dev/null +++ b/arch/x86/cpu/queensbay/topcliff.c @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <mmc.h> +#include <pci_ids.h> + +static struct pci_device_id mmc_supported[] = { + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SDIO_0 }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SDIO_1 }, + {}, +}; + +int cpu_mmc_init(bd_t *bis) +{ + return pci_mmc_init("Topcliff SDHCI", mmc_supported); +} diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c index 6db8977..e39b476 100644 --- a/drivers/mmc/pci_mmc.c +++ b/drivers/mmc/pci_mmc.c @@ -6,71 +6,37 @@ */ #include <common.h> -#include <dm.h> #include <errno.h> #include <malloc.h> -#include <mapmem.h> #include <sdhci.h> #include <asm/pci.h> -struct pci_mmc_plat { - struct mmc_config cfg; - struct mmc mmc; -}; - -struct pci_mmc_priv { - struct sdhci_host host; - void *base; -}; - -static int pci_mmc_probe(struct udevice *dev) +int pci_mmc_init(const char *name, struct pci_device_id *mmc_supported) { - struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct pci_mmc_plat *plat = dev_get_platdata(dev); - struct pci_mmc_priv *priv = dev_get_priv(dev); - struct sdhci_host *host = &priv->host; - u32 ioaddr; + struct sdhci_host *mmc_host; + u32 iobase; int ret; - - dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &ioaddr); - host->ioaddr = map_sysmem(ioaddr, 0); - host->name = dev->name; - ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); - if (ret) - return ret; - host->mmc = &plat->mmc; - host->mmc->priv = &priv->host; - host->mmc->dev = dev; - upriv->mmc = host->mmc; - - return sdhci_probe(dev); + int i; + + for (i = 0; ; i++) { + struct udevice *dev; + + ret = pci_find_device_id(mmc_supported, i, &dev); + if (ret) + return ret; + mmc_host = malloc(sizeof(struct sdhci_host)); + if (!mmc_host) + return -ENOMEM; + + mmc_host->name = name; + dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &iobase); + mmc_host->ioaddr = (void *)(ulong)iobase; + mmc_host->quirks = 0; + mmc_host->max_clk = 0; + ret = add_sdhci(mmc_host, 0, 0); + if (ret) + return ret; + } + + return 0; } - -static int pci_mmc_bind(struct udevice *dev) -{ - struct pci_mmc_plat *plat = dev_get_platdata(dev); - - return sdhci_bind(dev, &plat->mmc, &plat->cfg); -} - -U_BOOT_DRIVER(pci_mmc) = { - .name = "pci_mmc", - .id = UCLASS_MMC, - .bind = pci_mmc_bind, - .probe = pci_mmc_probe, - .ops = &sdhci_ops, - .priv_auto_alloc_size = sizeof(struct pci_mmc_priv), - .platdata_auto_alloc_size = sizeof(struct pci_mmc_plat), -}; - -static struct pci_device_id mmc_supported[] = { - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT_SDIO) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT_SD) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT_EMMC2) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QRK_SDIO) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SDIO_0) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SDIO_1) }, - {}, -}; - -U_BOOT_PCI_DEVICE(pci_mmc, mmc_supported); diff --git a/include/mmc.h b/include/mmc.h index 6a0ea0a..00576fa 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -585,6 +585,18 @@ int cpu_mmc_init(bd_t *bis); int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr); int mmc_get_env_dev(void); +struct pci_device_id; + +/** + * pci_mmc_init() - set up PCI MMC devices + * + * This finds all the matching PCI IDs and sets them up as MMC devices. + * + * @name: Name to use for devices + * @mmc_supported: PCI IDs to search for, terminated by {0, 0} + */ +int pci_mmc_init(const char *name, struct pci_device_id *mmc_supported); + /* Set block count limit because of 16 bit register limit on some hardware*/ #ifndef CONFIG_SYS_MMC_MAX_BLK_COUNT #define CONFIG_SYS_MMC_MAX_BLK_COUNT 65535 -- 2.9.2

2 2

[U-Boot] [PATCH] mx6: soc: Fix typo in temperature unit name
by Fabio Estevam 27 Jun '17

27 Jun '17

The correct name is 'Celsius', so fix it accordingly. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- arch/arm/cpu/armv7/mx6/soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index dd94797..2bedbdb 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -158,7 +158,7 @@ u32 get_cpu_speed_grade_hz(void) * OCOTP_MEM0[7:6] (see Fusemap Description Table offset 0x480) * defines a 2-bit Temperature Grade * - * return temperature grade and min/max temperature in celcius + * return temperature grade and min/max temperature in Celsius */ #define OCOTP_MEM0_TEMP_SHIFT 6 -- 2.7.4

2 1

[U-Boot] [PATCH] am335x_evm_usbspl_defconfig: Fix USB RNDIS boot
by Vignesh R 27 Jun '17

27 Jun '17

It seems few config options are missing in the current am335x_evm_usbspl_defconfig causing USB RNDIS boot to fail on AM335x EVM. Fix this by adding required configs. Signed-off-by: Vignesh R <vigneshr(a)ti.com> --- configs/am335x_evm_usbspl_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index a79470e88685..0a32d41eae67 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -44,3 +44,7 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y +CONFIG_SPL_ETH_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USBETH_SUPPORT=y +CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" -- 2.11.0

2 5