Merge https://source.denx.de/u-boot/custodians/u-boot-samsung

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2b7b625..3a745ce 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -661,6 +661,7 @@ config ARCH_EXYNOS
        select DM
        select DM_GPIO
        select DM_I2C
+       select DM_ETH
        select DM_KEYBOARD
        select DM_SERIAL
        select DM_SPI

diff --git a/arch/arm/dts/exynos5250-smdk5250.dts b/arch/arm/dts/exynos5250-smdk5250.dts
index e542a79..afe0cca 100644 (file)
--- a/arch/arm/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/dts/exynos5250-smdk5250.dts
@@ -41,6 +41,7 @@
        };
 
        sromc@12250000 {
+               compatible = "samsung,exynos5-sromc";
                bank = <1>;
                srom-timing = <1 9 12 1 6 1 1>;
                width = <2>;

diff --git a/arch/arm/mach-exynos/include/mach/sromc.h b/arch/arm/mach-exynos/include/mach/sromc.h
index 15c9ccc..ac229e0 100644 (file)
--- a/arch/arm/mach-exynos/include/mach/sromc.h
+++ b/arch/arm/mach-exynos/include/mach/sromc.h
@@ -33,22 +33,4 @@ struct s5p_sromc {
 /* Configure the Band Width and Bank Control Regs for required SROMC Bank */
 void s5p_config_sromc(u32 srom_bank, u32 srom_bw_conf, u32 srom_bc_conf);
 
-enum {
-       FDT_SROM_PMC,
-       FDT_SROM_TACP,
-       FDT_SROM_TAH,
-       FDT_SROM_TCOH,
-       FDT_SROM_TACC,
-       FDT_SROM_TCOS,
-       FDT_SROM_TACS,
-
-       FDT_SROM_TIMING_COUNT,
-};
-
-struct fdt_sromc {
-       u8 bank;        /* srom bank number */
-       u8 width;       /* bus width in bytes */
-       unsigned int timing[FDT_SROM_TIMING_COUNT]; /* timing parameters */
-};
-
 #endif /* __ASM_ARCH_SROMC_H_ */

diff --git a/board/samsung/common/Makefile b/board/samsung/common/Makefile
index 3593c77..d31b81a 100644 (file)
--- a/board/samsung/common/Makefile
+++ b/board/samsung/common/Makefile
@@ -7,7 +7,7 @@ obj-$(CONFIG_USB_GADGET_DOWNLOAD) += gadget.o
 obj-$(CONFIG_MISC_COMMON) += misc.o
 
 ifndef CONFIG_SPL_BUILD
-obj-$(CONFIG_BOARD_COMMON)     += board.o
+obj-$(CONFIG_BOARD_COMMON)     += board.o sromc.o
 ifdef CONFIG_EXYNOS5_DT
 obj-y += exynos5-dt.o
 obj-$(CONFIG_BOARD_TYPES) += exynos5-dt-types.o

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 104d2a6..1c2fe02 100644 (file)
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -26,7 +26,6 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/arch/system.h>
-#include <asm/arch/sromc.h>
 #include <lcd.h>
 #include <i2c.h>
 #include <mmc.h>
@@ -195,83 +194,6 @@ int power_init_board(void)
 }
 #endif
 
-#ifdef CONFIG_SMC911X
-static int decode_sromc(const void *blob, struct fdt_sromc *config)
-{
-       int err;
-       int node;
-
-       node = fdtdec_next_compatible(blob, 0, COMPAT_SAMSUNG_EXYNOS5_SROMC);
-       if (node < 0) {
-               debug("Could not find SROMC node\n");
-               return node;
-       }
-
-       config->bank = fdtdec_get_int(blob, node, "bank", 0);
-       config->width = fdtdec_get_int(blob, node, "width", 2);
-
-       err = fdtdec_get_int_array(blob, node, "srom-timing", config->timing,
-                       FDT_SROM_TIMING_COUNT);
-       if (err < 0) {
-               debug("Could not decode SROMC configuration Error: %s\n",
-                     fdt_strerror(err));
-               return -FDT_ERR_NOTFOUND;
-       }
-       return 0;
-}
-#endif
-
-int board_eth_init(struct bd_info *bis)
-{
-#ifdef CONFIG_SMC911X
-       u32 smc_bw_conf, smc_bc_conf;
-       struct fdt_sromc config;
-       fdt_addr_t base_addr;
-       int node;
-
-       node = decode_sromc(gd->fdt_blob, &config);
-       if (node < 0) {
-               debug("%s: Could not find sromc configuration\n", __func__);
-               return 0;
-       }
-       node = fdtdec_next_compatible(gd->fdt_blob, node, COMPAT_SMSC_LAN9215);
-       if (node < 0) {
-               debug("%s: Could not find lan9215 configuration\n", __func__);
-               return 0;
-       }
-
-       /* We now have a node, so any problems from now on are errors */
-       base_addr = fdtdec_get_addr(gd->fdt_blob, node, "reg");
-       if (base_addr == FDT_ADDR_T_NONE) {
-               debug("%s: Could not find lan9215 address\n", __func__);
-               return -1;
-       }
-
-       /* Ethernet needs data bus width of 16 bits */
-       if (config.width != 2) {
-               debug("%s: Unsupported bus width %d\n", __func__,
-                     config.width);
-               return -1;
-       }
-       smc_bw_conf = SROMC_DATA16_WIDTH(config.bank)
-                       | SROMC_BYTE_ENABLE(config.bank);
-
-       smc_bc_conf = SROMC_BC_TACS(config.timing[FDT_SROM_TACS])   |
-                       SROMC_BC_TCOS(config.timing[FDT_SROM_TCOS]) |
-                       SROMC_BC_TACC(config.timing[FDT_SROM_TACC]) |
-                       SROMC_BC_TCOH(config.timing[FDT_SROM_TCOH]) |
-                       SROMC_BC_TAH(config.timing[FDT_SROM_TAH])   |
-                       SROMC_BC_TACP(config.timing[FDT_SROM_TACP]) |
-                       SROMC_BC_PMC(config.timing[FDT_SROM_PMC]);
-
-       /* Select and configure the SROMC bank */
-       exynos_pinmux_config(PERIPH_ID_SROMC, config.bank);
-       s5p_config_sromc(config.bank, smc_bw_conf, smc_bc_conf);
-       return smc911x_initialize(0, base_addr);
-#endif
-       return 0;
-}
-
 #if defined(CONFIG_DISPLAY_BOARDINFO) || defined(CONFIG_DISPLAY_BOARDINFO_LATE)
 int checkboard(void)
 {

diff --git a/board/samsung/common/sromc.c b/board/samsung/common/sromc.c
new file mode 100644 (file)
index 0000000..76e37df
--- /dev/null
+++ b/board/samsung/common/sromc.c
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2021 Google LLC
+ */
+
+#define LOG_CATEGORY   UCLASS_ETH
+
+#include <common.h>
+#include <dm.h>
+#include <log.h>
+#include <asm/arch/pinmux.h>
+#include <asm/arch/sromc.h>
+
+enum {
+       FDT_SROM_PMC,
+       FDT_SROM_TACP,
+       FDT_SROM_TAH,
+       FDT_SROM_TCOH,
+       FDT_SROM_TACC,
+       FDT_SROM_TCOS,
+       FDT_SROM_TACS,
+
+       FDT_SROM_TIMING_COUNT,
+};
+
+static int exyno5_sromc_probe(struct udevice *dev)
+{
+       u32 timing[FDT_SROM_TIMING_COUNT]; /* timing parameters */
+       u32 smc_bw_conf, smc_bc_conf;
+       int bank;       /* srom bank number */
+       int width;      /* bus width in bytes */
+       int ret;
+
+       if (!IS_ENABLED(CONFIG_SMC911X))
+               return 0;
+
+       bank = dev_read_s32_default(dev, "bank", 0);
+       width = dev_read_s32_default(dev, "width", 2);
+
+       /* Ethernet needs data bus width of 16 bits */
+       if (width != 2) {
+               log_debug("Unsupported bus width %d\n", width);
+               return log_msg_ret("width", -EINVAL);
+       }
+       ret = dev_read_u32_array(dev, "srom-timing", timing,
+                                FDT_SROM_TIMING_COUNT);
+       if (ret)
+               return log_msg_ret("sromc", -EINVAL);
+
+       smc_bw_conf = SROMC_DATA16_WIDTH(bank) | SROMC_BYTE_ENABLE(bank);
+       smc_bc_conf = SROMC_BC_TACS(timing[FDT_SROM_TACS])   |
+                       SROMC_BC_TCOS(timing[FDT_SROM_TCOS]) |
+                       SROMC_BC_TACC(timing[FDT_SROM_TACC]) |
+                       SROMC_BC_TCOH(timing[FDT_SROM_TCOH]) |
+                       SROMC_BC_TAH(timing[FDT_SROM_TAH])   |
+                       SROMC_BC_TACP(timing[FDT_SROM_TACP]) |
+                       SROMC_BC_PMC(timing[FDT_SROM_PMC]);
+
+       /* Select and configure the SROMC bank */
+       exynos_pinmux_config(PERIPH_ID_SROMC, bank);
+       s5p_config_sromc(bank, smc_bw_conf, smc_bc_conf);
+
+       return 0;
+}
+
+static const struct udevice_id exyno5_sromc_ids[] = {
+       { .compatible = "samsung,exynos5-sromc" },
+       {}
+};
+
+U_BOOT_DRIVER(exyno5_sromc) = {
+       .name           = "exyno5_sromc",
+       .id             = UCLASS_SIMPLE_BUS,
+       .of_match       = exyno5_sromc_ids,
+       .probe          = exyno5_sromc_probe,
+};

diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 8811cbb..bb61ba1 100644 (file)
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -73,15 +73,6 @@ int dram_init_banksize(void)
        return 0;
 }
 
-int board_eth_init(struct bd_info *bis)
-{
-       int rc = 0;
-#ifdef CONFIG_SMC911X
-       rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
-#endif
-       return rc;
-}
-
 #ifdef CONFIG_DISPLAY_BOARDINFO
 int checkboard(void)
 {

diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index a3e74ab..133c0eb 100644 (file)
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -37,7 +37,6 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
 CONFIG_MTD=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x5000000
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y

diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 99ac417..f56dfb7 100644 (file)
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -46,7 +46,6 @@ CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MTD=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x5000000
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_S2MPS11=y
 CONFIG_DM_REGULATOR=y

diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index 45162a5..92d6be4 100644 (file)
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -53,7 +53,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x5000000
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_TPS65090=y
 CONFIG_DM_REGULATOR=y

diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 1354aa7..824a664 100644 (file)
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -52,7 +52,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x5000000
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_TPS65090=y
 CONFIG_DM_REGULATOR=y

diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 0a7f1c5..3ed1947 100644 (file)
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -48,7 +48,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x5000000
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_DM_REGULATOR=y

diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index b3cb188..7b73940 100644 (file)
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -43,7 +43,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x5000000
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
 CONFIG_EXYNOS_SPI=y

diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index fcc655c..ac84fde 100644 (file)
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -28,5 +28,4 @@ CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_S5P=y
 CONFIG_MTD=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x5000000
 CONFIG_USB=y

diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index d6b1680..a5fbd1d 100644 (file)
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -58,7 +58,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x5000000
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_PMIC_S5M8767=y
@@ -92,3 +91,5 @@ CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
 CONFIG_LCD=y
 CONFIG_TPM=y
 CONFIG_ERRNO_STR=y
+CONFIG_UNIT_TEST=y
+# CONFIG_UT_LIB_ASN1 is not set

diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index a6cc2b4..53c375e 100644 (file)
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -58,7 +58,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x5000000
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_PMIC_S5M8767=y

diff --git a/include/fdtdec.h b/include/fdtdec.h
index e0a49b1..8ac20c9 100644 (file)
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -140,8 +140,6 @@ enum fdt_compat_id {
                                        /* Tegra124 XUSB pad controller */
        COMPAT_NVIDIA_TEGRA210_XUSB_PADCTL,
                                        /* Tegra210 XUSB pad controller */
-       COMPAT_SMSC_LAN9215,            /* SMSC 10/100 Ethernet LAN9215 */
-       COMPAT_SAMSUNG_EXYNOS5_SROMC,   /* Exynos5 SROMC */
        COMPAT_SAMSUNG_EXYNOS_USB_PHY,  /* Exynos phy controller for usb2.0 */
        COMPAT_SAMSUNG_EXYNOS5_USB3_PHY,/* Exynos phy controller for usb3.0 */
        COMPAT_SAMSUNG_EXYNOS_TMU,      /* Exynos TMU */

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 07c7ebe..337c444 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -47,8 +47,6 @@ static const char * const compat_names[COMPAT_COUNT] = {
        COMPAT(NVIDIA_TEGRA20_NAND, "nvidia,tegra20-nand"),
        COMPAT(NVIDIA_TEGRA124_XUSB_PADCTL, "nvidia,tegra124-xusb-padctl"),
        COMPAT(NVIDIA_TEGRA210_XUSB_PADCTL, "nvidia,tegra210-xusb-padctl"),
-       COMPAT(SMSC_LAN9215, "smsc,lan9215"),
-       COMPAT(SAMSUNG_EXYNOS5_SROMC, "samsung,exynos-sromc"),
        COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"),
        COMPAT(SAMSUNG_EXYNOS5_USB3_PHY, "samsung,exynos5250-usb3-phy"),
        COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),

diff --git a/test/lib/strlcat.c b/test/lib/strlcat.c
index ee61684..a0ec037 100644 (file)
--- a/test/lib/strlcat.c
+++ b/test/lib/strlcat.c
@@ -48,7 +48,7 @@ static int do_test_strlcat(struct unit_test_state *uts, int line, size_t align1,
        if (expected != actual) {
                ut_failf(uts, __FILE__, line, __func__,
                         "strlcat(s2, s1, 2) == len2 < n ? min(len1 + len2, n) : n",
-                        "Expected %#lx (%ld), got %#lx (%ld)",
+                        "Expected %#zx (%zd), got %#zx (%zd)",
                         expected, expected, actual, actual);
                return CMD_RET_FAILURE;
        }
@@ -66,7 +66,7 @@ static int do_test_strlcat(struct unit_test_state *uts, int line, size_t align1,
        if (len2 < n && s2[i] != '\0') {
                ut_failf(uts, __FILE__, line, __func__,
                         "n < len1 && s2[len2 + n] == '\\0'",
-                        "Expected s2[%ld] = '\\0', got %d ('%c')",
+                        "Expected s2[%zd] = '\\0', got %d ('%c')",
                         i, s2[i], s2[i]);
                return CMD_RET_FAILURE;
        }