summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-05-16 11:16:42 -0400
committerTom Rini <trini@konsulko.com>2023-05-16 11:16:42 -0400
commit5645a50a8639a53856bcda60f5eb9e07a5bd31a9 (patch)
tree30c9ab7fd5b86a4a74aa554720cdb3fcaa67c8a0 /drivers
parentc21fc9e1529e22c7acffe9bec7c0500ea15559dc (diff)
parent6d677ea8ecd11c26e45dae1ed855ec275177b149 (diff)
downloadu-boot-5645a50a8639a53856bcda60f5eb9e07a5bd31a9.tar.gz
u-boot-5645a50a8639a53856bcda60f5eb9e07a5bd31a9.tar.bz2
u-boot-5645a50a8639a53856bcda60f5eb9e07a5bd31a9.zip
Merge branch '2023-05-15-assorted-bugfixes'
- Merge in a long-standing fix for some exynos platforms, correct a Kconfig description, fix some env issues, fix an issue in devfdt_get_addr_size_index_ptr and look for "panel-timings" not "panel-timing" per upstream binding.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/core/fdtaddr.c5
-rw-r--r--drivers/core/ofnode.c2
-rw-r--r--drivers/mmc/s5p_sdhci.c2
-rw-r--r--drivers/video/Kconfig2
4 files changed, 7 insertions, 4 deletions
diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c
index 3b59b70c24..546db675aa 100644
--- a/drivers/core/fdtaddr.c
+++ b/drivers/core/fdtaddr.c
@@ -131,7 +131,10 @@ void *devfdt_get_addr_size_index_ptr(const struct udevice *dev, int index,
{
fdt_addr_t addr = devfdt_get_addr_size_index(dev, index, size);
- return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)(uintptr_t)addr;
+ if (addr == FDT_ADDR_T_NONE)
+ return NULL;
+
+ return map_sysmem(addr, 0);
}
fdt_addr_t devfdt_get_addr_name(const struct udevice *dev, const char *name)
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index f49ee493d3..ec574c4460 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -998,7 +998,7 @@ int ofnode_decode_panel_timing(ofnode parent,
u32 val = 0;
int ret = 0;
- timings = ofnode_find_subnode(parent, "panel-timings");
+ timings = ofnode_find_subnode(parent, "panel-timing");
if (!ofnode_valid(timings))
return -EINVAL;
memset(dt, 0, sizeof(*dt));
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index dee84263c3..3b74feae68 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -90,7 +90,7 @@ static int s5p_sdhci_core_init(struct sdhci_host *host)
host->name = S5P_NAME;
host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
- SDHCI_QUIRK_32BIT_DMA_ADDR |
+ SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_USE_WIDE8;
host->max_clk = 52000000;
host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index fcc0e85d2e..1e2f4e6de4 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -962,7 +962,7 @@ config BMP_32BPP
endif # VIDEO
config SPL_VIDEO
- bool "Enable driver model support for LCD/video"
+ bool "Enable driver model support for LCD/video in SPL"
depends on SPL_DM
help
The video subsystem adds a small amount of overhead to the image.