vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh

Browse Source 
Various fixes for smatch warnings, the i2c one might be also coming in
via Heiko / I2C tree, let me know if there is conflict.

There is also W77Q51NW SPI NOR ID support, with the DT portion omitted
for now.
This commit is contained in:
Tom Rini
2025-08-06 16:07:17 -06:00
parent 29d5636c6f ef15585a74
commit 3526f990b7
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/r8a779g3_sparrowhawk_defconfig
+1
View File
@@ -33,6 +33,7 @@ CONFIG_PCI_REGION_MULTI_ENTRY=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_RENESAS_RAVB=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
CONFIG_SPL_HAVE_INIT_STACK=y
drivers/clk/renesas/rcar-cpg-lib.c
+3 -2
View File
@@ -92,7 +92,8 @@ int rcar_clk_set_rate64_div_table(unsigned int parent, u64 parent_rate, ulong ra
void __iomem *reg, const u32 mask,
const struct clk_div_table *table, char *name)
{
u32 value = 0, div = 0;
u32 div;
int value;
div = DIV_ROUND_CLOSEST(parent_rate, rate);
value = rcar_clk_get_table_val(table, div);
@@ -101,7 +102,7 @@ int rcar_clk_set_rate64_div_table(unsigned int parent, u64 parent_rate, ulong ra
clrsetbits_le32(reg, mask, field_prep(mask, value));
debug("%s[%i] %s clk: parent=%i div=%u rate=%lu => val=%u\n",
debug("%s[%i] %s clk: parent=%i div=%u rate=%lu => val=%d\n",
__func__, __LINE__, name, parent, div, rate, value);
return 0;
drivers/mtd/spi/spi-nor-ids.c
+1
View File
@@ -591,6 +591,7 @@ const struct flash_info spi_nor_ids[] = {
{ INFO("w25m512jw", 0xef6119, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ INFO("w25m512jv", 0xef7119, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ INFO("w25h02jv", 0xef9022, 0, 64 * 1024, 4096, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ INFO("w77q51nw", 0xef8a1a, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
#endif
#ifdef CONFIG_SPI_FLASH_XMC
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
drivers/net/rswitch.c
+3 -1
View File
@@ -1110,8 +1110,10 @@ static int rswitch_probe(struct udevice *dev)
return -EINVAL;
priv->rsw_clk = devm_clk_get(dev, NULL);
if (ret)
if (IS_ERR(priv->rsw_clk)) {
ret = PTR_ERR(priv->rsw_clk);
goto err_map;
}
ret = clk_prepare_enable(priv->rsw_clk);
if (ret)