July 2020 - U-Boot

[PATCH v3 00/15] add initial support for broadcom NS3 soc
by Rayagonda Kokatanur 08 Jul '20

08 Jul '20

This patch series adds initial support for Broadcom Northstar 3 SoC. NS3 is a octo-core 64-bit ARMv8 Cortex-A72 processors targeting a broad range of networking applications. Changes from v2: -Address review comments from Simon, Remove clock dt file inorder to maintain same dt file between uboot and linux. -Address self review comments, Rearrange the headers. Update MAINTAINERS file with dt file change. Changes from v1: -Address review comments from Marek Vasut, Split the series into samller and logical series like core, driver. -Address review comments from Simon Glass, Update MAINTAINERS file. Abhishek Shah (1): board: ns3: add api to save boot parameters passed from BL31 Bharat Gooty (2): include/configs: ns3: add env variables for Linux boot include/configs: ns3: add support for flashing images Bharat Kumar Reddy Gooty (1): board: ns3: limit U-boot relocation within 16MB memory Rayagonda Kokatanur (11): board: ns3: add support for Broadcom Northstar 3 arm: cpu: armv8: add L3 memory flush support configs: ns3: enable clock subsystem dt-bindings: memory: ns3: add memory definitions board: ns3: default reset type to L3 dt-bindings: memory: ns3: update GIC LPI address board: ns3: program GIC LPI tables configs: ns3: enable GIC ITS LPI table programing dt-bindings: memory: ns3: add ddr memory definition board: ns3: define ddr memory layout MAINTAINERS: update maintainers for broadcom ns3 platform MAINTAINERS | 16 +- arch/arm/Kconfig | 10 + arch/arm/cpu/armv8/Makefile | 1 + arch/arm/cpu/armv8/bcmns3/Makefile | 5 + arch/arm/cpu/armv8/bcmns3/lowlevel.S | 99 ++ arch/arm/dts/Makefile | 2 + arch/arm/dts/ns3-board.dts | 47 + arch/arm/dts/ns3.dtsi | 34 + arch/arm/include/asm/arch-bcmns3/bl33_info.h | 26 + board/broadcom/bcmns3/Kconfig | 15 + board/broadcom/bcmns3/Makefile | 5 + board/broadcom/bcmns3/ns3.c | 195 ++++ configs/bcm_ns3_defconfig | 25 + include/configs/bcm_ns3.h | 901 +++++++++++++++++++ include/dt-bindings/memory/bcm-ns3-mc.h | 65 ++ 15 files changed, 1445 insertions(+), 1 deletion(-) create mode 100644 arch/arm/cpu/armv8/bcmns3/Makefile create mode 100644 arch/arm/cpu/armv8/bcmns3/lowlevel.S create mode 100644 arch/arm/dts/ns3-board.dts create mode 100644 arch/arm/dts/ns3.dtsi create mode 100644 arch/arm/include/asm/arch-bcmns3/bl33_info.h create mode 100644 board/broadcom/bcmns3/Kconfig create mode 100644 board/broadcom/bcmns3/Makefile create mode 100644 board/broadcom/bcmns3/ns3.c create mode 100644 configs/bcm_ns3_defconfig create mode 100644 include/configs/bcm_ns3.h create mode 100644 include/dt-bindings/memory/bcm-ns3-mc.h -- 2.17.1

3 53

[PATCH 1/2] spi: Remove unnecessary #ifdefs in header file
by Simon Glass 08 Jul '20

08 Jul '20

These prevent use of compile-time checks such as: if (CONFIG_IS_ENABLED(DM_SPI)) since, for example, if CONFIG_SPL_DM_SPI is not enabled then the definitions are not included by spi.h and the C code will not build. The #ifdefs are unnecessary since there are no conflicts with the pre-DM code. In any case we have almost switched over to driver model for SPI. Drop these #ifdefs from spi.h to fix a build warning on chromebook_coral in the following patch. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- include/spi.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/spi.h b/include/spi.h index 9b4fb8dc0b..7fca646759 100644 --- a/include/spi.h +++ b/include/spi.h @@ -39,7 +39,6 @@ #define SPI_DEFAULT_WORDLEN 8 -#if CONFIG_IS_ENABLED(DM_SPI) /* TODO(sjg(a)chromium.org): Remove this and use max_hz from struct spi_slave */ struct dm_spi_bus { uint max_hz; @@ -65,8 +64,6 @@ struct dm_spi_slave_platdata { uint mode; }; -#endif /* CONFIG_DM_SPI */ - /** * enum spi_clock_phase - indicates the clock phase to use for SPI (CPHA) * @@ -317,7 +314,6 @@ void spi_flash_copy_mmap(void *data, void *offset, size_t len); */ int spi_cs_is_valid(unsigned int bus, unsigned int cs); -#if !CONFIG_IS_ENABLED(DM_SPI) /** * Activate a SPI chipselect. * This function is provided by the board code when using a driver @@ -343,7 +339,6 @@ void spi_cs_deactivate(struct spi_slave *slave); * @hz: The transfer speed */ void spi_set_speed(struct spi_slave *slave, uint hz); -#endif /** * Write 8 bits, then read 8 bits. @@ -367,8 +362,6 @@ static inline int spi_w8r8(struct spi_slave *slave, unsigned char byte) return ret < 0 ? ret : din[1]; } -#if CONFIG_IS_ENABLED(DM_SPI) - /** * struct spi_cs_info - Information about a bus chip select * @@ -717,6 +710,5 @@ int dm_spi_get_mmap(struct udevice *dev, ulong *map_basep, uint *map_sizep, /* Access the operations for a SPI device */ #define spi_get_ops(dev) ((struct dm_spi_ops *)(dev)->driver->ops) #define spi_emul_get_ops(dev) ((struct dm_spi_emul_ops *)(dev)->driver->ops) -#endif /* CONFIG_DM_SPI */ #endif /* _SPI_H_ */ -- 2.27.0.212.ge8ba1cc988-goog

2 7

[PATCH] gpio: fix test.py for gpio label lookup
by Heiko Schocher 08 Jul '20

08 Jul '20

commit 2bd261dd1712 ("gpio: search for gpio label if gpio is not found through bank name") disabled DM_GPIO_LOOKUP_LABEL which is needed in sandbox defconfigs, as we have tests for this functionality. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 06ccbcd7aa..dcf2f44b58 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -100,6 +100,7 @@ CONFIG_DM_DEMO_SHAPE=y CONFIG_BOARD=y CONFIG_BOARD_SANDBOX=y CONFIG_GPIO_HOG=y +CONFIG_DM_GPIO_LOOKUP_LABEL=y CONFIG_PM8916_GPIO=y CONFIG_SANDBOX_GPIO=y CONFIG_I2C_CROS_EC_TUNNEL=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 61b608b7d4..e0dffa36ea 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -118,6 +118,7 @@ CONFIG_DMA=y CONFIG_DMA_CHANNELS=y CONFIG_SANDBOX_DMA=y CONFIG_GPIO_HOG=y +CONFIG_DM_GPIO_LOOKUP_LABEL=y CONFIG_PM8916_GPIO=y CONFIG_SANDBOX_GPIO=y CONFIG_DM_HWSPINLOCK=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index da0e970b7a..4158b9b86d 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -85,6 +85,7 @@ CONFIG_DM_DEMO_SHAPE=y CONFIG_BOARD=y CONFIG_BOARD_SANDBOX=y CONFIG_GPIO_HOG=y +CONFIG_DM_GPIO_LOOKUP_LABEL=y CONFIG_PM8916_GPIO=y CONFIG_SANDBOX_GPIO=y CONFIG_I2C_CROS_EC_TUNNEL=y -- 2.24.1

2 1

'next' now merged to 'master'
by Tom Rini 08 Jul '20

08 Jul '20

Hey all, I have now merged the next branch back in to master and pushed that out. -- Tom

2 2

Pull request: u-boot-rockchip-20200708
by Kever Yang 08 Jul '20

08 Jul '20

Hi Tom, Please pull the rockchip updates: - dts sync from kernel for rk3399 boards; - Add Radxa Rock Pi N8, N10; - Some feature update for Pinebook Pro; Gitlab ci: https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/3907 Thanks, - Kever The following changes since commit 2f5fbb5b39f7b67044dda5c35e4a4b31685a3109: Prepare v2020.07 (2020-07-06 15:22:53 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200708 for you to fetch changes up to ad277eb4587ab1ac710ce8fd2b733874032d951f: ARM: dts: rockchip: Add Radxa Rock Pi N8 initial support (2020-07-07 19:45:57 +0800) ---------------------------------------------------------------- Hugh Cole-Baker (1): rockchip: rk3399: allow deselecting SPL_ATF_NO_PLATFORM_PARAM Jagan Teki (7): arm64: dts: rockchip: Sync v5.7-rc1 rk3399pro.dtsi arm64: dts: rockchip: Sync v5.7-rc1 VMARC RK3399Pro SOM ARM: dts: rockchip: Sync v5.7-rc1 Radxa Dalang Carrier arm64: dts: rockchip: Add Radxa Rock Pi N10 initial support ARM: dts: rockchip: radxa-dalang: Update sdmmc properties ARM: dts: rockchip: Add VMARC RK3288 SOM initial support ARM: dts: rockchip: Add Radxa Rock Pi N8 initial support Marcin Juszkiewicz (1): rockchip: rockpro64: initialize USB in preboot Peter Robinson (3): rockchip: Pinebook Pro: enable rng to provide an entropy source rockchip: Pinebook Pro: Fix USB and the USB attached keyboard rockchip: Pinebook Pro: Fix SPI flash and store env on it arch/arm/dts/Makefile | 4 +- arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi | 33 +++ arch/arm/dts/rk3288-rock-pi-n8.dts | 17 ++ arch/arm/dts/rk3288-vmarc-som.dtsi | 289 ++++++++++++++++++++ arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 10 +- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 + arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 7 + arch/arm/dts/rk3399pro-rock-pi-n10.dts | 18 ++ arch/arm/dts/rk3399pro-u-boot.dtsi | 6 + arch/arm/dts/rk3399pro-vmarc-som.dtsi | 338 ++++++++++++++++++++++++ arch/arm/dts/rk3399pro.dtsi | 22 ++ arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi | 79 ++++++ arch/arm/mach-rockchip/Kconfig | 2 +- board/rockchip/evb_rk3288/MAINTAINERS | 6 + board/rockchip/evb_rk3399/MAINTAINERS | 6 + configs/pinebook-pro-rk3399_defconfig | 12 +- configs/rock-pi-n10-rk3399pro_defconfig | 46 ++++ configs/rock-pi-n8-rk3288_defconfig | 66 +++++ configs/rockpro64-rk3399_defconfig | 2 + include/configs/pinebook-pro-rk3399.h | 12 +- 20 files changed, 966 insertions(+), 13 deletions(-) create mode 100644 arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi create mode 100644 arch/arm/dts/rk3288-rock-pi-n8.dts create mode 100644 arch/arm/dts/rk3288-vmarc-som.dtsi create mode 100644 arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399pro-rock-pi-n10.dts create mode 100644 arch/arm/dts/rk3399pro-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399pro-vmarc-som.dtsi create mode 100644 arch/arm/dts/rk3399pro.dtsi create mode 100644 arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi create mode 100644 configs/rock-pi-n10-rk3399pro_defconfig create mode 100644 configs/rock-pi-n8-rk3288_defconfig

2 1

[RFC PATCH] mtd: spi: Drop redundent SPI flash driver
by Jagan Teki 08 Jul '20

08 Jul '20

UCLASS_SPI_FLASH driver at driver/mtd/spi is a generic spi flash driver to probe jedec,spi-nor flash chips. Technically a probe call in U_BOOT_DRIVER is local to that driver and not applicable to use it another driver or in another code. The apollolake SPL code using the generic probe by adding extra SPI flash driver, which make more confusion in terms of code readability and driver model structure. The fact that apollolake SPL requires a separate SPI flash driver to handle of-platdata via bind call, so move the bind call in the generic flash driver and drop the driver from apollolake code. I hope this wouldn't break generic code usage flash chips otherwise, we can handle this via driver data or a separate spi driver in drivers/mtd/spi. Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Vignesh R <vigneshr(a)ti.com> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- arch/x86/cpu/apollolake/spl.c | 60 ----------------------------------- drivers/mtd/spi/sf_probe.c | 29 ++++++++++++++++- include/spi_flash.h | 12 ------- 3 files changed, 28 insertions(+), 73 deletions(-) diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c index d32f2a9898..2e6013d04c 100644 --- a/arch/x86/cpu/apollolake/spl.c +++ b/arch/x86/cpu/apollolake/spl.c @@ -65,66 +65,6 @@ SPL_LOAD_IMAGE_METHOD("Mapped SPI", 2, BOOT_DEVICE_SPI_MMAP, rom_load_image); #if CONFIG_IS_ENABLED(SPI_FLASH_SUPPORT) -static int apl_flash_std_read(struct udevice *dev, u32 offset, size_t len, - void *buf) -{ - struct spi_flash *flash = dev_get_uclass_priv(dev); - struct mtd_info *mtd = &flash->mtd; - size_t retlen; - - return log_ret(mtd->_read(mtd, offset, len, &retlen, buf)); -} - -static int apl_flash_probe(struct udevice *dev) -{ - return spi_flash_std_probe(dev); -} - -/* - * Manually set the parent of the SPI flash to SPI, since dtoc doesn't. We also - * need to allocate the parent_platdata since by the time this function is - * called device_bind() has already gone past that step. - */ -static int apl_flash_bind(struct udevice *dev) -{ - if (CONFIG_IS_ENABLED(OF_PLATDATA)) { - struct dm_spi_slave_platdata *plat; - struct udevice *spi; - int ret; - - ret = uclass_first_device_err(UCLASS_SPI, &spi); - if (ret) - return ret; - dev->parent = spi; - - plat = calloc(sizeof(*plat), 1); - if (!plat) - return -ENOMEM; - dev->parent_platdata = plat; - } - - return 0; -} - -static const struct dm_spi_flash_ops apl_flash_ops = { - .read = apl_flash_std_read, -}; - -static const struct udevice_id apl_flash_ids[] = { - { .compatible = "jedec,spi-nor" }, - { } -}; - -U_BOOT_DRIVER(winbond_w25q128fw) = { - .name = "winbond_w25q128fw", - .id = UCLASS_SPI_FLASH, - .of_match = apl_flash_ids, - .bind = apl_flash_bind, - .probe = apl_flash_probe, - .priv_auto_alloc_size = sizeof(struct spi_flash), - .ops = &apl_flash_ops, -}; - /* This uses a SPI flash device to read the next phase */ static int spl_fast_spi_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index f167bfab8a..06dac57daf 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -129,7 +129,7 @@ static int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len) return mtd->_erase(mtd, &instr); } -int spi_flash_std_probe(struct udevice *dev) +static int spi_flash_std_probe(struct udevice *dev) { struct spi_slave *slave = dev_get_parent_priv(dev); struct spi_flash *flash; @@ -154,6 +154,32 @@ static const struct dm_spi_flash_ops spi_flash_std_ops = { .erase = spi_flash_std_erase, }; +/* + * Manually set the parent of the SPI flash to SPI, since dtoc doesn't. We also + * need to allocate the parent_platdata since by the time this function is + * called device_bind() has already gone past that step. + */ +static int spi_flash_bind(struct udevice *dev) +{ + if (CONFIG_IS_ENABLED(OF_PLATDATA)) { + struct dm_spi_slave_platdata *plat; + struct udevice *spi; + int ret; + + ret = uclass_first_device_err(UCLASS_SPI, &spi); + if (ret) + return ret; + dev->parent = spi; + + plat = calloc(sizeof(*plat), 1); + if (!plat) + return -ENOMEM; + dev->parent_platdata = plat; + } + + return 0; +} + static const struct udevice_id spi_flash_std_ids[] = { { .compatible = "jedec,spi-nor" }, { } @@ -163,6 +189,7 @@ U_BOOT_DRIVER(spi_flash_std) = { .name = "spi_flash_std", .id = UCLASS_SPI_FLASH, .of_match = spi_flash_std_ids, + .bind = spi_flash_bind, .probe = spi_flash_std_probe, .remove = spi_flash_std_remove, .priv_auto_alloc_size = sizeof(struct spi_flash), diff --git a/include/spi_flash.h b/include/spi_flash.h index d9b2af856c..3b33b970ef 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -75,18 +75,6 @@ int spi_flash_write_dm(struct udevice *dev, u32 offset, size_t len, */ int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len); -/** - * spi_flash_std_probe() - Probe a SPI flash device - * - * This is the standard internal method for probing a SPI flash device to - * determine its type. It can be used in chip-specific drivers which need to - * do this, typically with of-platdata - * - * @dev: SPI-flash device to probe - * @return 0 if OK, -ve on error - */ -int spi_flash_std_probe(struct udevice *dev); - int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, struct udevice **devp); -- 2.20.1

2 3

[PATCH 1/2] mtd: spi: Separate dm vs nodm SF code
by Jagan Teki 08 Jul '20

08 Jul '20

Right now, the sf have common driver to handle both dm and nodm code, where nondm has spi_flash probe and dm has U_BOOT_DRIVER for dm spi flash. Having a common code base for dm and nodm with ifdef make it difficult to extend functionalities and also difficult to read. So, keep them separate and give scope to dm code for further enhancements. Cc: Simon Glass <sjg(a)chromium.org> Cc: Vignesh R <vigneshr(a)ti.com> Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- drivers/mtd/spi/Makefile | 8 ++- drivers/mtd/spi/sf-nodm.c | 76 +++++++++++++++++++++ drivers/mtd/spi/sf-uclass.c | 128 ++++++++++++++++++++++++++++++++++++ 3 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 drivers/mtd/spi/sf-nodm.c diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index b5dfa300de..b3ae74dbe8 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -3,8 +3,12 @@ # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. -obj-$(CONFIG_DM_SPI_FLASH) += sf-uclass.o -spi-nor-y := sf_probe.o spi-nor-ids.o +ifdef CONFIG_DM_SPI_FLASH +spi-nor-y += sf-uclass.o +else +spi-nor-y += sf-nodm.o +endif +spi-nor-y += spi-nor-ids.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o diff --git a/drivers/mtd/spi/sf-nodm.c b/drivers/mtd/spi/sf-nodm.c new file mode 100644 index 0000000000..b23014c2a8 --- /dev/null +++ b/drivers/mtd/spi/sf-nodm.c @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * SPI flash probing + * + * Copyright (C) 2008 Atmel Corporation + * Copyright (C) 2010 Reinhard Meyer, EMK Elektronik + * Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc. + */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <malloc.h> +#include <spi.h> +#include <spi_flash.h> + +#include "sf_internal.h" + +struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs, + unsigned int max_hz, unsigned int spi_mode) +{ + struct spi_slave *bus; + struct spi_flash *flash; + int ret; + + /* Allocate space if needed (not used by sf-uclass) */ + flash = calloc(1, sizeof(*flash)); + if (!flash) { + debug("SF: Failed to allocate spi_flash\n"); + return NULL; + } + + bus = spi_setup_slave(busnum, cs, max_hz, spi_mode); + if (!bus) { + printf("SF: Failed to set up slave\n"); + goto err_free; + } + + flash->spi = bus; + + /* Claim spi bus */ + ret = spi_claim_bus(bus); + if (ret) { + debug("SF: Failed to claim SPI bus: %d\n", ret); + goto err_free_slave; + } + + ret = spi_nor_scan(flash); + if (ret) + goto err_read_id; + + if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) { + ret = spi_flash_mtd_register(flash); + if (ret) + goto err_read_id; + } + + return flash; + +err_read_id: + spi_release_bus(bus); +err_free_slave: + spi_free_slave(bus); +err_free: + free(flash); + return NULL; +} + +void spi_flash_free(struct spi_flash *flash) +{ + if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) + spi_flash_mtd_unregister(); + + spi_free_slave(flash->spi); + free(flash); +} diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 5a42ab83c8..97a3f5d2c7 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -95,6 +95,134 @@ static int spi_flash_post_bind(struct udevice *dev) return 0; } +static int spi_flash_std_read(struct udevice *dev, u32 offset, size_t len, + void *buf) +{ + struct spi_flash *flash = dev_get_uclass_priv(dev); + struct mtd_info *mtd = &flash->mtd; + size_t retlen; + + return log_ret(mtd->_read(mtd, offset, len, &retlen, buf)); +} + +static int spi_flash_std_write(struct udevice *dev, u32 offset, size_t len, + const void *buf) +{ + struct spi_flash *flash = dev_get_uclass_priv(dev); + struct mtd_info *mtd = &flash->mtd; + size_t retlen; + + return mtd->_write(mtd, offset, len, &retlen, buf); +} + +static int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len) +{ + struct spi_flash *flash = dev_get_uclass_priv(dev); + struct mtd_info *mtd = &flash->mtd; + struct erase_info instr; + + if (offset % mtd->erasesize || len % mtd->erasesize) { + printf("SF: Erase offset/length not multiple of erase size\n"); + return -EINVAL; + } + + memset(&instr, 0, sizeof(instr)); + instr.addr = offset; + instr.len = len; + + return mtd->_erase(mtd, &instr); +} + +int spi_flash_std_probe(struct udevice *dev) +{ + struct spi_slave *slave = dev_get_parent_priv(dev); + struct spi_flash *flash; + int ret; + + if (!slave) { + printf("SF: Failed to set up slave\n"); + return -ENODEV; + } + + flash = dev_get_uclass_priv(dev); + flash->dev = dev; + flash->spi = slave; + + /* Claim spi bus */ + ret = spi_claim_bus(slave); + if (ret) { + debug("SF: Failed to claim SPI bus: %d\n", ret); + return ret; + } + + ret = spi_nor_scan(flash); + if (ret) + goto err_read_id; + + if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) + ret = spi_flash_mtd_register(flash); + +err_read_id: + spi_release_bus(slave); + return ret; +} + +static int spi_flash_std_remove(struct udevice *dev) +{ + if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) + spi_flash_mtd_unregister(); + + return 0; +} + +static const struct dm_spi_flash_ops spi_flash_std_ops = { + .read = spi_flash_std_read, + .write = spi_flash_std_write, + .erase = spi_flash_std_erase, +}; + +/* + * Manually set the parent of the SPI flash to SPI, since dtoc doesn't. We also + * need to allocate the parent_platdata since by the time this function is + * called device_bind() has already gone past that step. + */ +static int spi_flash_bind(struct udevice *dev) +{ + if (CONFIG_IS_ENABLED(OF_PLATDATA)) { + struct dm_spi_slave_platdata *plat; + struct udevice *spi; + int ret; + + ret = uclass_first_device_err(UCLASS_SPI, &spi); + if (ret) + return ret; + dev->parent = spi; + + plat = calloc(sizeof(*plat), 1); + if (!plat) + return -ENOMEM; + dev->parent_platdata = plat; + } + + return 0; +} + +static const struct udevice_id spi_flash_std_ids[] = { + { .compatible = "jedec,spi-nor" }, + { } +}; + +U_BOOT_DRIVER(spi_flash_std) = { + .name = "spi_flash_std", + .id = UCLASS_SPI_FLASH, + .of_match = spi_flash_std_ids, + .bind = spi_flash_bind, + .probe = spi_flash_std_probe, + .remove = spi_flash_std_remove, + .priv_auto_alloc_size = sizeof(struct spi_flash), + .ops = &spi_flash_std_ops, +}; + UCLASS_DRIVER(spi_flash) = { .id = UCLASS_SPI_FLASH, .name = "spi_flash", -- 2.20.1

3 12

[PATCH 1/1] lib/crypto: use qualified path for x509_parser.h
by Heinrich Schuchardt 08 Jul '20

08 Jul '20

Use the path relative to /include for x509_parser.h in pkcs7_parser.h. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/crypto/pkcs7_parser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/crypto/pkcs7_parser.h b/include/crypto/pkcs7_parser.h index b8234da45a..906033a90e 100644 --- a/include/crypto/pkcs7_parser.h +++ b/include/crypto/pkcs7_parser.h @@ -10,7 +10,7 @@ #include <linux/oid_registry.h> #include <crypto/pkcs7.h> -#include "x509_parser.h" +#include <crypto/x509_parser.h> #define kenter(FMT, ...) \ pr_devel("==> %s("FMT")\n", __func__, ##__VA_ARGS__) -- 2.27.0

1 0

[PATCH] rockchip: rk3288: Add OF board setup
by Jagan Teki 08 Jul '20

08 Jul '20

The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio and usb host0 ohci. In order to work these on the same in Linux kernel update the compatible the root compatible with rockchip,rk3288w before booting. So, this support during of board setup code of rk3288. Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/rk3288/rk3288.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index b1008a5058..822d8d4e9c 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -98,6 +98,7 @@ config ROCKCHIP_RK322X config ROCKCHIP_RK3288 bool "Support Rockchip RK3288" select CPU_V7A + select OF_BOARD_SETUP select SUPPORT_SPL select SPL select SUPPORT_TPL diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c index 804abe8a1b..8a682675e6 100644 --- a/arch/arm/mach-rockchip/rk3288/rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/rk3288.c @@ -115,6 +115,32 @@ int rk_board_late_init(void) return rk3288_board_late_init(); } +#ifdef CONFIG_OF_BOARD_SETUP + +#define RK3288_HDMI_PHYS 0xff980000 +#define RK3288W_HDMI_REV 0x1A +#define HDMI_CONFIG0_ID 0x04 + +int ft_board_setup(void *blob, bd_t *bd) +{ + u8 config0; + int ret; + + config0 = readb(RK3288_HDMI_PHYS + HDMI_CONFIG0_ID); + if (config0 == RK3288W_HDMI_REV) { + ret = fdt_setprop_string(blob, 0, + "compatible", "rockchip,rk3288w"); + if (ret < 0) { + printf("failed to set rk3288w compatible (ret=%d)\n", + ret); + return ret; + } + } + + return 0; +} +#endif + static int do_clock(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { -- 2.25.1

3 7

[PATCH v2 0/7] rockchip: Add RockPI N8/N10 support
by Jagan Teki 08 Jul '20

08 Jul '20

Rock Pi N10 is a Rockchip RK3399Pro based SBC, which has - VMARC RK3399Pro SOM (as per SMARC standard) from Vamrs. - Dalang carrier board from Radxa. Rock Pi N8 is a Rockchip RK3288 based SBC, which has - VMARC RK3288 SOM (as per SMARC standard) from Vamrs. - Compatible carrier board from Radxa. All the required dts(i) files are synced from linux-next v5.7-rc1 since the current sync available for rk3399 is the same. All the N8 dts patches are in Linux mainling list. Changes for v2: - rebase on master - collect Kever review tags Any inputs? Jagan. Jagan Teki (7): arm64: dts: rockchip: Sync v5.7-rc1 rk3399pro.dtsi arm64: dts: rockchip: Sync v5.7-rc1 VMARC RK3399Pro SOM ARM: dts: rockchip: Sync v5.7-rc1 Radxa Dalang Carrier arm64: dts: rockchip: Add Radxa Rock Pi N10 initial support arm64: dts: rockchip: Trivial cleanups for RockPI N10 ARM: dts: rockchip: Add VMARC RK3288 SOM initial support ARM: dts: rockchip: Add Radxa Rock Pi N8 initial support arch/arm/dts/Makefile | 4 +- arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi | 39 ++ arch/arm/dts/rk3288-rock-pi-n8.dts | 17 + arch/arm/dts/rk3288-vmarc-som.dtsi | 261 ++++++++++++++ .../arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 7 + arch/arm/dts/rk3399pro-rock-pi-n10.dts | 18 + arch/arm/dts/rk3399pro-u-boot.dtsi | 6 + arch/arm/dts/rk3399pro-vmarc-som.dtsi | 339 ++++++++++++++++++ arch/arm/dts/rk3399pro.dtsi | 22 ++ .../dts/rockchip-radxa-dalang-carrier.dtsi | 78 ++++ board/rockchip/evb_rk3288/MAINTAINERS | 6 + board/rockchip/evb_rk3399/MAINTAINERS | 6 + configs/rock-pi-n10-rk3399pro_defconfig | 46 +++ configs/rock-pi-n8-rk3288_defconfig | 66 ++++ 14 files changed, 914 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi create mode 100644 arch/arm/dts/rk3288-rock-pi-n8.dts create mode 100644 arch/arm/dts/rk3288-vmarc-som.dtsi create mode 100644 arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399pro-rock-pi-n10.dts create mode 100644 arch/arm/dts/rk3399pro-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399pro-vmarc-som.dtsi create mode 100644 arch/arm/dts/rk3399pro.dtsi create mode 100644 arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi create mode 100644 configs/rock-pi-n10-rk3399pro_defconfig create mode 100644 configs/rock-pi-n8-rk3288_defconfig -- 2.25.1

1 7