May 2018 - U-Boot

[U-Boot] [PATCH v4 0/4] ahci mvebu driver updates
by make＠marvell.com 29 May '18

29 May '18

From: Ken Ma <make(a)marvell.com> These patches move ahci mvebu driver to drivers/ata directory with bug fixing and scsi supporting. Changes in v4: - Base on the latest mainline git version - Let AHCI_MVEBU depend on AHCI and select SCSI_AHCI ahci_mvebu driver is based on AHCI UCLASS, so let AHCI_MVEBU based on AHCI; and this driver uses ahci_init() in ahci.c, so let it select SCSI_AHCI. In this patch, DM_SCSI is not selected and it will be selected in the later patch which adds scsi support by creating a SCSI device as a child of mvebu ahci device. - Let AHCI_MVEBU select DM_SCSI This patch adds scsi support by creating a SCSI device as a child of mvebu ahci device; the functions of creating SCSI device need the kconfig option DM_SCSI, so let AHCI_MVEBU select DM_SCSI. - Remove CONFIG_AHCI_MVEBU from marvell arm64 default config files Since AHCI_MVEBU selects SCSI_AHCI and it is added into marvell arm64 default config files, so CONFIG_SCSI_AHCI is removed. Changes in v3: - Use the new SPDX tags Changes in v2: - Add MAINTAINERS updating David Sniatkiwicz (1): ata: ahci_mvebu: a8040 a0: remove bad port register offsets workarounds Ken Ma (3): ata: mvebu: move mvebu sata driver to drivers/ata directory ata: ahci_mvebu: add scsi support arm64: mvebu: defconfig: enable CONFIG_AHCI_MVEBU MAINTAINERS | 1 + arch/arm/mach-mvebu/Makefile | 1 - configs/mvebu_db-88f3720_defconfig | 2 +- configs/mvebu_db_armada8k_defconfig | 2 +- configs/mvebu_espressobin-88f3720_defconfig | 2 +- configs/mvebu_mcbin-88f8040_defconfig | 2 +- drivers/ata/Kconfig | 11 +++++++++++ drivers/ata/Makefile | 1 + .../arm/mach-mvebu/sata.c => drivers/ata/ahci_mvebu.c | 19 +++++++++++++------ 9 files changed, 30 insertions(+), 11 deletions(-) rename arch/arm/mach-mvebu/sata.c => drivers/ata/ahci_mvebu.c (71%) -- 1.9.1

2 5

[U-Boot] [PATCH v2 1/3] mvebu: pinctrl: sync compatible string with Linux 4.17-rc4
by xswang＠marvell.com 29 May '18

29 May '18

From: Evan Wang <xswang(a)marvell.com> For pinctrl driver of mvebu, the compatible strings supported are defined differently from Linux version. The patch aligned the compatible string with Linux 4.17-rc4. Signed-off-by: Evan Wang <xswang(a)marvell.com> Reviewed-by: Stefan Roese <sr(a)denx.de> --- Changes in v2: - Add commit text. arch/arm/dts/armada-ap806.dtsi | 2 +- arch/arm/dts/armada-cp110-master.dtsi | 4 ++-- arch/arm/dts/armada-cp110-slave.dtsi | 2 +- .../pinctrl/marvell,mvebu-pinctrl.txt | 16 ++++++++-------- drivers/pinctrl/mvebu/pinctrl-mvebu.c | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/dts/armada-ap806.dtsi b/arch/arm/dts/armada-ap806.dtsi index e0d3016..ebdee51 100644 --- a/arch/arm/dts/armada-ap806.dtsi +++ b/arch/arm/dts/armada-ap806.dtsi @@ -141,7 +141,7 @@ }; ap_pinctl: ap-pinctl@6F4000 { - compatible = "marvell,armada-ap806-pinctrl"; + compatible = "marvell,ap806-pinctrl"; bank-name ="apn-806"; reg = <0x6F4000 0x10>; pin-count = <20>; diff --git a/arch/arm/dts/armada-cp110-master.dtsi b/arch/arm/dts/armada-cp110-master.dtsi index 8c336f2..551d00d 100644 --- a/arch/arm/dts/armada-cp110-master.dtsi +++ b/arch/arm/dts/armada-cp110-master.dtsi @@ -120,8 +120,8 @@ cpm_pinctl: cpm-pinctl@440000 { compatible = "marvell,mvebu-pinctrl", - "marvell,a70x0-pinctrl", - "marvell,a80x0-cp0-pinctrl"; + "marvell,armada-7k-pinctrl", + "marvell,armada-8k-cpm-pinctrl"; bank-name ="cp0-110"; reg = <0x440000 0x20>; pin-count = <63>; diff --git a/arch/arm/dts/armada-cp110-slave.dtsi b/arch/arm/dts/armada-cp110-slave.dtsi index 0cdb3d3..2ea9004 100644 --- a/arch/arm/dts/armada-cp110-slave.dtsi +++ b/arch/arm/dts/armada-cp110-slave.dtsi @@ -120,7 +120,7 @@ cps_pinctl: cps-pinctl@440000 { compatible = "marvell,mvebu-pinctrl", - "marvell,a80x0-cp1-pinctrl"; + "marvell,armada-8k-cps-pinctrl"; bank-name ="cp1-110"; reg = <0x440000 0x20>; pin-count = <63>; diff --git a/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt b/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt index 5f86c0a..1fc1bc6 100644 --- a/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt +++ b/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt @@ -6,10 +6,10 @@ mpp pins or group of pins and a mpp function common to all pins. Required properties for the pinctrl driver: - compatible: "marvell,mvebu-pinctrl", - "marvell,armada-ap806-pinctrl", - "marvell,a70x0-pinctrl", - "marvell,a80x0-cp0-pinctrl", - "marvell,a80x0-cp1-pinctrl" + "marvell,ap806-pinctrl", + "marvell,armada-7k-pinctrl", + "marvell,armada-8k-cpm-pinctrl", + "marvell,armada-8k-cps-pinctrl" - bank-name: A string defining the pinc controller bank name - reg: A pair of values defining the pin controller base address and the address space @@ -31,7 +31,7 @@ Example: config-space { pinctl: pinctl@6F4000 { compatible = "marvell,mvebu-pinctrl", - "marvell,armada-ap806-pinctrl"; + "marvell,ap806-pinctrl"; bank-name ="apn-806"; reg = <0x6F4000 0x10>; pin-count = <20>; @@ -52,8 +52,8 @@ Example: config-space { cpm_pinctl: pinctl@44000 { compatible = "marvell,mvebu-pinctrl", - "marvell,a70x0-pinctrl", - "marvell,a80x0-cp0-pinctrl"; + "marvell,armada-7k-pinctrl", + "marvell,armada-8k-cpm-pinctrl"; bank-name ="cp0-110"; reg = <0x440000 0x20>; pin-count = <63>; @@ -89,7 +89,7 @@ Example: config-space { cps_pinctl: pinctl@44000 { compatible = "marvell,mvebu-pinctrl", - "marvell,a80x0-cp1-pinctrl"; + "marvell,armada-8k-cps-pinctrl"; bank-name ="cp1-110"; reg = <0x440000 0x20>; pin-count = <63>; diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c index ec19583..556bf78 100644 --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c @@ -162,10 +162,10 @@ static struct pinctrl_ops mvebu_pinctrl_ops = { static const struct udevice_id mvebu_pinctrl_ids[] = { { .compatible = "marvell,mvebu-pinctrl" }, - { .compatible = "marvell,armada-ap806-pinctrl" }, - { .compatible = "marvell,a70x0-pinctrl" }, - { .compatible = "marvell,a80x0-cp0-pinctrl" }, - { .compatible = "marvell,a80x0-cp1-pinctrl" }, + { .compatible = "marvell,ap806-pinctrl" }, + { .compatible = "marvell,armada-7k-pinctrl" }, + { .compatible = "marvell,armada-8k-cpm-pinctrl" }, + { .compatible = "marvell,armada-8k-cps-pinctrl" }, { } }; -- 1.9.1

2 5

[U-Boot] [PATCH 0/6] ARM: kirkwood: dts conversion round 2
by Chris Packham 29 May '18

29 May '18

This is the second round of updating kirkwood boards to OF_CONTROL. Most of these boards use spi flash so I've added the u-boot specific "spi-flash" compatible string where appropriate. Chris Packham (6): ARM: kirkwood: Add device-tree for d2net_v2 & net2big_v2 ARM: kirkwood: Add device-tree for dreamplug ARM: kirkwood: Add device-tree for ds109 ARM: kirkwood: Add device-tree for lschlv2 & lsxhl ARM: kirkwood: Add device-tree for netspace & inetspace ARM: kirkwood: Add device-tree for keymile arch/arm/dts/kirkwood-d2net.dts | 45 ++ arch/arm/dts/kirkwood-dreamplug.dts | 127 ++++ arch/arm/dts/kirkwood-ds109.dts | 40 ++ arch/arm/dts/kirkwood-is2.dts | 40 ++ arch/arm/dts/kirkwood-km_common.dtsi | 47 ++ arch/arm/dts/kirkwood-km_kirkwood.dts | 31 + arch/arm/dts/kirkwood-lschlv2.dts | 20 + arch/arm/dts/kirkwood-lsxhl.dts | 20 + arch/arm/dts/kirkwood-lsxl.dtsi | 237 +++++++ arch/arm/dts/kirkwood-net2big.dts | 63 ++ arch/arm/dts/kirkwood-netxbig.dtsi | 232 +++++++ arch/arm/dts/kirkwood-ns2-common.dtsi | 97 +++ arch/arm/dts/kirkwood-ns2.dts | 40 ++ arch/arm/dts/kirkwood-ns2lite.dts | 35 + arch/arm/dts/kirkwood-ns2max.dts | 59 ++ arch/arm/dts/kirkwood-ns2mini.dts | 60 ++ arch/arm/dts/kirkwood-synology.dtsi | 855 ++++++++++++++++++++++++ configs/d2net_v2_defconfig | 3 +- configs/dreamplug_defconfig | 3 +- configs/ds109_defconfig | 2 + configs/inetspace_v2_defconfig | 3 +- configs/km_kirkwood_128m16_defconfig | 3 +- configs/km_kirkwood_defconfig | 3 +- configs/km_kirkwood_pci_defconfig | 3 +- configs/kmcoge5un_defconfig | 3 +- configs/kmnusa_defconfig | 3 +- configs/kmsugp1_defconfig | 3 +- configs/kmsuv31_defconfig | 3 +- configs/lschlv2_defconfig | 3 +- configs/lsxhl_defconfig | 3 +- configs/mgcoge3un_defconfig | 3 +- configs/net2big_v2_defconfig | 3 +- configs/netspace_lite_v2_defconfig | 3 +- configs/netspace_max_v2_defconfig | 3 +- configs/netspace_mini_v2_defconfig | 3 +- configs/netspace_v2_defconfig | 3 +- include/dt-bindings/leds/leds-netxbig.h | 18 + include/dt-bindings/leds/leds-ns2.h | 9 + 38 files changed, 2113 insertions(+), 18 deletions(-) create mode 100644 arch/arm/dts/kirkwood-d2net.dts create mode 100644 arch/arm/dts/kirkwood-dreamplug.dts create mode 100644 arch/arm/dts/kirkwood-ds109.dts create mode 100644 arch/arm/dts/kirkwood-is2.dts create mode 100644 arch/arm/dts/kirkwood-km_common.dtsi create mode 100644 arch/arm/dts/kirkwood-km_kirkwood.dts create mode 100644 arch/arm/dts/kirkwood-lschlv2.dts create mode 100644 arch/arm/dts/kirkwood-lsxhl.dts create mode 100644 arch/arm/dts/kirkwood-lsxl.dtsi create mode 100644 arch/arm/dts/kirkwood-net2big.dts create mode 100644 arch/arm/dts/kirkwood-netxbig.dtsi create mode 100644 arch/arm/dts/kirkwood-ns2-common.dtsi create mode 100644 arch/arm/dts/kirkwood-ns2.dts create mode 100644 arch/arm/dts/kirkwood-ns2lite.dts create mode 100644 arch/arm/dts/kirkwood-ns2max.dts create mode 100644 arch/arm/dts/kirkwood-ns2mini.dts create mode 100644 arch/arm/dts/kirkwood-synology.dtsi create mode 100644 include/dt-bindings/leds/leds-netxbig.h create mode 100644 include/dt-bindings/leds/leds-ns2.h -- 2.17.0

3 8

[U-Boot] [PATCH] board: turris_mox: Add fixed regulator support to defconfig
by Marek Behún 29 May '18

29 May '18

Without this USB3 won't work in U-Boot. Signed-off-by: Marek Behun <marek.behun(a)nic.cz> --- configs/turris_mox_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index 9538903bd3..45c1399687 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -63,6 +63,8 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_MVEBU_A3700_UART=y CONFIG_MVEBU_A3700_SPI=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y -- 2.16.1

2 2

[U-Boot] [PATCH 1/2] mvebu: neta: align DMA buffers
by Baruch Siach 29 May '18

29 May '18

From: Jon Nettleton <jon(a)solid-run.com> This makes sure the DMA buffers are properly aligned for the hardware. Signed-off-by: Jon Nettleton <jon(a)solid-run.com> Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- drivers/net/mvneta.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 7036b517b445..fc16986a00d6 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -1025,6 +1025,9 @@ static int mvneta_rxq_init(struct mvneta_port *pp, if (rxq->descs == NULL) return -ENOMEM; + BUG_ON(rxq->descs != + PTR_ALIGN(rxq->descs, ARCH_DMA_MINALIGN)); + rxq->last_desc = rxq->size - 1; /* Set Rx descriptors queue starting address */ @@ -1061,6 +1064,9 @@ static int mvneta_txq_init(struct mvneta_port *pp, if (txq->descs == NULL) return -ENOMEM; + BUG_ON(txq->descs != + PTR_ALIGN(txq->descs, ARCH_DMA_MINALIGN)); + txq->last_desc = txq->size - 1; /* Set maximum bandwidth for enabled TXQs */ @@ -1694,18 +1700,20 @@ static int mvneta_probe(struct udevice *dev) * be active. Make this area DMA safe by disabling the D-cache */ if (!buffer_loc.tx_descs) { + u32 size; + /* Align buffer area for descs and rx_buffers to 1MiB */ bd_space = memalign(1 << MMU_SECTION_SHIFT, BD_SPACE); mmu_set_region_dcache_behaviour((phys_addr_t)bd_space, BD_SPACE, DCACHE_OFF); buffer_loc.tx_descs = (struct mvneta_tx_desc *)bd_space; + size = roundup(MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc), + ARCH_DMA_MINALIGN); buffer_loc.rx_descs = (struct mvneta_rx_desc *) - ((phys_addr_t)bd_space + - MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc)); - buffer_loc.rx_buffers = (phys_addr_t) - (bd_space + - MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc) + - MVNETA_MAX_RXD * sizeof(struct mvneta_rx_desc)); + ((phys_addr_t)bd_space + size); + size += roundup(MVNETA_MAX_RXD * sizeof(struct mvneta_rx_desc), + ARCH_DMA_MINALIGN); + buffer_loc.rx_buffers = (phys_addr_t)(bd_space + size); } pp->base = (void __iomem *)pdata->iobase; -- 2.17.0

2 3

[U-Boot] [PATCH] zynq: Add Zynq MiniZed board support
by Clement Laigle 29 May '18

29 May '18

MiniZed is a single-core Zynq 7Z007S development board. More information on this board: http://zedboard.org/product/minized Signed-off-by: Clement Laigle <clement.laigle8(a)gmail.com> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/zynq-minized.dts | 61 ++++++++++++++++++++++++++++++++++++++++++ configs/zynq_minized_defconfig | 57 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+) create mode 100644 arch/arm/dts/zynq-minized.dts create mode 100644 configs/zynq_minized_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index a0349a8..b8991ce 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -131,6 +131,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ zynq-cse-qspi-single.dtb \ zynq-microzed.dtb \ zynq-picozed.dtb \ + zynq-minized.dtb \ zynq-syzygy-hub.dtb \ zynq-topic-miami.dtb \ zynq-topic-miamilite.dtb \ diff --git a/arch/arm/dts/zynq-minized.dts b/arch/arm/dts/zynq-minized.dts new file mode 100644 index 0000000..b5c9225 --- /dev/null +++ b/arch/arm/dts/zynq-minized.dts @@ -0,0 +1,61 @@ +/* + * Avnet Minized board DTS + * + * Copyright (C) 2018 Clement Laigle <clement.laigle8(a)gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ +/dts-v1/; +#include "zynq-7000.dtsi" + +/ { + model = "Zynq Minized Board"; + compatible = "xlnx,zynq-Minized", "xlnx,zynq-7000"; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + cpus { + cpu@0 { + operating-points = <666666 1000000 333333 1000000>; + }; + }; + + aliases { + serial0 = &uart1; + spi0 = &qspi; + mmc0 = &sdhci1; + }; + + memory@0 { + device_type = "memory"; + reg = <0 0x20000000>; + }; + + usb_phy0: phy0 { + compatible = "ulpi-phy"; + #phy-cells = <0>; + }; +}; + +&uart1 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&sdhci1 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&usb0 { + dr_mode = "host"; + status = "okay"; + usb-phy = <&usb_phy0>; +}; + +&qspi { + u-boot,dm-pre-reloc; + status = "okay"; +}; diff --git a/configs/zynq_minized_defconfig b/configs/zynq_minized_defconfig new file mode 100644 index 0000000..d48ba20 --- /dev/null +++ b/configs/zynq_minized_defconfig @@ -0,0 +1,57 @@ +CONFIG_ARM=y +CONFIG_ARCH_ZYNQ=y +CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_DEFAULT_DEVICE_TREE="zynq-minized" +CONFIG_SYS_NO_FLASH=y +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SPL=y +CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Zynq> " +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +# CONFIG_CMD_NET is not set +# CONFIG_CMD_NFS is not set +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_EMBED=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_DM_GPIO=y +CONFIG_DM_MMC=y +CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_MTD=y +CONFIG_CFI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_ZYNQ_QSPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_ULPI_VIEWPORT=y +CONFIG_USB_ULPI=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 +CONFIG_REGEX=y +CONFIG_LIB_RAND=y -- 2.7.4

2 1

[U-Boot] [PATCH] sf: Add Winbond W25Q256 ID
by Marek Vasut 29 May '18

29 May '18

Add ID for the Winbond W25Q256 flash. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Jagan Teki <jagan(a)openedev.com> --- drivers/mtd/spi/spi_flash_ids.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mtd/spi/spi_flash_ids.c b/drivers/mtd/spi/spi_flash_ids.c index 41879d662a..a46227f172 100644 --- a/drivers/mtd/spi/spi_flash_ids.c +++ b/drivers/mtd/spi/spi_flash_ids.c @@ -174,6 +174,7 @@ const struct spi_flash_info spi_flash_ids[] = { {"w25q32dw", INFO(0xef6016, 0x0, 64 * 1024, 64, RD_FULL | WR_QPP | SECT_4K) }, {"w25q64dw", INFO(0xef6017, 0x0, 64 * 1024, 128, RD_FULL | WR_QPP | SECT_4K) }, {"w25q128fw", INFO(0xef6018, 0x0, 64 * 1024, 256, RD_FULL | WR_QPP | SECT_4K) }, + {"w25q256fw", INFO(0xef6019, 0x0, 64 * 1024, 512, RD_FULL | WR_QPP | SECT_4K) }, #endif {}, /* Empty entry to terminate the list */ /* @@ -188,5 +189,6 @@ const struct spi_flash_info spi_flash_ids[] = { * (w25q32dw, w25q32fv_qpi) * (w25q64dw, w25q64fv_qpi) * (w25q128fw, w25q128fv_qpi) + * (w25q256fw, w25q256fv_qpi) */ }; -- 2.16.2

2 1

[U-Boot] [PATCH V2] sf: Add Macronix MX25U25635F ID
by Marek Vasut 29 May '18

29 May '18

Add ID for the Macronix MX25U25635F flash. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Jagan Teki <jagan(a)openedev.com> --- V2: Change the flash type on maintainer request. This doesn't match the actual hardware with which this was tested anymore though. --- drivers/mtd/spi/spi_flash_ids.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mtd/spi/spi_flash_ids.c b/drivers/mtd/spi/spi_flash_ids.c index a46227f172..cbf2069177 100644 --- a/drivers/mtd/spi/spi_flash_ids.c +++ b/drivers/mtd/spi/spi_flash_ids.c @@ -85,6 +85,7 @@ const struct spi_flash_info spi_flash_ids[] = { {"mx25u6435f", INFO(0xc22537, 0x0, 64 * 1024, 128, RD_FULL | WR_QPP) }, {"mx25l12855e", INFO(0xc22618, 0x0, 64 * 1024, 256, RD_FULL | WR_QPP) }, {"mx25u1635e", INFO(0xc22535, 0x0, 64 * 1024, 32, SECT_4K) }, + {"mx25u25635f", INFO(0xc22539, 0x0, 64 * 1024, 512, RD_FULL | WR_QPP) }, {"mx66u51235f", INFO(0xc2253a, 0x0, 64 * 1024, 1024, RD_FULL | WR_QPP) }, {"mx66l1g45g", INFO(0xc2201b, 0x0, 64 * 1024, 2048, RD_FULL | WR_QPP) }, #endif -- 2.16.2

2 1

Re: [U-Boot] [PATCH 1/2] i2c: mvtwsi: disable i2c slave on Armada 38x
by Baruch Siach 29 May '18

29 May '18

Hi Chris, On Tue, May 29, 2018 at 10:32:47AM +1200, Chris Packham wrote: > Did you intend to omit the u-boot mailing list? No, sorry. Thanks for noticing. I'll resend with the change that Stefan suggested and keep your Tested-by. > On Tue, May 29, 2018 at 3:11 AM Baruch Siach <baruch(a)tkos.co.il> wrote: > > Equivalent code that disables the hidden i2c0 slave already exists in > > the Turris Omnia platform specific code. But this hidden i2c0 slave that > > interferes the i2c bus is not board specific. All Armada 38x SoCs are > > affected. Add code to disable this slave to the i2c bus driver to make > > it work on all affected hardware. > > > Use the bind callback because we want this to always run at boot, > > regardless of whether U-Boot uses the i2c bus. > > > Cc: Rabeeh Khoury <rabeeh(a)solid-run.com> > > Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> > > Tested-by: Chris Packham <judge.packham(a)gmail.com> [snip] > > > + /* Disable the hidden slave on i2c0 of 38x */ > > + if (IS_ENABLED(CONFIG_ARMADA_38X) && bus->req_seq == 0) > > I'll submit a patch to add IS_ENABLED(CONFIG_KIRKWOOD) when this hits > u-boot.git. Have you hit this issue on Kirkwood? Which one? Thanks, baruch > > + twsi_disable_i2c_slave(twsi); > > + > > + return 0; > > +} > > + > > static int mvtwsi_i2c_probe(struct udevice *bus) > > { > > struct mvtwsi_i2c_dev *dev = dev_get_priv(bus); > > @@ -850,6 +873,7 @@ U_BOOT_DRIVER(i2c_mvtwsi) = { > > .name = "i2c_mvtwsi", > > .id = UCLASS_I2C, > > .of_match = mvtwsi_i2c_ids, > > + .bind = mvtwsi_i2c_bind, > > .probe = mvtwsi_i2c_probe, > > .ofdata_to_platdata = mvtwsi_i2c_ofdata_to_platdata, > > .priv_auto_alloc_size = sizeof(struct mvtwsi_i2c_dev), > > -- > > 2.17.0 -- http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch(a)tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

3 4

[U-Boot] [PATCH] ubi: fastmap: Implement produce_free_peb()
by Patrice Chotard 29 May '18

29 May '18

Since 'commit f82290afc847 ("mtd: ubi: Fix worker handling")', when booting from NAND, on a fresh NAND just after being flashed (and only in this case), we got the following log: ubi0: default fastmap pool size: 200 ubi0: default fastmap WL pool size: 100 ubi0: attaching mtd2 ubi0: scanning is finished ubi0 error: ubi_update_fastmap: could not find any anchor PEB ubi0 error: ubi_update_fastmap: could not find any anchor PEB ubi0 error: ubi_wl_get_peb: Unable to get a free PEB from user WL pool ubi0 error: autoresize: cannot auto-resize volume 1 UBI error: cannot attach mtd2UBI error: cannot initialize UBI, error -28UBI init error 28 After analysis, in ubi_wl_init(), when performing schedule_erase(), thread_enabled flag is not yet set to 1, which forbids ubi_do_worker() to execute pending works. This has to effect to not populate ubi->free with free physical eraseblocks. Following Richard Weinberger's advice, this patch has been backported from kernel tree : 'commit 1cb8f9776c7d ("ubi: fastmap: Implement produce_free_peb()")' Tested-by: Patrice Chotard <patrice.chotard(a)st.com> Signed-off-by: Richard Weinberger <richard(a)nod.at> Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- drivers/mtd/ubi/fastmap-wl.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c index b7876a81cb0f..e36fb39943a5 100644 --- a/drivers/mtd/ubi/fastmap-wl.c +++ b/drivers/mtd/ubi/fastmap-wl.c @@ -171,6 +171,30 @@ void ubi_refill_pools(struct ubi_device *ubi) } /** + * produce_free_peb - produce a free physical eraseblock. + * @ubi: UBI device description object + * + * This function tries to make a free PEB by means of synchronous execution of + * pending works. This may be needed if, for example the background thread is + * disabled. Returns zero in case of success and a negative error code in case + * of failure. + */ +static int produce_free_peb(struct ubi_device *ubi) +{ + int err; + + while (!ubi->free.rb_node && ubi->works_count) { + dbg_wl("do one work synchronously"); + err = do_work(ubi); + + if (err) + return err; + } + + return 0; +} + +/** * ubi_wl_get_peb - get a physical eraseblock. * @ubi: UBI device description object * @@ -212,6 +236,11 @@ again: } retried = 1; up_read(&ubi->fm_eba_sem); + ret = produce_free_peb(ubi); + if (ret < 0) { + down_read(&ubi->fm_eba_sem); + goto out; + } goto again; } -- 1.9.1

2 2