Skip to contentSkip to conversation

arm: u8500: Enable upstream DT based SD card boot

PATCH Superseded Linus Walleij 1 participant 12 messages Aug 18

Subsystems (3)

v3 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Linus Walleij

author maintainer
#0 lore raw

v3 cover arm: u8500: Enable upstream DT based SD card boot

Switch the U8500 Stemmy configuration to the upstream Samsung Janice device tree and enable booting an EFI system from the external SD card.

Add compact DB8500 pinctrl support for applying the default states from the upstream device trees. Extend the PL180 driver to configure Ux500 signal direction and the SD card supply voltages.

The upstream device trees describe the SD card supplies through the AB8500 or AB8505 PMIC. Add support for the AUX3 regulator used as vmmc-supply, using the existing AB8500 PMIC driver for register access. Enable fixed regulators for the vqmmc level shifters used on the other supported Samsung boards.

Add a U-Boot overlay for Golden's duplicate regulator names.

The same support is intended for the Codina, Codina TMO, Gavini, Golden, Kyle and Skomer device trees, while Janice remains the default for now.

A single Stemmy device tree cannot describe all boards: external SD supply and level-shifter GPIOs differ, as do the MMCI signal-direction settings. External SD boot therefore requires per-device U-Boot binaries built with each board's unique device tree.

This has been tested successfully to boot PostmarketOS using the EFI boot flow, with some minimal changes to the PostmarketOS to use systemd-boot and compile in the right kernel configs.

---
Changes in v3:
- Disable unsupported DDR mode on the internal eMMC controller.
- Gate idle PL180 card clocks and honor clock-disable requests.
- Shut down PL180 card supplies at OS handoff.
- Skip global EFI boot entries when scanning the external SD card.
- Disable the unused WLAN SDIO controller in U-Boot.
- Remove the obsolete downstream Stemmy and DBx500 device trees.
- Provide a fixed clock for the internal eMMC controller.
- Enter fastboot when the volume-down button is held.
- Use standard DM helpers to bind the AB8500 AUX3 regulator.
- Select 3.3 V supplies for eMMC-only PL180 hosts.
- Use Nomadik DT-binding macros in the pinctrl driver.
- Link to v2: https://patch.msgid.link/[email protected]

Changes in v2:
- Use the new mailing list address, no other changes.
- Link to v1: https://patch.msgid.link/[email protected]

---
Linus Walleij (11):
pinctrl: Add compact Nomadik pin controller
mmc: arm_pl180: Configure Ux500 signal direction
mmc: arm_pl180: Gate idle card clocks
mmc: arm_pl180: Set initial supply voltages
mmc: arm_pl180: Power down card supplies at OS handoff
power: regulator: Add AB8500 AUX3 support
arm: u8500: Enable SD card regulators
configs: stemmy: Boot EFI from external SD card
arm: u8500: Switch Stemmy to upstream Janice device tree
arm: u8500: Give Golden panel regulators unique names
arm: u8500: Enter fastboot with volume-down button

 MAINTAINERS                                       |    2 +
 arch/arm/Kconfig                                  |    5 +
 arch/arm/dts/Makefile                             |    1 -
 arch/arm/dts/ste-dbx5x0-u-boot.dtsi               |   38 -
 arch/arm/dts/ste-dbx5x0.dtsi                      | 1144 ---------------------
 arch/arm/dts/ste-ux500-samsung-golden-u-boot.dtsi |   15 +
 arch/arm/dts/ste-ux500-samsung-stemmy.dts         |   36 -
 arch/arm/dts/u8500-u-boot.dtsi                    |   30 +
 configs/stemmy_defconfig                          |   11 +-
 drivers/mmc/arm_pl180_mmci.c                      |   90 +-
 drivers/pinctrl/Kconfig                           |    7 +
 drivers/pinctrl/Makefile                          |    1 +
 drivers/pinctrl/pinctrl-nomadik.c                 |  230 +++++
 drivers/power/pmic/ab8500.c                       |    1 +
 drivers/power/regulator/Kconfig                   |    7 +
 drivers/power/regulator/Makefile                  |    1 +
 drivers/power/regulator/ab8500.c                  |  107 ++
 include/configs/stemmy.h                          |    4 +-
 18 files changed, 505 insertions(+), 1225 deletions(-)

---
base-commit: 0b581a9612e46310ee52bf8359165950d38b2a2b
change-id: 20260813-ux500-external-sdcard-a49778d77b21

Best regards,

Signature · 1 line
Linus Walleij <[email protected]>
author maintainer
#1 lore raw

PATCH v3 1/11 pinctrl: Add compact Nomadik pin controller

Add the minimal pin control support needed to consume default states from the upstream DB8500 device trees. Resolve the nine Nomadik GPIO banks through nomadik-gpio-chips and apply the mux, direction, value, pull and low-EMI settings directly to their registers.

Only the DB8500 binding and default-state configuration needed by U-Boot are supported. There is no GPIO ownership or sleep-state handling.

---
 MAINTAINERS                       |   1 +
 arch/arm/Kconfig                  |   2 +
 drivers/pinctrl/Kconfig           |   7 ++
 drivers/pinctrl/Makefile          |   1 +
 drivers/pinctrl/pinctrl-nomadik.c | 230 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 241 insertions(+)
MAINTAINERS +1 -0
index eb48eea55c5a..a5d6b5be29dc 100644
@@ -787,6 +787,7 @@ S:	Maintained
 F:	arch/arm/dts/ste-*
 F:	arch/arm/mach-u8500/
 F:	drivers/gpio/nmk_gpio.c
+F:	drivers/pinctrl/pinctrl-nomadik.c
 F:	drivers/phy/phy-ab8500-usb.c
 F:	drivers/power/pmic/ab8500.c
 F:	drivers/timer/nomadik-mtu-timer.c
arch/arm/Kconfig +2 -0
index 1b474a346bf2..5b02ff18bd0e 100644
@@ -1278,6 +1278,8 @@ config ARCH_U8500
 	imply DM_RTC
 	imply NOMADIK_GPIO
 	imply NOMADIK_MTU_TIMER
+	imply PINCTRL
+	imply PINCTRL_NOMADIK
 	imply PHY
 	imply PL01X_SERIAL
 	imply PMIC_AB8500
drivers/pinctrl/Kconfig +7 -0
index fd30aaeeaa89..04785a927fec 100644
@@ -75,6 +75,13 @@ config PINCONF_RECURSIVE
 	  configuration; you can save memory footprint when this feature is
 	  no needed.
 
+config PINCTRL_NOMADIK
+	bool "Nomadik pin control driver"
+	depends on PINCTRL_FULL
+	help
+	  Enable pin multiplexing and configuration support for the Nomadik
+	  GPIO blocks in the ST-Ericsson DB8500.
+
 config SPL_PINCTRL
 	bool "Support pin controllers in SPL"
 	depends on SPL && SPL_DM
drivers/pinctrl/Makefile +1 -0
index 91149796bb5f..23219626e392 100644
@@ -25,6 +25,7 @@ obj-$(CONFIG_PINCTRL_K210)		+= pinctrl-k210.o
 obj-$(CONFIG_PINCTRL_MESON)		+= meson/
 obj-$(CONFIG_PINCTRL_MSCC)		+= mscc/
 obj-$(CONFIG_PINCTRL_MTK)		+= mediatek/
+obj-$(CONFIG_PINCTRL_NOMADIK)		+= pinctrl-nomadik.o
 obj-$(CONFIG_PINCTRL_PIC32)		+= pinctrl_pic32.o
 obj-$(CONFIG_PINCTRL_QCOM)		+= qcom/
 obj-$(CONFIG_PINCTRL_QE)		+= pinctrl-qe-io.o
drivers/pinctrl/pinctrl-nomadik.c new file +230 -0

230 lines not on this page · raw message

Signature · 1 line
2.55.0
author maintainer
#2 lore raw

PATCH v3 2/11 mmc: arm_pl180: Configure Ux500 signal direction

In reply to Linus Walleij

The Ux500 MMCI variant can control external level-shifter signal directions through the power register. Parse the standard ST MMCI device tree properties and set the corresponding direction and feedback-clock bits.

This is required by the external SD card slot on Samsung Janice, where commands cannot reach the card unless the direction controls are set.

---
 drivers/mmc/arm_pl180_mmci.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/mmc/arm_pl180_mmci.c +13 -0
index f00b0ff0dc95..af21b814641e 100644
@@ -427,6 +427,19 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
 		host->version2 = false; /* ARM variant */
 	}
 
+	if (dev_read_bool(dev, "st,sig-dir-dat0"))
+		host->pwr_init |= SDI_PWR_DAT0DIREN;
+	if (dev_read_bool(dev, "st,sig-dir-dat2"))
+		host->pwr_init |= SDI_PWR_DAT2DIREN;
+	if (dev_read_bool(dev, "st,sig-dir-dat31"))
+		host->pwr_init |= SDI_PWR_DAT31DIREN;
+	if (dev_read_bool(dev, "st,sig-dir-dat74"))
+		host->pwr_init |= SDI_PWR_DAT74DIREN;
+	if (dev_read_bool(dev, "st,sig-dir-cmd"))
+		host->pwr_init |= SDI_PWR_CMDDIREN;
+	if (dev_read_bool(dev, "st,sig-pin-fbclk"))
+		host->pwr_init |= SDI_PWR_FBCLKEN;
+
 	gpio_request_by_name(dev, "cd-gpios", 0, &host->cd_gpio, GPIOD_IS_IN);
 
 	ret = mmc_of_parse(dev, cfg);
Signature · 1 line
2.55.0
author maintainer
#3 lore raw

PATCH v3 3/11 mmc: arm_pl180: Gate idle card clocks

In reply to Linus Walleij

The MMC core uses mmc->clk_disable to request that the card clock is stopped, but the PL180 driver leaves SDI_CLKCR_CLKEN unchanged. This can leave inactive hosts driving their card clocks.

Honor clk_disable when programming the clock control register. Also enable the PL180 power-save mode so the clock stops automatically while the bus is idle.

---
 drivers/mmc/arm_pl180_mmci.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/mmc/arm_pl180_mmci.c +7 -2
index af21b814641e..528612359789 100644
@@ -294,6 +294,11 @@ static int  host_set_ios(struct mmc *dev)
 	u32 sdi_clkcr;
 
 	sdi_clkcr = readl(&host->base->clock);
+	sdi_clkcr |= SDI_CLKCR_PWRSAV;
+	if (dev->clk_disable)
+		sdi_clkcr &= ~SDI_CLKCR_CLKEN;
+	else
+		sdi_clkcr |= SDI_CLKCR_CLKEN;
 
 	/* Ramp up the clock rate */
 	if (dev->clock) {
@@ -400,7 +405,7 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
 
 	host->pwr_init = INIT_PWR;
 	host->clkdiv_init = SDI_CLKCR_CLKDIV_INIT_V1 | SDI_CLKCR_CLKEN |
-			    SDI_CLKCR_HWFC_EN;
+			    SDI_CLKCR_PWRSAV | SDI_CLKCR_HWFC_EN;
 	host->clock_in = clk_get_rate(&clk);
 
 	cfg->name = dev->name;
@@ -418,7 +423,7 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
 	case UX500V2_MMCI_ID:
 		host->pwr_init = SDI_PWR_OPD | SDI_PWR_PWRCTRL_ON;
 		host->clkdiv_init = SDI_CLKCR_CLKDIV_INIT_V2 | SDI_CLKCR_CLKEN |
-				    SDI_CLKCR_HWFC_EN;
+				    SDI_CLKCR_PWRSAV | SDI_CLKCR_HWFC_EN;
 		cfg->voltages = VOLTAGE_WINDOW_MMC;
 		cfg->f_min = host->clock_in / (2 + SDI_CLKCR_CLKDIV_INIT_V2);
 		host->version2 = true;
Signature · 1 line
2.55.0
author maintainer
#4 lore raw

PATCH v3 4/11 mmc: arm_pl180: Set initial supply voltages

In reply to Linus Walleij

Obtain the optional vmmc and vqmmc regulators and configure them for the normal SD voltage range before card initialization.

The Ux500 boards supply their SD cards from AB8500 or AB8505 AUX3, whose highest voltage selector is 2.91 V. Request that exact voltage for Ux500 SD and SDIO hosts, while retaining the normal 3.3 V target for eMMC-only hosts and other PL180 implementations.

Ignore the unsupported set-value operation for fixed regulators; their voltage is already described by their fixed constraints.

---
 drivers/mmc/arm_pl180_mmci.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
drivers/mmc/arm_pl180_mmci.c +38 -0
index 528612359789..a2ea5cf03120 100644
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <power/regulator.h>
 #include <dm/device_compat.h>
 #include <dm.h>
 
@@ -28,11 +29,23 @@
 #define MMC_CLOCK_MAX	48000000
 #define MMC_CLOCK_MIN	400000
 
+#define SD_VOLTAGE_MIN_UV	2700000
+#define SD_VOLTAGE_UV		3300000
+#define SD_VOLTAGE_MAX_UV	3600000
+#define MMC_VOLTAGE_UV		3300000
+#define UX500_SD_VOLTAGE_UV	2910000
+
 struct arm_pl180_mmc_plat {
 	struct mmc_config cfg;
 	struct mmc mmc;
 };
 
+static int arm_pl180_set_supply_voltage(struct udevice *supply, int target_uV)
+{
+	return regulator_set_value_clamp(supply, SD_VOLTAGE_MIN_UV,
+					 target_uV, SD_VOLTAGE_MAX_UV);
+}
+
 static int wait_for_command_end(struct mmc *dev, struct mmc_cmd *cmd)
 {
 	u32 hoststatus, statusmask;
@@ -390,6 +403,7 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
 	struct pl180_mmc_host *host = dev_get_priv(dev);
 	struct mmc_config *cfg = &pdata->cfg;
 	struct clk clk;
+	int supply_uV = SD_VOLTAGE_UV;
 	u32 periphid;
 	int ret;
 
@@ -427,11 +441,15 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
 		cfg->voltages = VOLTAGE_WINDOW_MMC;
 		cfg->f_min = host->clock_in / (2 + SDI_CLKCR_CLKDIV_INIT_V2);
 		host->version2 = true;
+		supply_uV = UX500_SD_VOLTAGE_UV;
 		break;
 	default:
 		host->version2 = false; /* ARM variant */
 	}
 
+	if (dev_read_bool(dev, "no-sd"))
+		supply_uV = MMC_VOLTAGE_UV;
+
 	if (dev_read_bool(dev, "st,sig-dir-dat0"))
 		host->pwr_init |= SDI_PWR_DAT0DIREN;
 	if (dev_read_bool(dev, "st,sig-dir-dat2"))
@@ -445,6 +463,26 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
 	if (dev_read_bool(dev, "st,sig-pin-fbclk"))
 		host->pwr_init |= SDI_PWR_FBCLKEN;
 
+	if (CONFIG_IS_ENABLED(DM_REGULATOR)) {
+		ret = device_get_supply_regulator(dev, "vmmc-supply",
+						  &mmc->vmmc_supply);
+		if (!ret) {
+			ret = arm_pl180_set_supply_voltage(mmc->vmmc_supply,
+							   supply_uV);
+			if (ret && ret != -ENOSYS)
+				return ret;
+		}
+
+		ret = device_get_supply_regulator(dev, "vqmmc-supply",
+						  &mmc->vqmmc_supply);
+		if (!ret) {
+			ret = arm_pl180_set_supply_voltage(mmc->vqmmc_supply,
+							   supply_uV);
+			if (ret && ret != -ENOSYS)
+				return ret;
+		}
+	}
+
 	gpio_request_by_name(dev, "cd-gpios", 0, &host->cd_gpio, GPIOD_IS_IN);
 
 	ret = mmc_of_parse(dev, cfg);
Signature · 1 line
2.55.0
author maintainer
#5 lore raw

PATCH v3 5/11 mmc: arm_pl180: Power down card supplies at OS handoff

In reply to Linus Walleij

PL180 card supplies remain enabled after probing and while U-Boot is running. They are no longer needed once control is handed to the operating system.

Mark the driver for removal during OS preparation and disable its VMMC and VQMMC supplies from the remove callback.

---
 drivers/mmc/arm_pl180_mmci.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
drivers/mmc/arm_pl180_mmci.c +30 -0
index a2ea5cf03120..dd913f963c82 100644
@@ -46,6 +46,20 @@ static int arm_pl180_set_supply_voltage(struct udevice *supply, int target_uV)
 					 target_uV, SD_VOLTAGE_MAX_UV);
 }
 
+static int arm_pl180_disable_supply(struct udevice *supply)
+{
+	int ret;
+
+	if (!supply)
+		return 0;
+
+	ret = regulator_set_enable_if_allowed(supply, false);
+	if (ret == -ENOSYS)
+		return 0;
+
+	return ret;
+}
+
 static int wait_for_command_end(struct mmc *dev, struct mmc_cmd *cmd)
 {
 	u32 hoststatus, statusmask;
@@ -497,6 +511,20 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
 	return 0;
 }
 
+static int arm_pl180_mmc_remove(struct udevice *dev)
+{
+	struct mmc *mmc = mmc_get_mmc_dev(dev);
+	int ret, vmmc_ret;
+
+	ret = arm_pl180_disable_supply(mmc->vqmmc_supply);
+	if (mmc->vmmc_supply != mmc->vqmmc_supply)
+		vmmc_ret = arm_pl180_disable_supply(mmc->vmmc_supply);
+	else
+		vmmc_ret = 0;
+
+	return ret ? ret : vmmc_ret;
+}
+
 int arm_pl180_mmc_bind(struct udevice *dev)
 {
 	struct arm_pl180_mmc_plat *plat = dev_get_plat(dev);
@@ -560,8 +588,10 @@ U_BOOT_DRIVER(arm_pl180_mmc) = {
 	.of_match = arm_pl180_mmc_match,
 	.ops = &arm_pl180_dm_mmc_ops,
 	.probe = arm_pl180_mmc_probe,
+	.remove = arm_pl180_mmc_remove,
 	.of_to_plat = arm_pl180_mmc_of_to_plat,
 	.bind = arm_pl180_mmc_bind,
 	.priv_auto	= sizeof(struct pl180_mmc_host),
 	.plat_auto	= sizeof(struct arm_pl180_mmc_plat),
+	.flags = DM_FLAG_OS_PREPARE,
 };
Signature · 1 line
2.55.0
author maintainer
#6 lore raw

PATCH v3 6/11 power: regulator: Add AB8500 AUX3 support

In reply to Linus Walleij

Add regulator support for LDO AUX3 on AB8500 and AB8505 PMICs. AUX3 supplies the removable SD card on the upstream Ux500 Samsung device trees, and both PMIC variants use the same control registers.

Imply the regulator core for ARCH_U8500 so the driver can instantiate from the upstream device trees.

---
 MAINTAINERS                      |   1 +
 arch/arm/Kconfig                 |   2 +
 drivers/power/pmic/ab8500.c      |   1 +
 drivers/power/regulator/Kconfig  |   7 +++
 drivers/power/regulator/Makefile |   1 +
 drivers/power/regulator/ab8500.c | 107 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 119 insertions(+)
MAINTAINERS +1 -0
index a5d6b5be29dc..8e78a7f224fa 100644
@@ -790,6 +790,7 @@ F:	drivers/gpio/nmk_gpio.c
 F:	drivers/pinctrl/pinctrl-nomadik.c
 F:	drivers/phy/phy-ab8500-usb.c
 F:	drivers/power/pmic/ab8500.c
+F:	drivers/power/regulator/ab8500.c
 F:	drivers/timer/nomadik-mtu-timer.c
 F:	drivers/usb/musb-new/ux500.c
 F:	drivers/video/mcde_simple.c
arch/arm/Kconfig +2 -0
index 5b02ff18bd0e..62aa9e8cc565 100644
@@ -1275,6 +1275,7 @@ config ARCH_U8500
 	imply ARM_PL180_MMCI
 	imply CLK
 	imply DM_PMIC
+	imply DM_REGULATOR
 	imply DM_RTC
 	imply NOMADIK_GPIO
 	imply NOMADIK_MTU_TIMER
@@ -1283,6 +1284,7 @@ config ARCH_U8500
 	imply PHY
 	imply PL01X_SERIAL
 	imply PMIC_AB8500
+	imply REGULATOR_AB8500
 	imply RTC_PL031
 	imply SYS_THUMB_BUILD
 	imply SYSRESET_SYSCON
drivers/power/pmic/ab8500.c +1 -0
index 9ba096711e14..b9fae7000b78 100644
@@ -253,6 +253,7 @@ static int ab8500_probe(struct udevice *dev)
 
 static const struct udevice_id ab8500_ids[] = {
 	{ .compatible = "stericsson,ab8500" },
+	{ .compatible = "stericsson,ab8505" },
 	{ }
 };
 
drivers/power/regulator/Kconfig +7 -0
index 00a25acfdf99..a27fe4925cf9 100644
@@ -16,6 +16,13 @@ config DM_REGULATOR
 	  for this purpose if PMIC I/O driver is implemented or dm_scan_fdt_dev()
 	  otherwise. Detailed information can be found in the header file.
 
+config REGULATOR_AB8500
+	bool "ST-Ericsson AB8500/AB8505 regulator support"
+	depends on DM_REGULATOR && PMIC_AB8500
+	help
+	  Enable LDO AUX3 regulator support for AB8500 and AB8505 PMICs.
+	  This supply is used to power removable SD cards on Ux500 boards.
+
 config SPL_DM_REGULATOR
 	bool "Enable regulators for SPL"
 	depends on DM_REGULATOR && SPL_POWER
drivers/power/regulator/Makefile +1 -0
index a40c9d340d98..a500a3da98d4 100644
@@ -5,6 +5,7 @@
 #
 
 obj-$(CONFIG_$(PHASE_)DM_REGULATOR) += regulator-uclass.o
+obj-$(CONFIG_REGULATOR_AB8500) += ab8500.o
 obj-$(CONFIG_REGULATOR_ACT8846) += act8846.o
 obj-$(CONFIG_REGULATOR_AS3722)	+= as3722_regulator.o
 obj-$(CONFIG_$(PHASE_)REGULATOR_AXP) += axp_regulator.o
drivers/power/regulator/ab8500.c new file +107 -0

107 lines not on this page · raw message

Signature · 1 line
2.55.0
author maintainer
#7 lore raw

PATCH v3 7/11 arm: u8500: Enable SD card regulators

In reply to Linus Walleij

Have ARCH_U8500 imply the fixed regulator driver needed by level shifters on the supported boards. The architecture already enables the regulator core and Nomadik GPIO driver.

---
 arch/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/Kconfig +1 -0
index 62aa9e8cc565..2a01ac9b7675 100644
@@ -1276,6 +1276,7 @@ config ARCH_U8500
 	imply CLK
 	imply DM_PMIC
 	imply DM_REGULATOR
+	imply DM_REGULATOR_FIXED
 	imply DM_RTC
 	imply NOMADIK_GPIO
 	imply NOMADIK_MTU_TIMER
Signature · 1 line
2.55.0
author maintainer
#8 lore raw

PATCH v3 8/11 configs: stemmy: Boot EFI from external SD card

In reply to Linus Walleij

Replace the fastboot-only command with standard bootflow scanning and enable the EFI loader so the removable SD card can provide the default ARM EFI executable. Filesystem probing is handled by the standard boot framework and does not require the FAT command.
Skip global boot methods so EFI variables cannot redirect the scan to the internal eMMC.

Disable mkeficapsule because generating capsule tools is unrelated to running EFI payloads and adds a host GnuTLS build dependency.

---
 configs/stemmy_defconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
configs/stemmy_defconfig +3 -2
index 631ccababf1c..b1a14ab38210 100644
@@ -14,10 +14,10 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000
 CONFIG_DEFAULT_DEVICE_TREE="ste-ux500-samsung-stemmy"
 CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_SYS_LOAD_ADDR=0x100000
-# CONFIG_EFI_LOADER is not set
+CONFIG_BOOTSTD_FULL=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run fastbootcmd"
+CONFIG_BOOTCOMMAND="bootflow scan -lbG"
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
@@ -43,3 +43,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x685d
 CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_MCDE_SIMPLE=y
+# CONFIG_TOOLS_MKEFICAPSULE is not set
Signature · 1 line
2.55.0
author maintainer
#9 lore raw

PATCH v3 9/11 arm: u8500: Switch Stemmy to upstream Janice device tree

In reply to Linus Walleij

Use the upstream Samsung Janice device tree as the initial target for the Stemmy configuration. This also prepares the board to share the upstream Ux500 Samsung device trees with Linux.

U-Boot does not yet implement the U8500 clock providers used by the upstream device tree. Add a U-Boot-specific overlay with the known MTU clock rate and fixed input clocks for the external SD and internal eMMC controllers. Remove the superseded downstream Stemmy and DBx500 device tree files, and disable the unused WLAN SDIO controller for U-Boot.

---
 arch/arm/dts/Makefile                     |    1 -
 arch/arm/dts/ste-dbx5x0-u-boot.dtsi       |   38 -
 arch/arm/dts/ste-dbx5x0.dtsi              | 1144 -----------------------------
 arch/arm/dts/ste-ux500-samsung-stemmy.dts |   36 -
 arch/arm/dts/u8500-u-boot.dtsi            |   30 +
 configs/stemmy_defconfig                  |    3 +-
 6 files changed, 32 insertions(+), 1220 deletions(-)
arch/arm/dts/Makefile +0 -1
index a02dad22f274..355d7cf8ba91 100644
@@ -503,7 +503,6 @@ dtb-$(CONFIG_TARGET_SL28) += fsl-ls1028a-kontron-sl28.dtb \
 
 dtb-$(CONFIG_TARGET_TEN64) += fsl-ls1088a-ten64.dtb
 
-dtb-$(CONFIG_TARGET_STEMMY) += ste-ux500-samsung-stemmy.dtb
 
 dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-inet-3f.dtb \
arch/arm/dts/ste-dbx5x0-u-boot.dtsi deleted +0 -38
deleted file mode 100644
index e350175305e9..000000000000
@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "skeleton.dtsi"
-#include "ste-dbx5x0.dtsi"
-
-/ {
-	/* FIXME: Remove this when clk driver is implemented */
-	sdmmcclk: sdmmcclk {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <100000000>;
-	};
-
-	soc {
-		mtu@a03c6000 {
-			clock-frequency = <133000000>;
-		};
-		uart@80120000 {
-			clock = <38400000>;
-		};
-		uart@80121000 {
-			clock = <38400000>;
-		};
-		uart@80007000 {
-			clock = <38400000>;
-		};
-		mmc@80005000 {
-			clocks = <&sdmmcclk>;
-		};
-	};
-
-	reboot {
-		compatible = "syscon-reboot";
-		regmap = <&prcmu>;
-		offset = <0x228>; /* PRCM_APE_SOFTRST */
-		mask = <0x1>;
-	};
-};
arch/arm/dts/ste-dbx5x0.dtsi deleted +0 -1144

1,144 lines not on this page · raw message

arch/arm/dts/ste-ux500-samsung-stemmy.dts deleted +0 -36
deleted file mode 100644
index 14be86086b22..000000000000
@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/dts-v1/;
-
-#include "ste-dbx5x0-u-boot.dtsi"
-#include "ste-ab8500.dtsi"
-
-/ {
-	compatible = "samsung,stemmy", "st-ericsson,u8500";
-
-	chosen {
-		stdout-path = &serial2;
-	};
-
-	soc {
-		/* eMMC */
-		mmc@80005000 {
-			status = "okay";
-
-			arm,primecell-periphid = <0x10480180>;
-			max-frequency = <100000000>;
-			bus-width = <8>;
-
-			non-removable;
-			cap-mmc-highspeed;
-		};
-
-		/* Debugging console UART */
-		uart@80007000 {
-			status = "okay";
-		};
-
-		mcde@a0350000 {
-			status = "okay";
-		};
-	};
-};
arch/arm/dts/u8500-u-boot.dtsi new file +30 -0
new file mode 100644
index 000000000000..9b69b4fd257e
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/ {
+	/* FIXME: Remove this when the U8500 clock driver is implemented */
+	sdmmcclk: sdmmcclk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <100000000>;
+	};
+
+	soc {
+		mtu@a03c6000 {
+			clock-frequency = <133000000>;
+		};
+
+		mmc@80126000 {
+			clocks = <&sdmmcclk>;
+		};
+
+		mmc@80118000 {
+			status = "disabled";
+		};
+
+		mmc@80005000 {
+			clocks = <&sdmmcclk>;
+			/* U-Boot cannot handle switching the controller to DDR mode */
+			/delete-property/ mmc-ddr-1_8v;
+		};
+	};
+};
configs/stemmy_defconfig +2 -1
index b1a14ab38210..c253780df2ef 100644
@@ -11,7 +11,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x400
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000
-CONFIG_DEFAULT_DEVICE_TREE="ste-ux500-samsung-stemmy"
+CONFIG_DEFAULT_DEVICE_TREE="st/ste-ux500-samsung-janice"
+CONFIG_OF_UPSTREAM=y
 CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_SYS_LOAD_ADDR=0x100000
 CONFIG_BOOTSTD_FULL=y
Signature · 1 line
2.55.0
author maintainer
#10 lore raw

PATCH v3 10/11 arm: u8500: Give Golden panel regulators unique names

In reply to Linus Walleij

The Golden device tree gives both fixed panel supplies the same regulator-name. U-Boot requires regulator names to be unique and aborts driver-model initialization when binding the second supply.

Add a U-Boot overlay assigning distinct names to the 1.8 V and 3.0 V supplies. Include the common U8500 overlay since a board-specific overlay takes precedence over it.

---
 arch/arm/dts/ste-ux500-samsung-golden-u-boot.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm/dts/ste-ux500-samsung-golden-u-boot.dtsi new file +11 -0
new file mode 100644
index 000000000000..647b3f73c413
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "u8500-u-boot.dtsi"
+
+&panel_reg_1v8 {
+	regulator-name = "panel-fixed-supply-1v8";
+};
+
+&panel_reg_3v0 {
+	regulator-name = "panel-fixed-supply-3v0";
+};
Signature · 1 line
2.55.0
author maintainer
#11 lore raw

PATCH v3 11/11 arm: u8500: Enter fastboot with volume-down button

In reply to Linus Walleij

Enable GPIO button command support and map the common VOL- button label to the existing fastboot command.

Golden uses a different label for the same KEY_VOLUMEDOWN button. Normalize it in the U-Boot overlay so the environment works for all target boards.

---
 arch/arm/dts/ste-ux500-samsung-golden-u-boot.dtsi | 4 ++++
 configs/stemmy_defconfig                          | 3 +++
 include/configs/stemmy.h                          | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)
arch/arm/dts/ste-ux500-samsung-golden-u-boot.dtsi +4 -0
index 647b3f73c413..34fc58ec1538 100644
@@ -9,3 +9,7 @@
 &panel_reg_3v0 {
 	regulator-name = "panel-fixed-supply-3v0";
 };
+
+&{/gpio-keys/volume-down} {
+	label = "VOL-";
+};
configs/stemmy_defconfig +3 -0
index c253780df2ef..2bc395a2682e 100644
@@ -15,6 +15,9 @@ CONFIG_DEFAULT_DEVICE_TREE="st/ste-ux500-samsung-janice"
 CONFIG_OF_UPSTREAM=y
 CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_SYS_LOAD_ADDR=0x100000
+CONFIG_BUTTON=y
+CONFIG_BUTTON_GPIO=y
+CONFIG_BUTTON_CMD=y
 CONFIG_BOOTSTD_FULL=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTCOMMAND=y
include/configs/stemmy.h +3 -1
index e58ddd752cd3..08fa3dfd5b75 100644
@@ -36,7 +36,9 @@
 	"fastboot_partition_alias_userdata=DATAFS\0"
 
 #define BOOTCMD_ENV \
-	"fastbootcmd=echo '*** FASTBOOT MODE ***'; fastboot usb 0\0"
+	"fastbootcmd=echo '*** FASTBOOT MODE ***'; fastboot usb 0\0" \
+	"button_cmd_0_name=VOL-\0" \
+	"button_cmd_0=run fastbootcmd\0"
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	BOOT_ENV \
Signature · 1 line
2.55.0