April 2024 - U-Boot

[PATCH] xilinx: Do not call private env_get_location() when !ENV_IS_NOWHERE
by Michal Simek 02 Apr '24

02 Apr '24

Private function for finding out location of environment is not working when ENV_IS_NOWHERE is disabled. The reason is that current fallback is ENVL_UNKNOWN when CONFIG_ENV_IS_NOWHERE is not enabled. The code could be updated like this - return ENVL_NOWHERE; + if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE)) + return ENVL_NOWHERE; + return ENVL_UNKNOWN; But then boot is still not working because ENVL_UNKNOWN has no driver and env_init() returns -ENODEV. That's why it is better not to define board specific env_get_location() because then weak env_get_location() is used which is going over env_locations[] and returning locations which are actually enabled in u-boot instance. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- board/xilinx/versal-net/board.c | 2 ++ board/xilinx/versal/board.c | 2 ++ board/xilinx/zynqmp/zynqmp.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c index aecaeb657453..da03024e162f 100644 --- a/board/xilinx/versal-net/board.c +++ b/board/xilinx/versal-net/board.c @@ -372,6 +372,7 @@ void reset_cpu(void) { } +#if defined(CONFIG_ENV_IS_NOWHERE) enum env_location env_get_location(enum env_operation op, int prio) { u8 bootmode = versal_net_get_bootmode(); @@ -401,3 +402,4 @@ enum env_location env_get_location(enum env_operation op, int prio) return ENVL_NOWHERE; } } +#endif diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 8c2e614ad8a0..4f6d56119db1 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -291,6 +291,7 @@ void reset_cpu(void) { } +#if defined(CONFIG_ENV_IS_NOWHERE) enum env_location env_get_location(enum env_operation op, int prio) { u32 bootmode = versal_get_bootmode(); @@ -320,3 +321,4 @@ enum env_location env_get_location(enum env_operation op, int prio) return ENVL_NOWHERE; } } +#endif diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index ba49eb7be229..79daaf8723ac 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -588,6 +588,7 @@ int mmc_get_env_dev(void) return bootseq; } +#if defined(CONFIG_ENV_IS_NOWHERE) enum env_location env_get_location(enum env_operation op, int prio) { u32 bootmode = zynqmp_get_bootmode(); @@ -621,6 +622,7 @@ enum env_location env_get_location(enum env_operation op, int prio) return ENVL_NOWHERE; } } +#endif #if defined(CONFIG_SET_DFU_ALT_INFO) -- 2.44.0

1 1

[PATCH] arm64: zynqmp: Describe DisplayPort connector for Kria
by Michal Simek 02 Apr '24

02 Apr '24

From: Vishal Sagar <vishal.sagar(a)amd.com> Add a device tree node to describe the DisplayPort connector, and connect it to the DPSUB output. The patch was tested on kv260-revB/rev2 and also kr260-revB. Signed-off-by: Vishal Sagar <vishal.sagar(a)amd.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/arm/dts/zynqmp-sck-kr-g-revB.dtso | 20 ++++++++++++++++++++ arch/arm/dts/zynqmp-sck-kv-g-revB.dtso | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso b/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso index 6c29f6574134..0a0cbd2b69ae 100644 --- a/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso +++ b/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso @@ -66,6 +66,18 @@ #clock-cells = <0>; clock-frequency = <74250000>; }; + + dpcon { + compatible = "dp-connector"; + label = "P11"; + type = "full-size"; + + port { + dpcon_in: endpoint { + remote-endpoint = <&dpsub_dp_out>; + }; + }; + }; }; &i2c1 { /* I2C_SCK C26/C27 - MIO from SOM */ @@ -130,6 +142,14 @@ phy-names = "dp-phy0"; phys = <&psgtr 1 PHY_TYPE_DP 0 1>; assigned-clock-rates = <27000000>, <25000000>, <300000000>; + + ports { + port@5 { + dpsub_dp_out: endpoint { + remote-endpoint = <&dpcon_in>; + }; + }; + }; }; &zynqmp_dpdma { diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso index a4b4465d2038..a449c1161b1e 100644 --- a/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso +++ b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso @@ -63,6 +63,18 @@ #clock-cells = <0>; clock-frequency = <27000000>; }; + + dpcon { + compatible = "dp-connector"; + label = "P11"; + type = "full-size"; + + port { + dpcon_in: endpoint { + remote-endpoint = <&dpsub_dp_out>; + }; + }; + }; }; &i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */ @@ -97,6 +109,14 @@ phy-names = "dp-phy0", "dp-phy1"; phys = <&psgtr 1 PHY_TYPE_DP 0 0>, <&psgtr 0 PHY_TYPE_DP 1 0>; assigned-clock-rates = <27000000>, <25000000>, <300000000>; + + ports { + port@5 { + dpsub_dp_out: endpoint { + remote-endpoint = <&dpcon_in>; + }; + }; + }; }; &zynqmp_dpdma { -- 2.44.0

1 1

[PATCH] clk: rockchip: rk3399: Add SCLK_UART4_PMU support
by xiaofengvskuye 02 Apr '24

02 Apr '24

The SCLK_UART4_PMU clocks is used as reference clock for UART4 block. Add simple support to get rate of SCLK_UART4_PMU clocks to fix reference clock period configuration. Signed-off-by: xiaofengvskuye <xiaofengvskuye(a)hotmail.com> --- drivers/clk/rockchip/clk_rk3399.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index c37e8a53a2..a9114c4b02 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1563,6 +1563,8 @@ static ulong rk3399_pmuclk_get_rate(struct clk *clk) case SCLK_I2C8_PMU: rate = rk3399_i2c_get_pmuclk(priv->pmucru, clk->id); break; + case SCLK_UART4_PMU: + return 24000000; default: return -ENOENT; } -- 2.43.2

2 1

[ANN] U-Boot v2024.04 released
by Tom Rini 02 Apr '24

02 Apr '24

Hey all, It's Tuesday, and for once I'm not late and it's release day and so here is v2024.04. Once again I want to thank everyone that's contributed to this release, not just in terms of code, but documentation, testing and otherwise ensuring things go as smoothly as they can. In terms of a changelog, git log --merges v2024.04-rc5..v2024.04 contains what I've pulled since the last RC or: git log --merges v2024.01..v2024.04 for changes since the last full release. As always, more details in pull requests (or the tags referenced by them) will result in more details here. The merge window is formally open again, and I'll be merging in next shortly. v2024.07 is scheduled for Monday, July 1st, 2024 and the merge window will close and -rc1 will be released on the 22nd of April, and then the next window will open with -rc2, two weeks later. Thanks all! -- Tom

1 0

[PATCH] clk: rockchip: rk3399: Add SCLK_UART4_PMU support
by xiaofengvskuye 02 Apr '24

02 Apr '24

The SCLK_UART4_PMU clocks is used as reference clock for UART4 block. Add simple support to get rate of SCLK_UART4_PMU clocks to fix reference clock period configuration. Signed-off-by: xiaofengvskuye <xiaofengvskuye(a)hotmail.com> --- drivers/clk/rockchip/clk_rk3399.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index c37e8a53a2..41eb13533a 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1563,6 +1563,9 @@ static ulong rk3399_pmuclk_get_rate(struct clk *clk) case SCLK_I2C8_PMU: rate = rk3399_i2c_get_pmuclk(priv->pmucru, clk->id); break; + case SCLK_UART4_PMU: + return 24000000; + break; default: return -ENOENT; } -- 2.43.2

1 0

[PATCH 1/2] usb: udc: dwc3: Fold board dm_usb_gadget_handle_interrupts() into DWC3 gadget
by Marek Vasut 02 Apr '24

02 Apr '24

The dm_usb_gadget_handle_interrupts() has no place in board code. Move this into DWC3 driver. The OMAP implementation is special, add new weak dwc3_uboot_interrupt_status() function to decide whether DWC3 interrupt handling should be called, and override it in OMAP DWC3 code, to repair the special OMAP interrupt handling code until OMAP gets switched over to DM UDC proper. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Angus Ainslie <angus(a)akkea.ca> Cc: Caleb Connolly <caleb.connolly(a)linaro.org> Cc: Eugen Hristev <eugen.hristev(a)collabora.com> Cc: Igor Prusov <ivprusov(a)salutedevices.com> Cc: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> Cc: Nishanth Menon <nm(a)ti.com> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefan Bosch <stefan_b(a)posteo.net> Cc: Svyatoslav Ryhel <clamor95(a)gmail.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: kernel(a)puri.sm --- board/purism/librem5/spl.c | 6 ------ board/samsung/common/exynos5-dt.c | 6 ------ board/st/stih410-b2260/board.c | 6 ------ board/ti/am43xx/board.c | 11 ----------- drivers/usb/dwc3/core.c | 25 +++++++++++++++++++++---- drivers/usb/dwc3/dwc3-omap.c | 4 ++-- include/dwc3-omap-uboot.h | 1 - include/dwc3-uboot.h | 1 + 8 files changed, 24 insertions(+), 36 deletions(-) diff --git a/board/purism/librem5/spl.c b/board/purism/librem5/spl.c index 581f0929662..9aadc553302 100644 --- a/board/purism/librem5/spl.c +++ b/board/purism/librem5/spl.c @@ -418,12 +418,6 @@ out: return rv; } -int dm_usb_gadget_handle_interrupts(struct udevice *dev) -{ - dwc3_uboot_handle_interrupt(dev); - return 0; -} - static void dwc3_nxp_usb_phy_init(struct dwc3_device *dwc3) { u32 RegData; diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index 95cf6d2acc2..b3e87c93751 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -122,12 +122,6 @@ static struct dwc3_device dwc3_device_data = { .index = 0, }; -int dm_usb_gadget_handle_interrupts(struct udevice *dev) -{ - dwc3_uboot_handle_interrupt(dev); - return 0; -} - int board_usb_init(int index, enum usb_init_type init) { struct exynos_usb3_phy *phy = (struct exynos_usb3_phy *) diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c index e21cbc270e9..82817571ae3 100644 --- a/board/st/stih410-b2260/board.c +++ b/board/st/stih410-b2260/board.c @@ -50,12 +50,6 @@ static struct dwc3_device dwc3_device_data = { .index = 0, }; -int dm_usb_gadget_handle_interrupts(struct udevice *dev) -{ - dwc3_uboot_handle_interrupt(dev); - return 0; -} - int board_usb_init(int index, enum usb_init_type init) { int node; diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index ea0d0b92088..a4679a2e294 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -759,17 +759,6 @@ static struct ti_usb_phy_device usb_phy2_device = { .usb2_phy_power = (void *)USB2_PHY2_POWER, .index = 1, }; - -int dm_usb_gadget_handle_interrupts(struct udevice *dev) -{ - u32 status; - - status = dwc3_omap_uboot_interrupt_status(dev); - if (status) - dwc3_uboot_handle_interrupt(dev); - - return 0; -} #endif /* CONFIG_USB_DWC3 */ #if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 4b4fcd8a22e..09737be9a9c 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -983,6 +983,11 @@ void dwc3_uboot_exit(int index) } } +MODULE_ALIAS("platform:dwc3"); +MODULE_AUTHOR("Felipe Balbi <balbi(a)ti.com>"); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver"); + /** * dwc3_uboot_handle_interrupt - handle dwc3 core interrupt * @dev: device of this controller @@ -1004,10 +1009,22 @@ void dwc3_uboot_handle_interrupt(struct udevice *dev) } } -MODULE_ALIAS("platform:dwc3"); -MODULE_AUTHOR("Felipe Balbi <balbi(a)ti.com>"); -MODULE_LICENSE("GPL v2"); -MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver"); +#if !CONFIG_IS_ENABLED(DM_USB_GADGET) +__weak int dwc3_uboot_interrupt_status(struct udevice *dev) +{ + return 1; +} + +int dm_usb_gadget_handle_interrupts(struct udevice *dev) +{ + if (!dwc3_uboot_interrupt_status(dev)) + return 0; + + dwc3_uboot_handle_interrupt(dev); + + return 0; +} +#endif #if CONFIG_IS_ENABLED(PHY) && CONFIG_IS_ENABLED(DM_USB) int dwc3_setup_phy(struct udevice *dev, struct phy_bulk *phys) diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 4fadb4a3e20..53c4d4826b4 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -428,7 +428,7 @@ void dwc3_omap_uboot_exit(int index) } /** - * dwc3_omap_uboot_interrupt_status - check the status of interrupt + * dwc3_uboot_interrupt_status - check the status of interrupt * @dev: device of this controller * * Checks the status of interrupts and returns true if an interrupt @@ -436,7 +436,7 @@ void dwc3_omap_uboot_exit(int index) * * Generally called from board file. */ -int dwc3_omap_uboot_interrupt_status(struct udevice *dev) +int dwc3_uboot_interrupt_status(struct udevice *dev) { struct dwc3_omap *omap = NULL; diff --git a/include/dwc3-omap-uboot.h b/include/dwc3-omap-uboot.h index ed92bfc5a97..f220705ef7b 100644 --- a/include/dwc3-omap-uboot.h +++ b/include/dwc3-omap-uboot.h @@ -27,5 +27,4 @@ struct dwc3_omap_device { int dwc3_omap_uboot_init(struct dwc3_omap_device *dev); void dwc3_omap_uboot_exit(int index); -int dwc3_omap_uboot_interrupt_status(struct udevice *dev); #endif /* __DWC3_OMAP_UBOOT_H_ */ diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h index 35cfbb93b29..5f13f5bcf40 100644 --- a/include/dwc3-uboot.h +++ b/include/dwc3-uboot.h @@ -44,6 +44,7 @@ struct dwc3_device { int dwc3_uboot_init(struct dwc3_device *dev); void dwc3_uboot_exit(int index); +int dwc3_uboot_interrupt_status(struct udevice *dev); void dwc3_uboot_handle_interrupt(struct udevice *dev); struct phy; -- 2.43.0

4 10

[PATCH] mvebu: Enable preboot start for pci/usb/scsi/nvme
by Dennis Gilmore 02 Apr '24

02 Apr '24

While preboot was enabled, it did not work as commands are needed to be run to enable some of the subsystems. This patch starts pci, USB, Sata, and nvme and makes sure that the system will boot no mater what storage is in use. Applogies for resending, I accidently left the u-boot list off Signed-off-by: Dennis Gilmore <dennis(a)ausil.us> --- configs/mvebu_espressobin-88f3720_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig index 7ecf5ab0d64..f4f7a809609 100644 --- a/configs/mvebu_espressobin-88f3720_defconfig +++ b/configs/mvebu_espressobin-88f3720_defconfig @@ -21,6 +21,7 @@ CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="pci enum; usb start; nvme scan; scsi scan;" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set -- 2.44.0

2 2

[PATCH] net: phy: broadcom: Configure LEDs on BCM54210E
by Marek Vasut 02 Apr '24

02 Apr '24

Configure LEDs on BCM54210E so they would blink on activity and indicate link speed. Without this the LEDs are always on if cable is plugged in. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Rafał Miłecki <rafal(a)milecki.pl> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- drivers/net/phy/broadcom.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 82e3bbef7dd..ecccb7c3b54 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -42,6 +42,12 @@ #define BCM54810_SHD_CLK_CTL 0x3 #define BCM54810_SHD_CLK_CTL_GTXCLK_EN BIT(9) +#define BCM54XX_SHD_LEDS1 0x0d +#define BCM_LED_SRC_LINKSPD2 0x1 +#define BCM_LED_SRC_ACTIVITYLED 0x3 +#define BCM54XX_SHD_LEDS1_LED3(src) (((src) & 0xf) << 4) +#define BCM54XX_SHD_LEDS1_LED1(src) (((src) & 0xf) << 0) + static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum) { /* The register must be written to both the Shadow Register Select and @@ -148,7 +154,16 @@ static int bcm54210e_config(struct phy_device *phydev) if (ret < 0) return ret; - return bcm5461_config(phydev); + ret = bcm5461_config(phydev); + if (ret < 0) + return ret; + + /* Configure LEDs to blink. */ + bcm_phy_write_shadow(phydev, BCM54XX_SHD_LEDS1, + BCM54XX_SHD_LEDS1_LED1(BCM_LED_SRC_ACTIVITYLED) | + BCM54XX_SHD_LEDS1_LED3(BCM_LED_SRC_LINKSPD2)); + + return 0; } static int bcm54xx_parse_status(struct phy_device *phydev) -- 2.43.0

3 2

[PATCH v2 0/5] arm: meson: Switch to using upstream DT for GXL, GXM, AXG, G12A, G12B & SM1 SoCs
by Neil Armstrong 02 Apr '24

02 Apr '24

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/ including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory and drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files kept in arch/arm/dts directory for these boards. Keep A1 DTs locally since the architecture is still young. CI built & tested at: https://gitlab.com/amlogic-foss/amlogic-u-boot-autotest/-/pipelines/1233461… Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Changes in v2: - add change to remove prefix in fdtfile - collected review tags - Link to v1: https://lore.kernel.org/r/20240319-u-boot-of-upstream-v1-0-f82bc9fe69c0@lin… --- Neil Armstrong (5): configs: meson64: remove amlogic prefix in fdtfile when CONFIG_OF_UPSTREAM is selected dts: meson: Switch GXL, GXM & AXG to using upstream DT dts: meson: Drop redundant GXL, GXM & AXG devicetree files dts: meson-g12a: Switch to using upstream DT dts: meson: Drop redundant G12A, G12B & SM1 devicetree files arch/arm/dts/Makefile | 36 +- arch/arm/dts/meson-axg-jethome-jethub-j100.dts | 361 --- arch/arm/dts/meson-axg-s400.dts | 602 ----- arch/arm/dts/meson-axg.dtsi | 1957 --------------- arch/arm/dts/meson-g12-common.dtsi | 2493 -------------------- arch/arm/dts/meson-g12.dtsi | 385 --- arch/arm/dts/meson-g12a-radxa-zero.dts | 405 ---- arch/arm/dts/meson-g12a-sei510.dts | 566 ----- arch/arm/dts/meson-g12a-u200.dts | 308 --- arch/arm/dts/meson-g12a.dtsi | 140 -- arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts | 33 - arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts | 41 - arch/arm/dts/meson-g12b-a311d.dtsi | 149 -- arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts | 165 -- arch/arm/dts/meson-g12b-bananapi-cm4.dtsi | 388 --- arch/arm/dts/meson-g12b-bananapi.dtsi | 521 ---- arch/arm/dts/meson-g12b-gsking-x.dts | 133 -- arch/arm/dts/meson-g12b-gtking-pro.dts | 142 -- arch/arm/dts/meson-g12b-gtking.dts | 163 -- arch/arm/dts/meson-g12b-khadas-vim3.dtsi | 107 - arch/arm/dts/meson-g12b-odroid-go-ultra.dts | 722 ------ arch/arm/dts/meson-g12b-odroid-n2-plus.dts | 31 - arch/arm/dts/meson-g12b-odroid-n2.dts | 15 - arch/arm/dts/meson-g12b-odroid-n2.dtsi | 303 --- arch/arm/dts/meson-g12b-odroid-n2l.dts | 125 - arch/arm/dts/meson-g12b-odroid.dtsi | 445 ---- arch/arm/dts/meson-g12b-radxa-zero2.dts | 489 ---- arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts | 14 - arch/arm/dts/meson-g12b-s922x.dtsi | 139 -- arch/arm/dts/meson-g12b-w400.dtsi | 425 ---- arch/arm/dts/meson-g12b.dtsi | 146 -- arch/arm/dts/meson-gx-libretech-pc.dtsi | 447 ---- arch/arm/dts/meson-gx-mali450.dtsi | 61 - arch/arm/dts/meson-gx-p23x-q20x.dtsi | 324 --- arch/arm/dts/meson-gx.dtsi | 675 ------ arch/arm/dts/meson-gxl-mali.dtsi | 17 - arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 319 --- arch/arm/dts/meson-gxl-s805x.dtsi | 23 - arch/arm/dts/meson-gxl-s905d-libretech-pc.dts | 16 - arch/arm/dts/meson-gxl-s905d.dtsi | 12 - .../arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts | 247 -- arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 237 -- arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts | 313 --- arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 356 --- arch/arm/dts/meson-gxl-s905x-p212.dts | 134 -- arch/arm/dts/meson-gxl-s905x-p212.dtsi | 213 -- arch/arm/dts/meson-gxl-s905x.dtsi | 18 - arch/arm/dts/meson-gxl.dtsi | 940 -------- arch/arm/dts/meson-gxm-gt1-ultimate.dts | 91 - arch/arm/dts/meson-gxm-khadas-vim2.dts | 424 ---- arch/arm/dts/meson-gxm-s912-libretech-pc.dts | 62 - arch/arm/dts/meson-gxm-wetek-core2.dts | 85 - arch/arm/dts/meson-gxm.dtsi | 216 -- arch/arm/dts/meson-khadas-vim3.dtsi | 534 ----- arch/arm/dts/meson-sm1-bananapi-m2-pro.dts | 97 - arch/arm/dts/meson-sm1-bananapi-m5.dts | 221 -- arch/arm/dts/meson-sm1-bananapi.dtsi | 435 ---- arch/arm/dts/meson-sm1-khadas-vim3l.dts | 113 - arch/arm/dts/meson-sm1-odroid-c4.dts | 48 - arch/arm/dts/meson-sm1-odroid-hc4.dts | 140 -- arch/arm/dts/meson-sm1-odroid.dtsi | 449 ---- arch/arm/dts/meson-sm1-sei610.dts | 616 ----- arch/arm/dts/meson-sm1.dtsi | 550 ----- arch/arm/mach-meson/Kconfig | 4 + configs/bananapi-cm4-cm4io_defconfig | 2 +- configs/bananapi-m2-pro_defconfig | 2 +- configs/bananapi-m2s_defconfig | 2 +- configs/bananapi-m5_defconfig | 2 +- configs/beelink-gsking-x_defconfig | 2 +- configs/beelink-gt1-ultimate_defconfig | 2 +- configs/beelink-gtking_defconfig | 2 +- configs/beelink-gtkingpro_defconfig | 2 +- configs/jethub_j100_defconfig | 2 +- configs/jethub_j80_defconfig | 2 +- configs/khadas-vim2_defconfig | 2 +- configs/khadas-vim3_android_ab_defconfig | 2 +- configs/khadas-vim3_android_defconfig | 2 +- configs/khadas-vim3_defconfig | 2 +- configs/khadas-vim3l_android_ab_defconfig | 2 +- configs/khadas-vim3l_android_defconfig | 2 +- configs/khadas-vim3l_defconfig | 2 +- configs/khadas-vim_defconfig | 2 +- configs/libretech-ac_defconfig | 2 +- configs/libretech-cc_defconfig | 2 +- configs/libretech-cc_v2_defconfig | 2 +- configs/libretech-s905d-pc_defconfig | 2 +- configs/libretech-s912-pc_defconfig | 2 +- configs/odroid-c4_defconfig | 2 +- configs/odroid-go-ultra_defconfig | 2 +- configs/odroid-hc4_defconfig | 2 +- configs/odroid-n2_defconfig | 2 +- configs/odroid-n2l_defconfig | 2 +- configs/p212_defconfig | 2 +- configs/radxa-zero2_defconfig | 2 +- configs/radxa-zero_defconfig | 2 +- configs/s400_defconfig | 2 +- configs/sei510_defconfig | 2 +- configs/sei610_defconfig | 2 +- configs/u200_defconfig | 2 +- configs/wetek-core2_defconfig | 2 +- include/configs/meson64.h | 8 +- include/dt-bindings/gpio/meson-axg-gpio.h | 116 - include/dt-bindings/gpio/meson-g12a-gpio.h | 114 - include/dt-bindings/gpio/meson-gxbb-gpio.h | 148 -- include/dt-bindings/gpio/meson-gxl-gpio.h | 125 - include/dt-bindings/power/meson-axg-power.h | 14 - include/dt-bindings/power/meson-g12a-power.h | 13 - include/dt-bindings/power/meson-gxbb-power.h | 13 - include/dt-bindings/power/meson-sm1-power.h | 18 - .../reset/amlogic,meson-axg-audio-arb.h | 19 - .../dt-bindings/reset/amlogic,meson-axg-reset.h | 123 - .../reset/amlogic,meson-g12a-audio-reset.h | 53 - .../dt-bindings/reset/amlogic,meson-g12a-reset.h | 137 -- .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 161 -- include/dt-bindings/sound/meson-aiu.h | 18 - include/dt-bindings/sound/meson-g12a-toacodec.h | 10 - include/dt-bindings/sound/meson-g12a-tohdmitx.h | 13 - 117 files changed, 49 insertions(+), 21512 deletions(-) --- base-commit: 6e2228fb052b68c84688d5baff06e2ebc787a4a5 change-id: 20240319-u-boot-of-upstream-46454fded5ea Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

2 7

[PATCH 0/4] arm: meson: Switch to using upstream DT for GXL, GXM, AXG, G12A, G12B & SM1 SoCs
by Neil Armstrong 02 Apr '24

02 Apr '24

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/ including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory and drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files kept in arch/arm/dts directory for these boards. Keep A1 DTs locally since the architecture is still young. CI built & tested at: https://gitlab.com/amlogic-foss/amlogic-u-boot-autotest/-/pipelines/1219273… Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Neil Armstrong (4): dts: meson: Switch GXL, GXM & AXG to using upstream DT dts: meson: Drop redundant GXL, GXM & AXG devicetree files dts: meson-g12a: Switch to using upstream DT dts: meson: Drop redundant G12A, G12B & SM1 devicetree files arch/arm/dts/Makefile | 36 +- arch/arm/dts/meson-axg-jethome-jethub-j100.dts | 361 --- arch/arm/dts/meson-axg-s400.dts | 602 ----- arch/arm/dts/meson-axg.dtsi | 1957 --------------- arch/arm/dts/meson-g12-common.dtsi | 2493 -------------------- arch/arm/dts/meson-g12.dtsi | 385 --- arch/arm/dts/meson-g12a-radxa-zero.dts | 405 ---- arch/arm/dts/meson-g12a-sei510.dts | 566 ----- arch/arm/dts/meson-g12a-u200.dts | 308 --- arch/arm/dts/meson-g12a.dtsi | 140 -- arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts | 33 - arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts | 41 - arch/arm/dts/meson-g12b-a311d.dtsi | 149 -- arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts | 165 -- arch/arm/dts/meson-g12b-bananapi-cm4.dtsi | 388 --- arch/arm/dts/meson-g12b-bananapi.dtsi | 521 ---- arch/arm/dts/meson-g12b-gsking-x.dts | 133 -- arch/arm/dts/meson-g12b-gtking-pro.dts | 142 -- arch/arm/dts/meson-g12b-gtking.dts | 163 -- arch/arm/dts/meson-g12b-khadas-vim3.dtsi | 107 - arch/arm/dts/meson-g12b-odroid-go-ultra.dts | 722 ------ arch/arm/dts/meson-g12b-odroid-n2-plus.dts | 31 - arch/arm/dts/meson-g12b-odroid-n2.dts | 15 - arch/arm/dts/meson-g12b-odroid-n2.dtsi | 303 --- arch/arm/dts/meson-g12b-odroid-n2l.dts | 125 - arch/arm/dts/meson-g12b-odroid.dtsi | 445 ---- arch/arm/dts/meson-g12b-radxa-zero2.dts | 489 ---- arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts | 14 - arch/arm/dts/meson-g12b-s922x.dtsi | 139 -- arch/arm/dts/meson-g12b-w400.dtsi | 425 ---- arch/arm/dts/meson-g12b.dtsi | 146 -- arch/arm/dts/meson-gx-libretech-pc.dtsi | 447 ---- arch/arm/dts/meson-gx-mali450.dtsi | 61 - arch/arm/dts/meson-gx-p23x-q20x.dtsi | 324 --- arch/arm/dts/meson-gx.dtsi | 675 ------ arch/arm/dts/meson-gxl-mali.dtsi | 17 - arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 319 --- arch/arm/dts/meson-gxl-s805x.dtsi | 23 - arch/arm/dts/meson-gxl-s905d-libretech-pc.dts | 16 - arch/arm/dts/meson-gxl-s905d.dtsi | 12 - .../arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts | 247 -- arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 237 -- arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts | 313 --- arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 356 --- arch/arm/dts/meson-gxl-s905x-p212.dts | 134 -- arch/arm/dts/meson-gxl-s905x-p212.dtsi | 213 -- arch/arm/dts/meson-gxl-s905x.dtsi | 18 - arch/arm/dts/meson-gxl.dtsi | 940 -------- arch/arm/dts/meson-gxm-gt1-ultimate.dts | 91 - arch/arm/dts/meson-gxm-khadas-vim2.dts | 424 ---- arch/arm/dts/meson-gxm-s912-libretech-pc.dts | 62 - arch/arm/dts/meson-gxm-wetek-core2.dts | 85 - arch/arm/dts/meson-gxm.dtsi | 216 -- arch/arm/dts/meson-khadas-vim3.dtsi | 534 ----- arch/arm/dts/meson-sm1-bananapi-m2-pro.dts | 97 - arch/arm/dts/meson-sm1-bananapi-m5.dts | 221 -- arch/arm/dts/meson-sm1-bananapi.dtsi | 435 ---- arch/arm/dts/meson-sm1-khadas-vim3l.dts | 113 - arch/arm/dts/meson-sm1-odroid-c4.dts | 48 - arch/arm/dts/meson-sm1-odroid-hc4.dts | 140 -- arch/arm/dts/meson-sm1-odroid.dtsi | 449 ---- arch/arm/dts/meson-sm1-sei610.dts | 616 ----- arch/arm/dts/meson-sm1.dtsi | 550 ----- arch/arm/mach-meson/Kconfig | 4 + configs/bananapi-cm4-cm4io_defconfig | 2 +- configs/bananapi-m2-pro_defconfig | 2 +- configs/bananapi-m2s_defconfig | 2 +- configs/bananapi-m5_defconfig | 2 +- configs/beelink-gsking-x_defconfig | 2 +- configs/beelink-gt1-ultimate_defconfig | 2 +- configs/beelink-gtking_defconfig | 2 +- configs/beelink-gtkingpro_defconfig | 2 +- configs/jethub_j100_defconfig | 2 +- configs/jethub_j80_defconfig | 2 +- configs/khadas-vim2_defconfig | 2 +- configs/khadas-vim3_android_ab_defconfig | 2 +- configs/khadas-vim3_android_defconfig | 2 +- configs/khadas-vim3_defconfig | 2 +- configs/khadas-vim3l_android_ab_defconfig | 2 +- configs/khadas-vim3l_android_defconfig | 2 +- configs/khadas-vim3l_defconfig | 2 +- configs/khadas-vim_defconfig | 2 +- configs/libretech-ac_defconfig | 2 +- configs/libretech-cc_defconfig | 2 +- configs/libretech-cc_v2_defconfig | 2 +- configs/libretech-s905d-pc_defconfig | 2 +- configs/libretech-s912-pc_defconfig | 2 +- configs/odroid-c4_defconfig | 2 +- configs/odroid-go-ultra_defconfig | 2 +- configs/odroid-hc4_defconfig | 2 +- configs/odroid-n2_defconfig | 2 +- configs/odroid-n2l_defconfig | 2 +- configs/p212_defconfig | 2 +- configs/radxa-zero2_defconfig | 2 +- configs/radxa-zero_defconfig | 2 +- configs/s400_defconfig | 2 +- configs/sei510_defconfig | 2 +- configs/sei610_defconfig | 2 +- configs/u200_defconfig | 2 +- configs/wetek-core2_defconfig | 2 +- include/dt-bindings/gpio/meson-axg-gpio.h | 116 - include/dt-bindings/gpio/meson-g12a-gpio.h | 114 - include/dt-bindings/gpio/meson-gxbb-gpio.h | 148 -- include/dt-bindings/gpio/meson-gxl-gpio.h | 125 - include/dt-bindings/power/meson-axg-power.h | 14 - include/dt-bindings/power/meson-g12a-power.h | 13 - include/dt-bindings/power/meson-gxbb-power.h | 13 - include/dt-bindings/power/meson-sm1-power.h | 18 - .../reset/amlogic,meson-axg-audio-arb.h | 19 - .../dt-bindings/reset/amlogic,meson-axg-reset.h | 123 - .../reset/amlogic,meson-g12a-audio-reset.h | 53 - .../dt-bindings/reset/amlogic,meson-g12a-reset.h | 137 -- .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 161 -- include/dt-bindings/sound/meson-aiu.h | 18 - include/dt-bindings/sound/meson-g12a-toacodec.h | 10 - include/dt-bindings/sound/meson-g12a-tohdmitx.h | 13 - 116 files changed, 42 insertions(+), 21511 deletions(-) --- base-commit: b145877c22b391a4872c875145a8f86f6ffebaba change-id: 20240319-u-boot-of-upstream-46454fded5ea Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

5 13