July 2020 - U-Boot

Re: [PATCH 1/1] mtd: cfi_flash: read device tree correctly
by Rick Chen 26 Jul '20

26 Jul '20

Hi Heinrich > From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Heinrich Schuchardt > Sent: Tuesday, July 21, 2020 10:51 AM > To: Stefan Roese > Cc: Simon Glass; u-boot(a)lists.denx.de; Heinrich Schuchardt > Subject: [PATCH 1/1] mtd: cfi_flash: read device tree correctly > > dev_read_size_cells() and dev_read_addr_cells() do not walk up the device tree to find the number of cells. On error they return 1 and 2 respectively. On qemu_arm64_defconfig this leads to the incorrect detection of address of the second flash bank as 0x400000000000000 instead of 0x4000000. > > When running > > qemu-system-aarch64 -machine virt -bios u-boot.bin \ > -cpu cortex-a53 -nographic \ > -drive if=pflash,format=raw,index=1,file=envstore.img > > the command 'saveenv' fails with > > Saving Environment to Flash... Error: start and/or end address not on > sector boundary > Error: start and/or end address not on sector boundary > Failed (1) > > due to this incorrect address. > > Use function fdtdec_get_addr_size_auto_noparent() to read the array of flash banks from the device tree. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > --- > drivers/mtd/cfi_flash.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index b7289ba539..dfa104bcf0 100644 > --- a/drivers/mtd/cfi_flash.c > +++ b/drivers/mtd/cfi_flash.c > @@ -2469,28 +2469,24 @@ unsigned long flash_init(void) static int cfi_flash_probe(struct udevice *dev) { > const fdt32_t *cell; > - int addrc, sizec; > - int len, idx; > - > - addrc = dev_read_addr_cells(dev); > - sizec = dev_read_size_cells(dev); > + int len; > > /* decode regs; there may be multiple reg tuples. */ > cell = dev_read_prop(dev, "reg", &len); > if (!cell) > return -ENOENT; > - idx = 0; > - len /= sizeof(fdt32_t); > - while (idx < len) { > + > + for (cfi_flash_num_flash_banks = 0; ; ++cfi_flash_num_flash_banks) { > phys_addr_t addr; > > - addr = dev_translate_address(dev, cell + idx); > + addr = fdtdec_get_addr_size_auto_noparent( > + gd->fdt_blob, dev_of_offset(dev), "reg", > + cfi_flash_num_flash_banks, NULL, false); > + if (addr == FDT_ADDR_T_NONE) > + break; > > flash_info[cfi_flash_num_flash_banks].dev = dev; > flash_info[cfi_flash_num_flash_banks].base = addr; > - cfi_flash_num_flash_banks++; > - > - idx += addrc + sizec; > } > gd->bd->bi_flashstart = flash_info[0].base; > > -- > 2.27.0 > This patch remind me that I have encounter flash bank detection problem on AE350 platform a period time ago. And have commit a patch to work around this problem as below: commit cca8b1e5b20cdab7299a5ee7139e70783f73ccdf riscv: dts: Add #address-cells and #size-cells in nor node Those are required for cfi-flash driver to get correct address information. Also modify size description correctly. With this patch, there is unnecessary to re-declaration address-cells and size-cells in nor node indeed. Tested-by: Rick Chen <rick(a)andestech.com> Thanks, Rick

4 3

[PATCH v3 0/2] use dt and UCLASS_IRQ/SYSCON to get gic details
by Rayagonda Kokatanur 26 Jul '20

26 Jul '20

Use device tree and driver class (UCLASS_IRQ and UCLASS_SYSCON) to get gic details like GICD, GICR base address, max number of redistributors and git lpi address. Changes from v2: -Address review comments from Tom Rini, Fix build errors messages. Changes from v1: -Address review comments from Tom Rini, Fix build warning messages. Rayagonda Kokatanur (2): arch: arm: use dt and UCLASS_IRQ to get gic details arch: arm: use dt and UCLASS_SYSCON to get gic lpi details arch/arm/Kconfig | 2 + arch/arm/cpu/armv8/fsl-layerscape/soc.c | 28 +---- arch/arm/include/asm/gic-v3.h | 4 +- arch/arm/lib/gic-v3-its.c | 136 +++++++++++++++++++++--- 4 files changed, 127 insertions(+), 43 deletions(-) -- 2.17.1

2 4

[PATCH 1/1] efi_loader: returning form UEFI FIT images
by Heinrich Schuchardt 26 Jul '20

26 Jul '20

Do not reset the board when returning from an UEFI FIT image. For failed UEFI binary we already print the return status in efi_run_image. Remove duplicate output. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/bootm_os.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/common/bootm_os.c b/common/bootm_os.c index 55296483f7..8b4397693a 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -542,15 +542,14 @@ static int do_bootm_efi(int flag, int argc, char *const argv[], images->ep); bootstage_mark(BOOTSTAGE_ID_RUN_OS); + /* We expect to return */ + images->os.type = IH_TYPE_STANDALONE; + image_buf = map_sysmem(images->ep, images->os.image_len); efi_ret = efi_run_image(image_buf, images->os.image_len); - if (efi_ret != EFI_SUCCESS) { - printf("## Failed to run EFI image: r = %lu\n", - efi_ret & ~EFI_ERROR_MASK); + if (efi_ret != EFI_SUCCESS) return 1; - } - return 0; } #endif -- 2.27.0

2 1

[PATCH v2 0/2] use dt and UCLASS_IRQ/SYSCON to get gic details
by Rayagonda Kokatanur 26 Jul '20

26 Jul '20

Use device tree and driver class (UCLASS_IRQ and UCLASS_SYSCON) to get gic details like GICD, GICR base address, max number of redistributors and git lpi address. Changes from v1: -Address review comments from Tom Rini, Fix build warning messages. Rayagonda Kokatanur (2): arch: arm: use dt and UCLASS_IRQ to get gic details arch: arm: use dt and UCLASS_SYSCON to get gic lpi details arch/arm/Kconfig | 2 + arch/arm/include/asm/gic-v3.h | 4 +- arch/arm/lib/gic-v3-its.c | 136 ++++++++++++++++++++++++++++++---- 3 files changed, 126 insertions(+), 16 deletions(-) -- 2.17.1

2 5

[PATCH 1/1] test/dm: check if devices exist
by Heinrich Schuchardt 26 Jul '20

26 Jul '20

Running 'ut dm' on the sandbox without -D or -d results in segmentation faults due to NULL pointer dereferences. Check that device pointers are non-NULL before using them. Use ut_assertnonnull() for pointers instead of ut_assert(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/dm/acpi.c | 3 +++ test/dm/core.c | 10 +++++----- test/dm/devres.c | 1 + test/dm/test-fdt.c | 2 ++ test/dm/virtio.c | 7 +++++++ 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/test/dm/acpi.c b/test/dm/acpi.c index 4c46dd83a6..ece7993cf3 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -96,7 +96,10 @@ DM_TEST(dm_test_acpi_get_table_revision, static int dm_test_acpi_create_dmar(struct unit_test_state *uts) { struct acpi_dmar dmar; + struct udevice *cpu; + ut_assertok(uclass_first_device(UCLASS_CPU, &cpu)); + ut_assertnonnull(cpu); ut_assertok(acpi_create_dmar(&dmar, DMAR_INTR_REMAP)); ut_asserteq(DMAR_INTR_REMAP, dmar.flags); ut_asserteq(32 - 1, dmar.host_address_width); diff --git a/test/dm/core.c b/test/dm/core.c index 6a930ae31a..d20c48443f 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -158,7 +158,7 @@ static int dm_test_autobind_uclass_pdata_alloc(struct unit_test_state *uts) for (uclass_find_first_device(UCLASS_TEST, &dev); dev; uclass_find_next_device(&dev)) { - ut_assert(dev); + ut_assertnonnull(dev); uc_pdata = dev_get_uclass_platdata(dev); ut_assert(uc_pdata); @@ -181,7 +181,7 @@ static int dm_test_autobind_uclass_pdata_valid(struct unit_test_state *uts) for (uclass_find_first_device(UCLASS_TEST, &dev); dev; uclass_find_next_device(&dev)) { - ut_assert(dev); + ut_assertnonnull(dev); uc_pdata = dev_get_uclass_platdata(dev); ut_assert(uc_pdata); @@ -747,11 +747,11 @@ static int dm_test_uclass_devices_find(struct unit_test_state *uts) dev; ret = uclass_find_next_device(&dev)) { ut_assert(!ret); - ut_assert(dev); + ut_assertnonnull(dev); } ut_assertok(uclass_find_first_device(UCLASS_TEST_DUMMY, &dev)); - ut_assert(!dev); + ut_assertnull(dev); return 0; } @@ -778,7 +778,7 @@ static int dm_test_uclass_devices_find_by_name(struct unit_test_state *uts) testdev; ret = uclass_find_next_device(&testdev)) { ut_assertok(ret); - ut_assert(testdev); + ut_assertnonnull(testdev); findret = uclass_find_device_by_name(UCLASS_TEST_FDT, testdev->name, diff --git a/test/dm/devres.c b/test/dm/devres.c index b5de0cb191..550787495d 100644 --- a/test/dm/devres.c +++ b/test/dm/devres.c @@ -153,6 +153,7 @@ static int dm_test_devres_phase(struct unit_test_state *uts) * allocation created in the bind() method. */ ut_assertok(uclass_find_first_device(UCLASS_TEST_DEVRES, &dev)); + ut_assertnonnull(dev); devres_get_stats(dev, &stats); ut_asserteq(1, stats.allocs); ut_asserteq(TEST_DEVRES_SIZE, stats.total_size); diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 51f2547409..8ef7c7a88e 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -832,10 +832,12 @@ static int dm_test_fdt_phandle(struct unit_test_state *uts) struct udevice *back, *dev, *dev2; ut_assertok(uclass_find_first_device(UCLASS_PANEL_BACKLIGHT, &back)); + ut_assertnonnull(back); ut_asserteq(-ENOENT, uclass_find_device_by_phandle(UCLASS_REGULATOR, back, "missing", &dev)); ut_assertok(uclass_find_device_by_phandle(UCLASS_REGULATOR, back, "power-supply", &dev)); + ut_assertnonnull(dev); ut_asserteq(0, device_active(dev)); ut_asserteq_str("ldo1", dev->name); ut_assertok(uclass_get_device_by_phandle(UCLASS_REGULATOR, back, diff --git a/test/dm/virtio.c b/test/dm/virtio.c index 4b317d2ec3..4a0c0b23b8 100644 --- a/test/dm/virtio.c +++ b/test/dm/virtio.c @@ -22,9 +22,11 @@ static int dm_test_virtio_base(struct unit_test_state *uts) /* check probe success */ ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus)); + ut_assertnonnull(bus); /* check the child virtio-blk device is bound */ ut_assertok(device_find_first_child(bus, &dev)); + ut_assertnonnull(dev); ut_assertok(strcmp(dev->name, "virtio-blk#0")); /* check driver status */ @@ -49,15 +51,18 @@ static int dm_test_virtio_all_ops(struct unit_test_state *uts) /* check probe success */ ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus)); + ut_assertnonnull(bus); /* check the child virtio-blk device is bound */ ut_assertok(device_find_first_child(bus, &dev)); + ut_assertnonnull(dev); /* * fake the virtio device probe by filling in uc_priv->vdev * which is used by virtio_find_vqs/virtio_del_vqs. */ uc_priv = dev_get_uclass_priv(bus); + ut_assertnonnull(uc_priv); uc_priv->vdev = dev; /* test virtio_xxx APIs */ @@ -106,9 +111,11 @@ static int dm_test_virtio_remove(struct unit_test_state *uts) /* check probe success */ ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus)); + ut_assertnonnull(bus); /* check the child virtio-blk device is bound */ ut_assertok(device_find_first_child(bus, &dev)); + ut_assertnonnull(dev); /* set driver status to VIRTIO_CONFIG_S_DRIVER_OK */ ut_assertok(virtio_set_status(dev, VIRTIO_CONFIG_S_DRIVER_OK)); -- 2.27.0

3 2

[PATCH 1/2] fdt_support: call mtdparts_init() after finding MTD node to fix up
by Masahiro Yamada 26 Jul '20

26 Jul '20

Platform code can call fdt_fixup_mtdparts() in order to hand U-Boot's MTD partitions over to the Linux device tree. Currently, fdt_fixup_mtdparts() calls mtdparts_init() in its entry. If no target MTD device is found, an error message like follows is displayed: Device nand0 not found! This occurs when the same code (e.g. arch/arm/mach-uniphier/fdt-fixup.c) is shared among several boards, but not all boards support an MTD device. Parse the DT first, then call mtdparts_init() only when the target MTD node is found. Yet, you still need to call mtdparts_init() before device_find(). Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- common/fdt_support.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index b010d0b552ad..717b2b6354c0 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -951,9 +951,7 @@ void fdt_fixup_mtdparts(void *blob, const struct node_info *node_info, struct mtd_device *dev; int i, idx; int noff; - - if (mtdparts_init() != 0) - return; + bool initialized = false; for (i = 0; i < node_info_size; i++) { idx = 0; @@ -963,6 +961,13 @@ void fdt_fixup_mtdparts(void *blob, const struct node_info *node_info, debug("%s: %s, mtd dev type %d\n", fdt_get_name(blob, noff, 0), node_info[i].compat, node_info[i].type); + + if (!initialized) { + if (mtdparts_init() != 0) + return; + initialized = true; + } + dev = device_find(node_info[i].type, idx++); if (dev) { if (fdt_node_set_part_info(blob, noff, dev)) -- 2.17.1

3 5

[PATCH v4 0/2] Basic Kontron SMARC-sAL28 board support
by Michael Walle 26 Jul '20

26 Jul '20

Add basic board support for the Kontron SMARC-sAL28 board. Please note, that this board doesn't support TF-a (yet). Therefore, the u-boot SPL is the first code which is run and it has to set up the RAM. changes since v3: - rebase to latest master - use CONFIG_PCI_INIT_R - set fdtfile in default environment changes since v2: - add variant 4 support. Since the atheros PHY dt bindings were merged into master, we can now use them - add environment section in include/configs/kontron_sl28.h - add cover letter changes since v1: - fix watchdog device tree reference Michael Walle (2): armv8: ls1028a: move FSL_LAYERSCAPE to kconfig board: kontron: add sl28 support arch/arm/Kconfig | 10 ++ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 + arch/arm/dts/Makefile | 3 + .../arm/dts/fsl-ls1028a-kontron-sl28-var3.dts | 14 ++ .../arm/dts/fsl-ls1028a-kontron-sl28-var4.dts | 42 ++++++ arch/arm/dts/fsl-ls1028a-kontron-sl28.dts | 128 ++++++++++++++++++ board/kontron/sl28/Kconfig | 18 +++ board/kontron/sl28/MAINTAINERS | 6 + board/kontron/sl28/Makefile | 8 ++ board/kontron/sl28/README | 63 +++++++++ board/kontron/sl28/common.c | 10 ++ board/kontron/sl28/ddr.c | 98 ++++++++++++++ board/kontron/sl28/sl28.c | 88 ++++++++++++ board/kontron/sl28/spl.c | 9 ++ configs/kontron_sl28_defconfig | 105 ++++++++++++++ include/configs/kontron_sl28.h | 120 ++++++++++++++++ include/configs/ls1028a_common.h | 1 - 17 files changed, 723 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var3.dts create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28.dts create mode 100644 board/kontron/sl28/Kconfig create mode 100644 board/kontron/sl28/MAINTAINERS create mode 100644 board/kontron/sl28/Makefile create mode 100644 board/kontron/sl28/README create mode 100644 board/kontron/sl28/common.c create mode 100644 board/kontron/sl28/ddr.c create mode 100644 board/kontron/sl28/sl28.c create mode 100644 board/kontron/sl28/spl.c create mode 100644 configs/kontron_sl28_defconfig create mode 100644 include/configs/kontron_sl28.h -- 2.20.1

1 2

[PATCH v2 1/1] arm: sunxi: increase SYS_MALLOC_F_LEN
by Heinrich Schuchardt 25 Jul '20

25 Jul '20

The current default of 0x400 for SYS_MALLOC_F_LEN is too small if any additional drivers marked as DM_FLAG_PRE_RELOC are loaded before relocation. CONFIG_RSA=y which is needed for UEFI secure boot or for FIT image verification loads the driver mod_exp_sw which has DM_FLAG_PRE_RELOC. CONFIG_LOG=Y is another setting requiring additional early malloc area, cf. log_init(). When running pine64-lts_defconfig with CONFIG_RSA=y and debug UART enabled we see as output in main U-Boot alloc_simple() alloc space exhausted With this patch the default values of SYS_MALLOC_F_LEN is raised to 0x2000. The default for SPL_SYS_MALLOC_F_LEN on ARCH_SUNXI is explicitely set to 0x400 to avoid an increased usage of SRAM on elder SoCs. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2 keep default for SPL_SYS_MALLOC_F_LEN at 0x400 --- Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 0e7ccc0b07..67b594cd74 100644 --- a/Kconfig +++ b/Kconfig @@ -146,7 +146,7 @@ config SYS_MALLOC_F_LEN default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \ ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \ ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \ - ARCH_LS1046A) + ARCH_LS1046A || ARCH_SUNXI) default 0x400 help Before relocation, memory is very limited on many platforms. Still, @@ -166,6 +166,7 @@ config SPL_SYS_MALLOC_F_LEN hex "Size of malloc() pool in SPL before relocation" depends on SYS_MALLOC_F && SPL default 0x2800 if RCAR_GEN3 + default 0x400 if ARCH_SUNXI default SYS_MALLOC_F_LEN help Before relocation, memory is very limited on many platforms. Still, -- 2.26.2

3 5

[PATCH v2 1/1] mtd: cfi_flash: read device tree correctly
by Heinrich Schuchardt 24 Jul '20

24 Jul '20

The size of #address-cells and #size-cells is not correctly determined if CONFIG_OF_LIVE=n. dev_read_size_cells() and dev_read_addr_cells() do not walk up the device tree to find the number of cells. On error they return 1 and 2 respectively. On qemu_arm64_defconfig this leads to the incorrect detection of the address of the second flash bank as 0x400000000000000 instead of 0x4000000. When running qemu-system-aarch64 -machine virt -bios u-boot.bin \ -cpu cortex-a53 -nographic \ -drive if=3Dpflash,format=3Draw,index=3D1,file=3Denvstore.img the command 'saveenv' fails with Saving Environment to Flash... Error: start and/or end address not on sector boundary Error: start and/or end address not on sector boundary Failed (1) due to this incorrect address. Use function fdtdec_get_addr_size_auto_noparent() to read the array of flash banks from the device tree if CONFIG_OF_LIVE=n. Add debug statements for testing. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2: Do not change the existing logic for CONFIG_OF_LIVE=y. --- drivers/mtd/cfi_flash.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index b7289ba539..0030949779 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -2466,6 +2466,9 @@ unsigned long flash_init(void) } #ifdef CONFIG_CFI_FLASH /* for driver model */ + +#ifdef CONFIG_OF_LIVE + static int cfi_flash_probe(struct udevice *dev) { const fdt32_t *cell; @@ -2488,6 +2491,7 @@ static int cfi_flash_probe(struct udevice *dev) flash_info[cfi_flash_num_flash_banks].dev = dev; flash_info[cfi_flash_num_flash_banks].base = addr; + debug("CFI flash at 0x%llx\n", addr); cfi_flash_num_flash_banks++; idx += addrc + sizec; @@ -2497,6 +2501,38 @@ static int cfi_flash_probe(struct udevice *dev) return 0; } +#else + +static int cfi_flash_probe(struct udevice *dev) +{ + const fdt32_t *cell; + int len; + + /* decode regs; there may be multiple reg tuples. */ + cell = dev_read_prop(dev, "reg", &len); + if (!cell) + return -ENOENT; + + for (cfi_flash_num_flash_banks = 0; ; ++cfi_flash_num_flash_banks) { + phys_addr_t addr; + + addr = fdtdec_get_addr_size_auto_noparent( + gd->fdt_blob, dev_of_offset(dev), "reg", + cfi_flash_num_flash_banks, NULL, false); + if (addr == FDT_ADDR_T_NONE) + break; + + flash_info[cfi_flash_num_flash_banks].dev = dev; + flash_info[cfi_flash_num_flash_banks].base = addr; + debug("CFI flash at 0x%llx\n", addr); + } + gd->bd->bi_flashstart = flash_info[0].base; + + return 0; +} + +#endif + static const struct udevice_id cfi_flash_ids[] = { { .compatible = "cfi-flash" }, { .compatible = "jedec-flash" }, -- 2.27.0

1 0

[PATCH v2 1/8] dm: button: add an uclass for button
by Philippe Reynes 24 Jul '20

24 Jul '20

Add a new uclass for button that implements two functions: - button_get_by_label - button_get_status Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- Changelog: v2: - re-order include - use uclass_id_foreach_dev - add comments to enum button_state_t drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/button/Kconfig | 12 +++++++++ drivers/button/Makefile | 5 ++++ drivers/button/button-uclass.c | 43 ++++++++++++++++++++++++++++++ include/button.h | 59 ++++++++++++++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + 7 files changed, 123 insertions(+) create mode 100644 drivers/button/Kconfig create mode 100644 drivers/button/Makefile create mode 100644 drivers/button/button-uclass.c create mode 100644 include/button.h diff --git a/drivers/Kconfig b/drivers/Kconfig index e34a227..3cb05aa 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -14,6 +14,8 @@ source "drivers/block/Kconfig" source "drivers/bootcount/Kconfig" +source "drivers/button/Kconfig" + source "drivers/cache/Kconfig" source "drivers/clk/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 94e8c5d..727a713 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ +obj-$(CONFIG_$(SPL_TPL_)BUTTON) += button/ obj-$(CONFIG_$(SPL_TPL_)CACHE) += cache/ obj-$(CONFIG_$(SPL_TPL_)CLK) += clk/ obj-$(CONFIG_$(SPL_TPL_)DM) += core/ diff --git a/drivers/button/Kconfig b/drivers/button/Kconfig new file mode 100644 index 0000000..8301858 --- /dev/null +++ b/drivers/button/Kconfig @@ -0,0 +1,12 @@ +menu "Button Support" + +config BUTTON + bool "Enable button support" + depends on DM + help + Many boards have buttons which can be used to change behaviour (reset, ...). + U-Boot provides a uclass API to implement this feature. Button drivers + can provide access to board-specific buttons. Use of the device tree + for configuration is encouraged. + +endmenu diff --git a/drivers/button/Makefile b/drivers/button/Makefile new file mode 100644 index 0000000..0b4c128 --- /dev/null +++ b/drivers/button/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> + +obj-$(CONFIG_BUTTON) += button-uclass.o diff --git a/drivers/button/button-uclass.c b/drivers/button/button-uclass.c new file mode 100644 index 0000000..1c742c2 --- /dev/null +++ b/drivers/button/button-uclass.c @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> + * + * Based on led-uclass.c + */ + +#include <common.h> +#include <button.h> +#include <dm.h> +#include <dm/uclass-internal.h> + +int button_get_by_label(const char *label, struct udevice **devp) +{ + struct udevice *dev; + struct uclass *uc; + + uclass_id_foreach_dev(UCLASS_BUTTON, dev, uc) { + struct button_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + + /* Ignore the top-level button node */ + if (uc_plat->label && !strcmp(label, uc_plat->label)) + return uclass_get_device_tail(dev, 0, devp); + } + + return -ENODEV; +} + +enum button_state_t button_get_state(struct udevice *dev) +{ + struct button_ops *ops = button_get_ops(dev); + + if (!ops->get_state) + return -ENOSYS; + + return ops->get_state(dev); +} + +UCLASS_DRIVER(button) = { + .id = UCLASS_BUTTON, + .name = "button", + .per_device_platdata_auto_alloc_size = sizeof(struct button_uc_plat), +}; diff --git a/include/button.h b/include/button.h new file mode 100644 index 0000000..688b63b --- /dev/null +++ b/include/button.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> + */ + +#ifndef __BUTTON_H +#define __BUTTON_H + +/** + * struct button_uc_plat - Platform data the uclass stores about each device + * + * @label: Button label + */ +struct button_uc_plat { + const char *label; +}; + +/** + * enum button_state_t - State used for button + * - BUTTON_OFF - Button is not pressed + * - BUTTON_ON - Button is pressed + * - BUTTON_COUNT - Number of button state + */ +enum button_state_t { + BUTTON_OFF = 0, + BUTTON_ON = 1, + BUTTON_COUNT, +}; + +struct button_ops { + /** + * get_state() - get the state of a button + * + * @dev: button device to change + * @return button state button_state_t, or -ve on error + */ + enum button_state_t (*get_state)(struct udevice *dev); +}; + +#define button_get_ops(dev) ((struct button_ops *)(dev)->driver->ops) + +/** + * button_get_by_label() - Find a button device by label + * + * @label: button label to look up + * @devp: Returns the associated device, if found + * @return 0 if found, -ENODEV if not found, other -ve on error + */ +int button_get_by_label(const char *label, struct udevice **devp); + +/** + * button_get_state() - get the state of a button + * + * @dev: button device to change + * @return button state button_state_t, or -ve on error + */ +enum button_state_t button_get_state(struct udevice *dev); + +#endif diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index 7837d45..85c7149 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -38,6 +38,7 @@ enum uclass_id { UCLASS_BLK, /* Block device */ UCLASS_BOARD, /* Device information from hardware */ UCLASS_BOOTCOUNT, /* Bootcount backing store */ + UCLASS_BUTTON, /* Button */ UCLASS_CACHE, /* Cache controller */ UCLASS_CLK, /* Clock source, e.g. used by peripherals */ UCLASS_CPU, /* CPU, typically part of an SoC */ -- 2.7.4

4 12