Merge tag 'dm-pull-20aug23' of https://source.denx.de/u-boot/custodians/u-boot-dm

sandbox64 fixes

3 files changed, 63 insertions, 43 deletions

diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index 69e5efe8748..14c9d1b04cb 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -21,7 +21,7 @@ CONFIG_BOOTSTAGE_FDT=y
 CONFIG_BOOTSTAGE_STASH=y
 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
 CONFIG_CONSOLE_RECORD=y
-CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
+CONFIG_CONSOLE_RECORD_OUT_SIZE=0x6000
 CONFIG_PRE_CONSOLE_BUFFER=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_CMD_CPU=y
@@ -124,10 +124,13 @@ CONFIG_SYS_ATA_REG_OFFSET=1
 CONFIG_SYS_ATA_ALT_OFFSET=2
 CONFIG_SYS_ATA_IDE0_OFFSET=0
 CONFIG_BUTTON=y
+CONFIG_BUTTON_ADC=y
 CONFIG_BUTTON_GPIO=y
 CONFIG_CLK=y
+CONFIG_CLK_COMPOSITE_CCF=y
 CONFIG_CLK_K210=y
 CONFIG_CLK_K210_SET_RATE=y
+CONFIG_SANDBOX_CLK_CCF=y
 CONFIG_CPU=y
 CONFIG_DM_DEMO=y
 CONFIG_DM_DEMO_SIMPLE=y
@@ -165,6 +168,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_MMC_SANDBOX=y
 CONFIG_MTD=y
 CONFIG_SPI_FLASH_SANDBOX=y
+CONFIG_BOOTDEV_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@@ -175,18 +179,21 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_NVMXIP_QSPI=y
 CONFIG_NVME_PCI=y
+CONFIG_PCI_REGION_MULTI_ENTRY=y
 CONFIG_PCI_SANDBOX=y
 CONFIG_PHY=y
 CONFIG_PHY_SANDBOX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
 CONFIG_PINCTRL_SANDBOX=y
+CONFIG_PINCTRL_SINGLE=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_SANDBOX_POWER_DOMAIN=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_ACT8846=y
 CONFIG_DM_PMIC_PFUZE100=y
 CONFIG_DM_PMIC_MAX77686=y
+CONFIG_DM_PMIC_MC34708=y
 CONFIG_PMIC_QCOM=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_PMIC_S2MPS11=y
@@ -233,6 +240,7 @@ CONFIG_USB=y
 CONFIG_USB_EMUL=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_VIDEO=y
+CONFIG_VIDEO_FONT_SUN12X22=y
 CONFIG_CONSOLE_ROTATION=y
 CONFIG_CONSOLE_TRUETYPE=y
 CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y
@@ -240,6 +248,8 @@ CONFIG_I2C_EDID=y
 CONFIG_VIDEO_SANDBOX_SDL=y
 CONFIG_OSD=y
 CONFIG_SANDBOX_OSD=y
+CONFIG_BMP_16BPP=y
+CONFIG_BMP_24BPP=y
 # CONFIG_WATCHDOG_AUTOSTART is not set
 CONFIG_WDT=y
 CONFIG_WDT_GPIO=y
diff --git a/test/dm/cpu.c b/test/dm/cpu.c
index d7e596ee396..5734cd0a92d 100644
--- a/test/dm/cpu.c
+++ b/test/dm/cpu.c
@@ -37,7 +37,7 @@ static int dm_test_cpu(struct unit_test_state *uts)
 	ut_assertok(cpu_get_info(dev, &info));
 	ut_asserteq(info.cpu_freq, 42 * 42 * 42 * 42 * 42);
 	ut_asserteq(info.features, 0x42424242);
-	ut_asserteq(info.address_width, 32);
+	ut_asserteq(info.address_width, IS_ENABLED(CONFIG_PHYS_64BIT) ? 64 : 32);
 
 	ut_asserteq(cpu_get_count(dev), 42);
 
diff --git a/test/dm/pinmux.c b/test/dm/pinmux.c
index 265df4ccb97..6880b2d2cd9 100644
--- a/test/dm/pinmux.c
+++ b/test/dm/pinmux.c
@@ -15,6 +15,16 @@ static char buf[64];
 	ut_asserteq_str(expected, (char *)&buf); \
 } while (0)
 
+#define test_muxing_regaddr(selector, regaddr, expected) do { \
+	char estr[64] = { 0 }; \
+	if (IS_ENABLED(CONFIG_PHYS_64BIT)) \
+		snprintf(estr, sizeof(estr), "0x%016llx %s", (u64)regaddr, expected); \
+	else \
+		snprintf(estr, sizeof(estr), "0x%08x %s", (u32)regaddr, expected); \
+	ut_assertok(pinctrl_get_pin_muxing(dev, selector, buf, sizeof(buf))); \
+	ut_asserteq_str(estr, (char *)&buf); \
+} while (0)
+
 #define test_name(selector, expected) do { \
 	ut_assertok(pinctrl_get_pin_name(dev, selector, buf, sizeof(buf))); \
 	ut_asserteq_str(expected, (char *)&buf); \
@@ -79,14 +89,14 @@ static int dm_test_pinctrl_single(struct unit_test_state *uts)
 	test_name(0, "PIN0");
 	test_name(141, "PIN141");
 	test_name(142, "Error");
-	test_muxing(0, "0x00000000 0x00000000 UNCLAIMED");
-	test_muxing(18, "0x00000048 0x00000006 pinmux_pwm_pins");
-	test_muxing(28, "0x00000070 0x00000030 pinmux_uart0_pins");
-	test_muxing(29, "0x00000074 0x00000000 pinmux_uart0_pins");
-	test_muxing(100, "0x00000190 0x0000000c pinmux_spi0_pins");
-	test_muxing(101, "0x00000194 0x0000000c pinmux_spi0_pins");
-	test_muxing(102, "0x00000198 0x00000023 pinmux_spi0_pins");
-	test_muxing(103, "0x0000019c 0x0000000c pinmux_spi0_pins");
+	test_muxing_regaddr(0, 0x0, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(18, 0x48, "0x00000006 pinmux_pwm_pins");
+	test_muxing_regaddr(28, 0x70, "0x00000030 pinmux_uart0_pins");
+	test_muxing_regaddr(29, 0x74, "0x00000000 pinmux_uart0_pins");
+	test_muxing_regaddr(100, 0x190, "0x0000000c pinmux_spi0_pins");
+	test_muxing_regaddr(101, 0x194, "0x0000000c pinmux_spi0_pins");
+	test_muxing_regaddr(102, 0x198, "0x00000023 pinmux_spi0_pins");
+	test_muxing_regaddr(103, 0x19c, "0x0000000c pinmux_spi0_pins");
 	ret = pinctrl_get_pin_muxing(dev, 142, buf, sizeof(buf));
 	ut_asserteq(-EINVAL, ret);
 	ut_assertok(uclass_get_device_by_name(UCLASS_I2C, "i2c@0", &dev));
@@ -97,39 +107,39 @@ static int dm_test_pinctrl_single(struct unit_test_state *uts)
 	test_name(0, "PIN0");
 	test_name(159, "PIN159");
 	test_name(160, "Error");
-	test_muxing(0, "0x00000000 0x00000000 UNCLAIMED");
-	test_muxing(34, "0x00000010 0x00000200 pinmux_i2c0_pins");
-	test_muxing(35, "0x00000010 0x00002000 pinmux_i2c0_pins");
-	test_muxing(130, "0x00000040 0x00000200 pinmux_lcd_pins");
-	test_muxing(131, "0x00000040 0x00002000 pinmux_lcd_pins");
-	test_muxing(132, "0x00000040 0x00020000 pinmux_lcd_pins");
-	test_muxing(133, "0x00000040 0x00200000 pinmux_lcd_pins");
-	test_muxing(134, "0x00000040 0x02000000 pinmux_lcd_pins");
-	test_muxing(135, "0x00000040 0x20000000 pinmux_lcd_pins");
-	test_muxing(136, "0x00000044 0x00000002 pinmux_lcd_pins");
-	test_muxing(137, "0x00000044 0x00000020 pinmux_lcd_pins");
-	test_muxing(138, "0x00000044 0x00000200 pinmux_lcd_pins");
-	test_muxing(139, "0x00000044 0x00002000 pinmux_lcd_pins");
-	test_muxing(140, "0x00000044 0x00020000 pinmux_lcd_pins");
-	test_muxing(141, "0x00000044 0x00200000 pinmux_lcd_pins");
-	test_muxing(142, "0x00000044 0x02000000 pinmux_lcd_pins");
-	test_muxing(143, "0x00000044 0x20000000 pinmux_lcd_pins");
-	test_muxing(144, "0x00000048 0x00000002 pinmux_lcd_pins");
-	test_muxing(145, "0x00000048 0x00000020 pinmux_lcd_pins");
-	test_muxing(146, "0x00000048 0x00000000 UNCLAIMED");
-	test_muxing(147, "0x00000048 0x00000000 UNCLAIMED");
-	test_muxing(148, "0x00000048 0x00000000 UNCLAIMED");
-	test_muxing(149, "0x00000048 0x00000000 UNCLAIMED");
-	test_muxing(150, "0x00000048 0x02000000 pinmux_lcd_pins");
-	test_muxing(151, "0x00000048 0x00000000 UNCLAIMED");
-	test_muxing(152, "0x0000004c 0x00000002 pinmux_lcd_pins");
-	test_muxing(153, "0x0000004c 0x00000020 pinmux_lcd_pins");
-	test_muxing(154, "0x0000004c 0x00000000 UNCLAIMED");
-	test_muxing(155, "0x0000004c 0x00000000 UNCLAIMED");
-	test_muxing(156, "0x0000004c 0x00000000 UNCLAIMED");
-	test_muxing(157, "0x0000004c 0x00000000 UNCLAIMED");
-	test_muxing(158, "0x0000004c 0x02000000 pinmux_lcd_pins");
-	test_muxing(159, "0x0000004c 0x00000000 UNCLAIMED");
+	test_muxing_regaddr(0, 0x0, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(34, 0x10, "0x00000200 pinmux_i2c0_pins");
+	test_muxing_regaddr(35, 0x10, "0x00002000 pinmux_i2c0_pins");
+	test_muxing_regaddr(130, 0x40, "0x00000200 pinmux_lcd_pins");
+	test_muxing_regaddr(131, 0x40, "0x00002000 pinmux_lcd_pins");
+	test_muxing_regaddr(132, 0x40, "0x00020000 pinmux_lcd_pins");
+	test_muxing_regaddr(133, 0x40, "0x00200000 pinmux_lcd_pins");
+	test_muxing_regaddr(134, 0x40, "0x02000000 pinmux_lcd_pins");
+	test_muxing_regaddr(135, 0x40, "0x20000000 pinmux_lcd_pins");
+	test_muxing_regaddr(136, 0x44, "0x00000002 pinmux_lcd_pins");
+	test_muxing_regaddr(137, 0x44, "0x00000020 pinmux_lcd_pins");
+	test_muxing_regaddr(138, 0x44, "0x00000200 pinmux_lcd_pins");
+	test_muxing_regaddr(139, 0x44, "0x00002000 pinmux_lcd_pins");
+	test_muxing_regaddr(140, 0x44, "0x00020000 pinmux_lcd_pins");
+	test_muxing_regaddr(141, 0x44, "0x00200000 pinmux_lcd_pins");
+	test_muxing_regaddr(142, 0x44, "0x02000000 pinmux_lcd_pins");
+	test_muxing_regaddr(143, 0x44, "0x20000000 pinmux_lcd_pins");
+	test_muxing_regaddr(144, 0x48, "0x00000002 pinmux_lcd_pins");
+	test_muxing_regaddr(145, 0x48, "0x00000020 pinmux_lcd_pins");
+	test_muxing_regaddr(146, 0x48, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(147, 0x48, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(148, 0x48, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(149, 0x48, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(150, 0x48, "0x02000000 pinmux_lcd_pins");
+	test_muxing_regaddr(151, 0x48, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(152, 0x4c, "0x00000002 pinmux_lcd_pins");
+	test_muxing_regaddr(153, 0x4c, "0x00000020 pinmux_lcd_pins");
+	test_muxing_regaddr(154, 0x4c, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(155, 0x4c, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(156, 0x4c, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(157, 0x4c, "0x00000000 UNCLAIMED");
+	test_muxing_regaddr(158, 0x4c, "0x02000000 pinmux_lcd_pins");
+	test_muxing_regaddr(159, 0x4c, "0x00000000 UNCLAIMED");
 	ret = pinctrl_get_pin_muxing(dev, 160, buf, sizeof(buf));
 	ut_asserteq(-EINVAL, ret);
 	return 0;