From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [DistroKit] [PATCH 7/8] v7a: barebox: update v2022.04.0 → v2022.06.0
Date: Mon, 25 Jul 2022 14:04:44 +0200 [thread overview]
Message-ID: <20220725120445.1295669-7-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20220725120445.1295669-1-a.fatoum@pengutronix.de>
There has been two barebox releases in the mean time, so give the v7a
barebox-common an update to get rid of the patches we carry.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
.../platform-v7a/barebox-am335x-mlo.config | 3 +-
configs/platform-v7a/barebox-am335x.config | 6 +-
.../platform-v7a/barebox-am335x.config.diff | 3 +-
configs/platform-v7a/barebox-at91.config | 6 +-
configs/platform-v7a/barebox-at91.config.diff | 2 +-
configs/platform-v7a/barebox-mx6.config | 5 +-
configs/platform-v7a/barebox-mx6.config.diff | 2 +-
configs/platform-v7a/barebox-rpi2.config | 5 +-
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-stm32mp.config | 6 +-
.../platform-v7a/barebox-stm32mp.config.diff | 2 +-
configs/platform-v7a/barebox-vexpress.config | 5 +-
.../platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 5 +-
...ompilation-of-32-bit-ENTRY_FUNCTION_.patch | 57 --
...35-auxiliary-peripheral-clock-driver.patch | 119 -----
...gn-non-zero-priorities-to-all-clocks.patch | 492 ------------------
...rd-dt-2nd-call-arm_cpu_lowlevel_init.patch | 40 --
...n-t-warn-about-lack-of-videocore-fdt.patch | 37 --
.../patches/barebox-2022.04.0/series | 5 -
configs/platform-v7a/platformconfig | 4 +-
21 files changed, 42 insertions(+), 766 deletions(-)
delete mode 100644 configs/platform-v7a/patches/barebox-2022.04.0/0001-ARM-asm-fix-miscompilation-of-32-bit-ENTRY_FUNCTION_.patch
delete mode 100644 configs/platform-v7a/patches/barebox-2022.04.0/0002-clk-add-BCM2835-auxiliary-peripheral-clock-driver.patch
delete mode 100644 configs/platform-v7a/patches/barebox-2022.04.0/0003-clocksource-assign-non-zero-priorities-to-all-clocks.patch
delete mode 100644 configs/platform-v7a/patches/barebox-2022.04.0/0004-ARM-cpu-board-dt-2nd-call-arm_cpu_lowlevel_init.patch
delete mode 100644 configs/platform-v7a/patches/barebox-2022.04.0/0005-ARM-rpi-don-t-warn-about-lack-of-videocore-fdt.patch
delete mode 100644 configs/platform-v7a/patches/barebox-2022.04.0/series
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index e6d96e739cd3..8d01f854c874 100644
--- a/configs/platform-v7a/barebox-am335x-mlo.config
+++ b/configs/platform-v7a/barebox-am335x-mlo.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2022.04.0 Configuration
+# Barebox/arm 2022.06.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -61,6 +61,7 @@ CONFIG_OMAP_MULTI_BOARDS=y
CONFIG_MACH_AFI_GF=y
# CONFIG_MACH_BEAGLE is not set
CONFIG_MACH_BEAGLEBONE=y
+# CONFIG_MACH_MYIRTECH_X335X is not set
CONFIG_MACH_PHYTEC_SOM_AM335X=y
# CONFIG_MACH_VSCOM_BALTOS is not set
# CONFIG_MACH_WAGO_PFC_AM35XX is not set
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 3554401a0fb0..964b9dd41a61 100644
--- a/configs/platform-v7a/barebox-am335x.config
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2022.04.0 Configuration
+# Barebox/arm 2022.06.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -65,6 +65,7 @@ CONFIG_OMAP_MULTI_BOARDS=y
CONFIG_MACH_AFI_GF=y
# CONFIG_MACH_BEAGLE is not set
CONFIG_MACH_BEAGLEBONE=y
+# CONFIG_MACH_MYIRTECH_X335X is not set
# CONFIG_MACH_PHYTEC_SOM_AM335X is not set
# CONFIG_MACH_VSCOM_BALTOS is not set
# CONFIG_MACH_WAGO_PFC_AM35XX is not set
@@ -379,6 +380,7 @@ CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_IP_ROUTE_GET=y
+# CONFIG_CMD_ETHLOG is not set
# end of Network
#
@@ -517,6 +519,7 @@ CONFIG_DRIVER_NET_CPSW=y
# CONFIG_AT803X_PHY is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
+# CONFIG_DP83TD510_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -537,6 +540,7 @@ CONFIG_NET_USB_ASIX=y
# CONFIG_USB_NET_AX88179_178A is not set
CONFIG_NET_USB_SMSC95XX=y
# CONFIG_NET_USB_RTL8152 is not set
+# CONFIG_DSA is not set
# end of Network drivers
#
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index d13e6f828218..376cddeaaa0e 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-e763acc45047a436f8f51a20f6c5e230
+ce1ca5fe3cea9cabd6af79b60ecde84b
# CONFIG_AM33XX_NET_BOOT is not set
CONFIG_ARCH_AM33XX=y
# CONFIG_ARCH_BCM283X is not set
@@ -58,6 +58,7 @@ CONFIG_IMAGE_SPARSE=y
CONFIG_MACH_AFI_GF=y
# CONFIG_MACH_BEAGLE is not set
CONFIG_MACH_BEAGLEBONE=y
+# CONFIG_MACH_MYIRTECH_X335X is not set
# CONFIG_MACH_PHYTEC_SOM_AM335X is not set
# CONFIG_MACH_RPI2 is undefined
# CONFIG_MACH_RPI3 is undefined
diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index a0382de22f76..4306cfd4bcae 100644
--- a/configs/platform-v7a/barebox-at91.config
+++ b/configs/platform-v7a/barebox-at91.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2022.04.0 Configuration
+# Barebox/arm 2022.06.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -377,6 +377,7 @@ CONFIG_NET_CMD_IFUP=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_IP_ROUTE_GET=y
+# CONFIG_CMD_ETHLOG is not set
# end of Network
#
@@ -510,6 +511,7 @@ CONFIG_DRIVER_NET_MICREL=y
# CONFIG_AT803X_PHY is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
+# CONFIG_DP83TD510_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -524,6 +526,8 @@ CONFIG_DRIVER_NET_MICREL=y
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MDIO_BUS_MUX_GPIO is not set
# end of phylib
+
+# CONFIG_DSA is not set
# end of Network drivers
#
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index 8f173ecd1982..ed1ed6d7d4e2 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-e763acc45047a436f8f51a20f6c5e230
+ce1ca5fe3cea9cabd6af79b60ecde84b
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_TEXT_BASE=0x23f00000
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 23d2fb6ab41e..4d98b5e205e6 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2022.04.0 Configuration
+# Barebox/arm 2022.06.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -453,6 +453,7 @@ CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_IP_ROUTE_GET=y
+# CONFIG_CMD_ETHLOG is not set
# end of Network
#
@@ -596,6 +597,7 @@ CONFIG_DRIVER_NET_FEC_IMX=y
CONFIG_AT803X_PHY=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
+# CONFIG_DP83TD510_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
CONFIG_MICREL_PHY=y
@@ -616,6 +618,7 @@ CONFIG_NET_USB_ASIX=y
# CONFIG_USB_NET_AX88179_178A is not set
CONFIG_NET_USB_SMSC95XX=y
# CONFIG_NET_USB_RTL8152 is not set
+# CONFIG_DSA is not set
# end of Network drivers
#
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 36ba2904fd8f..b9a05e41a1db 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-e763acc45047a436f8f51a20f6c5e230
+ce1ca5fe3cea9cabd6af79b60ecde84b
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 67e19233b1b2..77bb09edbdce 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2022.04.0 Configuration
+# Barebox/arm 2022.06.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -360,6 +360,7 @@ CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_IP_ROUTE_GET=y
+# CONFIG_CMD_ETHLOG is not set
# end of Network
#
@@ -493,6 +494,7 @@ CONFIG_PHYLIB=y
# CONFIG_AT803X_PHY is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
+# CONFIG_DP83TD510_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -513,6 +515,7 @@ CONFIG_NET_USB_ASIX=y
# CONFIG_USB_NET_AX88179_178A is not set
CONFIG_NET_USB_SMSC95XX=y
# CONFIG_NET_USB_RTL8152 is not set
+# CONFIG_DSA is not set
# end of Network drivers
#
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index 42233c546822..f7ffae897169 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-e763acc45047a436f8f51a20f6c5e230
+ce1ca5fe3cea9cabd6af79b60ecde84b
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_BOOTM_INITRD=y
# CONFIG_CMD_I2C is undefined
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 23751d5362dd..15b2a8393345 100644
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ b/configs/platform-v7a/barebox-stm32mp.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2022.04.0 Configuration
+# Barebox/arm 2022.06.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -360,6 +360,7 @@ CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_IP_ROUTE_GET=y
+# CONFIG_CMD_ETHLOG is not set
# end of Network
#
@@ -493,6 +494,7 @@ CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
CONFIG_AT803X_PHY=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
+# CONFIG_DP83TD510_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
CONFIG_MICREL_PHY=y
@@ -507,6 +509,8 @@ CONFIG_MICREL_PHY=y
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MDIO_BUS_MUX_GPIO is not set
# end of phylib
+
+# CONFIG_DSA is not set
# end of Network drivers
#
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 9d8dd43ab352..d14e40f60b54 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-e763acc45047a436f8f51a20f6c5e230
+ce1ca5fe3cea9cabd6af79b60ecde84b
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_ARCH_NR_GPIO=416
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 33d166ce2a98..e6f50d1274a3 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2022.04.0 Configuration
+# Barebox/arm 2022.06.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -348,6 +348,7 @@ CONFIG_NET_CMD_IFUP=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_IP_ROUTE_GET=y
+# CONFIG_CMD_ETHLOG is not set
# end of Network
#
@@ -480,6 +481,7 @@ CONFIG_DRIVER_NET_SMC911X=y
# CONFIG_AT803X_PHY is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
+# CONFIG_DP83TD510_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -499,6 +501,7 @@ CONFIG_NET_USB_ASIX=y
# CONFIG_USB_NET_AX88179_178A is not set
CONFIG_NET_USB_SMSC95XX=y
# CONFIG_NET_USB_RTL8152 is not set
+# CONFIG_DSA is not set
# end of Network drivers
#
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index 3548882baf41..f09afd233e7f 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-e763acc45047a436f8f51a20f6c5e230
+ce1ca5fe3cea9cabd6af79b60ecde84b
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 62db9479f339..9e15a66d08e1 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2022.04.0 Configuration
+# Barebox/arm 2022.06.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -360,6 +360,7 @@ CONFIG_NET_CMD_IFUP=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_IP_ROUTE_GET=y
+# CONFIG_CMD_ETHLOG is not set
# end of Network
#
@@ -495,6 +496,7 @@ CONFIG_PHYLIB=y
# CONFIG_AT803X_PHY is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
+# CONFIG_DP83TD510_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -515,6 +517,7 @@ CONFIG_NET_USB_ASIX=y
# CONFIG_USB_NET_AX88179_178A is not set
CONFIG_NET_USB_SMSC95XX=y
# CONFIG_NET_USB_RTL8152 is not set
+# CONFIG_DSA is not set
# end of Network drivers
#
diff --git a/configs/platform-v7a/patches/barebox-2022.04.0/0001-ARM-asm-fix-miscompilation-of-32-bit-ENTRY_FUNCTION_.patch b/configs/platform-v7a/patches/barebox-2022.04.0/0001-ARM-asm-fix-miscompilation-of-32-bit-ENTRY_FUNCTION_.patch
deleted file mode 100644
index 21088e9cee38..000000000000
--- a/configs/platform-v7a/patches/barebox-2022.04.0/0001-ARM-asm-fix-miscompilation-of-32-bit-ENTRY_FUNCTION_.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 687c229fb85f1116eef2a103617e44dd0bca0953 Mon Sep 17 00:00:00 2001
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Fri, 22 Apr 2022 14:47:53 +0200
-Subject: [PATCH 1/5] ARM: asm: fix miscompilation of 32-bit
- ENTRY_FUNCTION_WITHSTACK
-
-gcc-11.1.1 shipped with OSELAS.Toolchain-2021.07.0 hoists a single
-instruction from __ARM_SETUP_STACK in front of __barebox_arm_head
-breaking the barebox header format for the Raspberry Pi 3. This can't
-happen with ARM64 and the Raspberry Pi entry points are currently the
-only 32-bit users.
-
-While the resulting barebox image was still bootable, header detection
-would fail. Add an intermediate naked function to work around this.
-
-This is not required for plain ENTRY_FUNCTION, because the
-board-supplied entry point is already NAKED. For
-ENTRY_FUNCTION_WITH_FUNCTION, that same entry point is intentionally
-non-naked to reduce pitfalls for board code authors..
-
-Fixes: 880c9803b95a ("ARM: implement ENTRY_FUNCTION_WITHSTACK")
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
----
- arch/arm/include/asm/barebox-arm.h | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
-index d915cde294a4..8b0c00633277 100644
---- a/arch/arm/include/asm/barebox-arm.h
-+++ b/arch/arm/include/asm/barebox-arm.h
-@@ -194,15 +194,21 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase,
- void name(ulong r0, ulong r1, ulong r2); \
- \
- static void __##name(ulong, ulong, ulong); \
-+ static void ____##name(ulong, ulong, ulong); \
- \
- void NAKED __section(.text_head_entry_##name) name \
- (ulong r0, ulong r1, ulong r2) \
- { \
- __barebox_arm_head(); \
-- __ARM_SETUP_STACK(stack_top); \
- __##name(r0, r1, r2); \
- } \
-- static void noinline __##name \
-+ static void NAKED noinline __##name \
-+ (ulong r0, ulong r1, ulong r2) \
-+ { \
-+ __ARM_SETUP_STACK(stack_top); \
-+ ____##name(r0, r1, r2); \
-+ } \
-+ static void noinline ____##name \
- (ulong arg0, ulong arg1, ulong arg2)
-
-
---
-2.30.2
-
diff --git a/configs/platform-v7a/patches/barebox-2022.04.0/0002-clk-add-BCM2835-auxiliary-peripheral-clock-driver.patch b/configs/platform-v7a/patches/barebox-2022.04.0/0002-clk-add-BCM2835-auxiliary-peripheral-clock-driver.patch
deleted file mode 100644
index 3f6be20f8f7c..000000000000
--- a/configs/platform-v7a/patches/barebox-2022.04.0/0002-clk-add-BCM2835-auxiliary-peripheral-clock-driver.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 36f37ded70ed0256f56fb095e7a5854394c30b9e Mon Sep 17 00:00:00 2001
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Fri, 22 Apr 2022 15:56:19 +0200
-Subject: [PATCH 2/5] clk: add BCM2835 auxiliary peripheral clock driver
-
-Commit f6ce1103fdc4 ("ARM: rpi: move clk support to a separate driver")
-replaced board code setting up clocks with clkdev_add_physbase() with a
-proper cprman driver that registers fixed clocks and can be referenced
-from device tree.
-
-It was not fully equivalent though, because the mini UART's clock was no
-longer registered as that is provided by a different clock controller.
-
-Import the Linux v5.17 bcm2835-aux-clk driver to fix console usage on
-Raspberry Pi 3b.
-
-Fixes: f6ce1103fdc4 ("ARM: rpi: move clk support to a separate driver")
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
----
- drivers/clk/Makefile | 1 +
- drivers/clk/bcm/Makefile | 2 +
- drivers/clk/bcm/clk-bcm2835-aux.c | 66 +++++++++++++++++++++++++++++++
- 3 files changed, 69 insertions(+)
- create mode 100644 drivers/clk/bcm/Makefile
- create mode 100644 drivers/clk/bcm/clk-bcm2835-aux.c
-
-diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
-index ee503c1edb5f..baf452de9873 100644
---- a/drivers/clk/Makefile
-+++ b/drivers/clk/Makefile
-@@ -26,4 +26,5 @@ obj-$(CONFIG_CLK_SIFIVE) += sifive/
- obj-$(CONFIG_SOC_STARFIVE) += starfive/
- obj-$(CONFIG_COMMON_CLK_STM32F) += clk-stm32f4.o
- obj-$(CONFIG_MACH_RPI_COMMON) += clk-rpi.o
-+obj-y += bcm/
- obj-$(CONFIG_COMMON_CLK_SCMI) += clk-scmi.o
-diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile
-new file mode 100644
-index 000000000000..1539e9f592a8
---- /dev/null
-+++ b/drivers/clk/bcm/Makefile
-@@ -0,0 +1,2 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+obj-$(CONFIG_ARCH_BCM283X) += clk-bcm2835-aux.o
-diff --git a/drivers/clk/bcm/clk-bcm2835-aux.c b/drivers/clk/bcm/clk-bcm2835-aux.c
-new file mode 100644
-index 000000000000..385cfd5d3f06
---- /dev/null
-+++ b/drivers/clk/bcm/clk-bcm2835-aux.c
-@@ -0,0 +1,66 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Copyright (C) 2015 Broadcom
-+ */
-+
-+#include <linux/clk.h>
-+#include <io.h>
-+#include <of_address.h>
-+#include <driver.h>
-+#include <init.h>
-+#include <dt-bindings/clock/bcm2835-aux.h>
-+
-+#define BCM2835_AUXIRQ 0x00
-+#define BCM2835_AUXENB 0x04
-+
-+static int bcm2835_aux_clk_probe(struct device_d *dev)
-+{
-+ struct clk_hw_onecell_data *onecell;
-+ const char *parent;
-+ struct clk *parent_clk;
-+ void __iomem *reg, *gate;
-+
-+ parent_clk = clk_get(dev, NULL);
-+ if (IS_ERR(parent_clk))
-+ return PTR_ERR(parent_clk);
-+ parent = __clk_get_name(parent_clk);
-+
-+ reg = of_iomap(dev->device_node, 0);
-+ if (!reg)
-+ return -ENOMEM;
-+
-+ onecell = kmalloc(struct_size(onecell, hws, BCM2835_AUX_CLOCK_COUNT),
-+ GFP_KERNEL);
-+ if (!onecell)
-+ return -ENOMEM;
-+ onecell->num = BCM2835_AUX_CLOCK_COUNT;
-+
-+ gate = reg + BCM2835_AUXENB;
-+ onecell->hws[BCM2835_AUX_CLOCK_UART] =
-+ clk_hw_register_gate(dev, "aux_uart", parent, 0, gate, 0, 0, NULL);
-+
-+ onecell->hws[BCM2835_AUX_CLOCK_SPI1] =
-+ clk_hw_register_gate(dev, "aux_spi1", parent, 0, gate, 1, 0, NULL);
-+
-+ onecell->hws[BCM2835_AUX_CLOCK_SPI2] =
-+ clk_hw_register_gate(dev, "aux_spi2", parent, 0, gate, 2, 0, NULL);
-+
-+ return of_clk_add_hw_provider(dev->device_node, of_clk_hw_onecell_get,
-+ onecell);
-+}
-+
-+static const struct of_device_id bcm2835_aux_clk_of_match[] = {
-+ { .compatible = "brcm,bcm2835-aux", },
-+ {},
-+};
-+
-+static struct driver_d bcm2835_aux_clk_driver = {
-+ .name = "bcm2835-aux-clk",
-+ .of_compatible = bcm2835_aux_clk_of_match,
-+ .probe = bcm2835_aux_clk_probe,
-+};
-+core_platform_driver(bcm2835_aux_clk_driver);
-+
-+MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
-+MODULE_DESCRIPTION("BCM2835 auxiliary peripheral clock driver");
-+MODULE_LICENSE("GPL");
---
-2.30.2
-
diff --git a/configs/platform-v7a/patches/barebox-2022.04.0/0003-clocksource-assign-non-zero-priorities-to-all-clocks.patch b/configs/platform-v7a/patches/barebox-2022.04.0/0003-clocksource-assign-non-zero-priorities-to-all-clocks.patch
deleted file mode 100644
index 8610985273ae..000000000000
--- a/configs/platform-v7a/patches/barebox-2022.04.0/0003-clocksource-assign-non-zero-priorities-to-all-clocks.patch
+++ /dev/null
@@ -1,492 +0,0 @@
-From 4c82930465ae4652ca5eb8cb808873858c1120a2 Mon Sep 17 00:00:00 2001
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Fri, 22 Apr 2022 17:22:32 +0200
-Subject: [PATCH 3/5] clocksource: assign non-zero priorities to all
- clocksources
-
-Most barebox clocksources have a zero priority and if multiple of them
-exist, but no higher priority ones, the first to call init_clock wins.
-
-Some supported boards like the Raspberry Pi additionally depended on
-initcall ordering to favor one zero-priority clocksource over another.
-With the move to deep probe and with Commit b641580deb8c ("of: platform:
-Ensure timers are probed early"), device tree blob iteration order could
-now dictate which clocksource is ultimately used. This led to a 20 times
-slower clock source being chosen on the Raspberry Pi, because the ARM
-architected timer was taken instead of the bcm2835 timer.
-
-Fix the root cause by assigning priorities to all clocksource drivers.
-Priorities chosen are:
-
- 50: device_initcall
- 60: coredevice_initcall
- 70: postcore_initcall
- 80: core_initcall
-
-These priorities are all below 100, which was previously the lowest
-positive priority and as they are positive, they win against the dummy
-clocksource. This should ensure no priority inversion happens.
-
-Fixes: b641580deb8c ("of: platform: Ensure timers are probed early")
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
----
- arch/arm/mach-at91/at91rm9200_time.c | 1 +
- arch/arm/mach-davinci/time.c | 1 +
- arch/arm/mach-ep93xx/clocksource.c | 1 +
- arch/arm/mach-mxs/clocksource-imx23.c | 1 +
- arch/arm/mach-mxs/clocksource-imx28.c | 1 +
- arch/arm/mach-pxa/clocksource.c | 1 +
- arch/arm/mach-samsung/s3c-timer.c | 1 +
- arch/arm/mach-tegra/tegra20-timer.c | 1 +
- arch/arm/mach-versatile/core.c | 1 +
- arch/mips/lib/csrc-r4k.c | 1 +
- arch/mips/mach-xburst/csrc-jz4750.c | 1 +
- arch/openrisc/lib/clock.c | 1 +
- arch/powerpc/mach-mpc5xxx/time.c | 1 +
- arch/powerpc/mach-mpc85xx/time.c | 1 +
- arch/sandbox/board/clock.c | 1 +
- drivers/clocksource/amba-sp804.c | 1 +
- drivers/clocksource/arm_architected_timer.c | 1 +
- drivers/clocksource/arm_global_timer.c | 1 +
- drivers/clocksource/arm_smp_twd.c | 1 +
- drivers/clocksource/armv7m_systick.c | 1 +
- drivers/clocksource/bcm2835.c | 1 +
- drivers/clocksource/clps711x.c | 1 +
- drivers/clocksource/digic.c | 1 +
- drivers/clocksource/dw_apb_timer.c | 1 +
- drivers/clocksource/efi.c | 1 +
- drivers/clocksource/kvx_timer.c | 1 +
- drivers/clocksource/mvebu.c | 1 +
- drivers/clocksource/nomadik.c | 1 +
- drivers/clocksource/orion.c | 1 +
- drivers/clocksource/rk_timer.c | 1 +
- drivers/clocksource/timer-atmel-pit.c | 1 +
- drivers/clocksource/timer-imx-gpt.c | 1 +
- drivers/clocksource/timer-ti-32k.c | 1 +
- drivers/clocksource/timer-ti-dm.c | 1 +
- drivers/clocksource/uemd.c | 1 +
- 35 files changed, 35 insertions(+)
-
-diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c
-index ccbefbbc33a2..110d77088169 100644
---- a/arch/arm/mach-at91/at91rm9200_time.c
-+++ b/arch/arm/mach-at91/at91rm9200_time.c
-@@ -35,6 +35,7 @@ static struct clocksource cs = {
- .mask = CLOCKSOURCE_MASK(20),
- .read = at91rm9200_clocksource_read,
- .shift = 10,
-+ .priority = 80,
- };
-
- static int clocksource_init (void)
-diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
-index 52b3ac3e6823..c54e49470b72 100644
---- a/arch/arm/mach-davinci/time.c
-+++ b/arch/arm/mach-davinci/time.c
-@@ -96,6 +96,7 @@ static uint64_t davinci_cs_read(void)
- static struct clocksource davinci_cs = {
- .read = davinci_cs_read,
- .mask = CLOCKSOURCE_MASK(32),
-+ .priority = 80,
- };
-
- static int timer32_config(struct timer_s *t)
-diff --git a/arch/arm/mach-ep93xx/clocksource.c b/arch/arm/mach-ep93xx/clocksource.c
-index 1f3ff7f8f20a..e2a3a397803f 100644
---- a/arch/arm/mach-ep93xx/clocksource.c
-+++ b/arch/arm/mach-ep93xx/clocksource.c
-@@ -37,6 +37,7 @@ static struct clocksource cs = {
- .read = ep93xx_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 80,
- };
-
- static int clocksource_init(void)
-diff --git a/arch/arm/mach-mxs/clocksource-imx23.c b/arch/arm/mach-mxs/clocksource-imx23.c
-index 0a6716f87958..ba5aad9f30dc 100644
---- a/arch/arm/mach-mxs/clocksource-imx23.c
-+++ b/arch/arm/mach-mxs/clocksource-imx23.c
-@@ -34,6 +34,7 @@ static struct clocksource cs = {
- .read = imx23_clocksource_read,
- .mask = CLOCKSOURCE_MASK(16),
- .shift = 10,
-+ .priority = 80,
- };
-
- static int imx23_clocksource_clock_change(struct notifier_block *nb, unsigned long event, void *data)
-diff --git a/arch/arm/mach-mxs/clocksource-imx28.c b/arch/arm/mach-mxs/clocksource-imx28.c
-index ea6d4b514630..65d8155ad244 100644
---- a/arch/arm/mach-mxs/clocksource-imx28.c
-+++ b/arch/arm/mach-mxs/clocksource-imx28.c
-@@ -39,6 +39,7 @@ static struct clocksource imx28_cs = {
- .read = imx28_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 17,
-+ .priority = 80,
- };
-
- static int imx28_clocksource_init(void)
-diff --git a/arch/arm/mach-pxa/clocksource.c b/arch/arm/mach-pxa/clocksource.c
-index ebfe6f1c330f..3bc95827d88d 100644
---- a/arch/arm/mach-pxa/clocksource.c
-+++ b/arch/arm/mach-pxa/clocksource.c
-@@ -28,6 +28,7 @@ static struct clocksource cs = {
- .read = pxa_clocksource_read,
- .mask = 0xffffffff,
- .shift = 20,
-+ .priority = 80,
- };
-
- static int clocksource_init(void)
-diff --git a/arch/arm/mach-samsung/s3c-timer.c b/arch/arm/mach-samsung/s3c-timer.c
-index 6f38df395851..38bcebc7c4cb 100644
---- a/arch/arm/mach-samsung/s3c-timer.c
-+++ b/arch/arm/mach-samsung/s3c-timer.c
-@@ -101,6 +101,7 @@ static struct clocksource cs = {
- .read = s3c_clocksource_read,
- .mask = CLOCKSOURCE_MASK(TIMER_WIDTH),
- .shift = TIMER_SHIFT,
-+ .priority = 80,
- };
-
- static int s3c_clk_src_init(void)
-diff --git a/arch/arm/mach-tegra/tegra20-timer.c b/arch/arm/mach-tegra/tegra20-timer.c
-index 34d34f772331..8ca8cb24fad5 100644
---- a/arch/arm/mach-tegra/tegra20-timer.c
-+++ b/arch/arm/mach-tegra/tegra20-timer.c
-@@ -41,6 +41,7 @@ static uint64_t tegra20_timer_cs_read(void)
- static struct clocksource cs = {
- .read = tegra20_timer_cs_read,
- .mask = CLOCKSOURCE_MASK(32),
-+ .priority = 80,
- };
-
- static int tegra20_timer_probe(struct device_d *dev)
-diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
-index eb94a07dc907..9a2a9cad80cc 100644
---- a/arch/arm/mach-versatile/core.c
-+++ b/arch/arm/mach-versatile/core.c
-@@ -92,6 +92,7 @@ static struct clocksource vpb_cs = {
- .read = vpb_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 80,
- };
-
- /* From Linux v2.6.35
-diff --git a/arch/mips/lib/csrc-r4k.c b/arch/mips/lib/csrc-r4k.c
-index 9facf04bd3e9..35fba3a29ca6 100644
---- a/arch/mips/lib/csrc-r4k.c
-+++ b/arch/mips/lib/csrc-r4k.c
-@@ -23,6 +23,7 @@ static uint64_t c0_hpt_read(void)
- static struct clocksource cs = {
- .read = c0_hpt_read,
- .mask = CLOCKSOURCE_MASK(32),
-+ .priority = 70,
- };
-
- static int clocksource_init(void)
-diff --git a/arch/mips/mach-xburst/csrc-jz4750.c b/arch/mips/mach-xburst/csrc-jz4750.c
-index 302709e59747..43135ac4987e 100644
---- a/arch/mips/mach-xburst/csrc-jz4750.c
-+++ b/arch/mips/mach-xburst/csrc-jz4750.c
-@@ -23,6 +23,7 @@ static uint64_t jz4750_cs_read(void)
- static struct clocksource jz4750_cs = {
- .read = jz4750_cs_read,
- .mask = CLOCKSOURCE_MASK(32),
-+ .priority = 80,
- };
-
- static int clocksource_init(void)
-diff --git a/arch/openrisc/lib/clock.c b/arch/openrisc/lib/clock.c
-index 5ff978e8411a..651b163f13cb 100644
---- a/arch/openrisc/lib/clock.c
-+++ b/arch/openrisc/lib/clock.c
-@@ -28,6 +28,7 @@ static struct clocksource cs = {
- .read = openrisc_clocksource_read,
- .mask = 0xffffffff,
- .shift = 12,
-+ .priority = 80,
- };
-
- static int clocksource_init(void)
-diff --git a/arch/powerpc/mach-mpc5xxx/time.c b/arch/powerpc/mach-mpc5xxx/time.c
-index 8981b14eeb7d..d690d50f0d5a 100644
---- a/arch/powerpc/mach-mpc5xxx/time.c
-+++ b/arch/powerpc/mach-mpc5xxx/time.c
-@@ -29,6 +29,7 @@ static struct clocksource cs = {
- .read = ppc_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 15,
-+ .priority = 80,
- };
-
- static int clocksource_init(void)
-diff --git a/arch/powerpc/mach-mpc85xx/time.c b/arch/powerpc/mach-mpc85xx/time.c
-index 067bce8ea64e..5981995ac2ae 100644
---- a/arch/powerpc/mach-mpc85xx/time.c
-+++ b/arch/powerpc/mach-mpc85xx/time.c
-@@ -28,6 +28,7 @@ static uint64_t ppc_clocksource_read(void)
- static struct clocksource cs = {
- .read = ppc_clocksource_read,
- .mask = CLOCKSOURCE_MASK(64),
-+ .priority = 80,
- };
-
- static int clocksource_init(void)
-diff --git a/arch/sandbox/board/clock.c b/arch/sandbox/board/clock.c
-index b005e71633ff..1787fb578626 100644
---- a/arch/sandbox/board/clock.c
-+++ b/arch/sandbox/board/clock.c
-@@ -28,6 +28,7 @@ static struct clocksource cs = {
- .read = linux_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 80,
- };
-
- static int clocksource_init (void)
-diff --git a/drivers/clocksource/amba-sp804.c b/drivers/clocksource/amba-sp804.c
-index a22e567301b2..fcb2b0254bc3 100644
---- a/drivers/clocksource/amba-sp804.c
-+++ b/drivers/clocksource/amba-sp804.c
-@@ -26,6 +26,7 @@ static struct clocksource sp804_clksrc = {
- .read = sp804_read,
- .shift = 20,
- .mask = CLOCKSOURCE_MASK(32),
-+ .priority = 60,
- };
-
- static int sp804_probe(struct amba_device *dev, const struct amba_id *id)
-diff --git a/drivers/clocksource/arm_architected_timer.c b/drivers/clocksource/arm_architected_timer.c
-index 16e40a1a0b3b..d5948fe9482c 100644
---- a/drivers/clocksource/arm_architected_timer.c
-+++ b/drivers/clocksource/arm_architected_timer.c
-@@ -19,6 +19,7 @@ static struct clocksource cs = {
- .read = arm_arch_clocksource_read,
- .mask = CLOCKSOURCE_MASK(64),
- .shift = 0,
-+ .priority = 70,
- };
-
- static int arm_arch_timer_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
-index f18c6e4152f9..65bfca355855 100644
---- a/drivers/clocksource/arm_global_timer.c
-+++ b/drivers/clocksource/arm_global_timer.c
-@@ -60,6 +60,7 @@ static struct clocksource cs = {
- .read = arm_global_clocksource_read,
- .mask = CLOCKSOURCE_MASK(64),
- .shift = 0,
-+ .priority = 70,
- };
-
- static int arm_global_timer_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/arm_smp_twd.c b/drivers/clocksource/arm_smp_twd.c
-index bc0c4a00b2f9..1ad754bb2b7a 100644
---- a/drivers/clocksource/arm_smp_twd.c
-+++ b/drivers/clocksource/arm_smp_twd.c
-@@ -35,6 +35,7 @@ static struct clocksource smp_twd_clksrc = {
- .read = smp_twd_read,
- .shift = 20,
- .mask = CLOCKSOURCE_MASK(32),
-+ .priority = 60,
- };
-
- #define SMP_TWD_MAX_FREQ (25 *1000 * 1000)
-diff --git a/drivers/clocksource/armv7m_systick.c b/drivers/clocksource/armv7m_systick.c
-index 5f9222c50b8a..16d89c23bde5 100644
---- a/drivers/clocksource/armv7m_systick.c
-+++ b/drivers/clocksource/armv7m_systick.c
-@@ -34,6 +34,7 @@ static struct clocksource cs = {
- .read = armv7m_systick_clocksource_read,
- .mask = CLOCKSOURCE_MASK(24),
- .shift = 0,
-+ .priority = 70,
- };
-
- static int armv7m_systick_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/bcm2835.c b/drivers/clocksource/bcm2835.c
-index 5134b349157c..d84341fc4083 100644
---- a/drivers/clocksource/bcm2835.c
-+++ b/drivers/clocksource/bcm2835.c
-@@ -28,6 +28,7 @@ static uint64_t stc_read_cycles(void)
- static struct clocksource bcm2835_stc = {
- .read = stc_read_cycles,
- .mask = CLOCKSOURCE_MASK(32),
-+ .priority = 80,
- };
-
- static int bcm2835_cs_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/clps711x.c b/drivers/clocksource/clps711x.c
-index cd099604786e..1fe7f6c89114 100644
---- a/drivers/clocksource/clps711x.c
-+++ b/drivers/clocksource/clps711x.c
-@@ -19,6 +19,7 @@ static uint64_t clps711x_cs_read(void)
- static struct clocksource clps711x_cs = {
- .read = clps711x_cs_read,
- .mask = CLOCKSOURCE_MASK(16),
-+ .priority = 60,
- };
-
- static int clps711x_cs_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/digic.c b/drivers/clocksource/digic.c
-index 1a335582b733..234985aece44 100644
---- a/drivers/clocksource/digic.c
-+++ b/drivers/clocksource/digic.c
-@@ -26,6 +26,7 @@ static uint64_t digic_cs_read(void)
- static struct clocksource digic_cs = {
- .read = digic_cs_read,
- .mask = CLOCKSOURCE_MASK(16),
-+ .priority = 60,
- };
-
- static int digic_timer_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
-index aef4f16d1494..251089cf7e16 100644
---- a/drivers/clocksource/dw_apb_timer.c
-+++ b/drivers/clocksource/dw_apb_timer.c
-@@ -94,6 +94,7 @@ static struct clocksource dw_apb_clksrc = {
- .read = dw_apb_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 0,
-+ .priority = 50,
- };
-
- static int dw_apb_timer_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/efi.c b/drivers/clocksource/efi.c
-index 5c8c5fd46b1e..9df5226573bc 100644
---- a/drivers/clocksource/efi.c
-+++ b/drivers/clocksource/efi.c
-@@ -93,6 +93,7 @@ static struct clocksource efi_cs = {
- .mask = CLOCKSOURCE_MASK(64),
- .shift = 0,
- .init = efi_cs_init,
-+ .priority = 80,
- };
-
- static int efi_cs_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/kvx_timer.c b/drivers/clocksource/kvx_timer.c
-index 2a05d8deedce..259755eacdda 100644
---- a/drivers/clocksource/kvx_timer.c
-+++ b/drivers/clocksource/kvx_timer.c
-@@ -21,6 +21,7 @@ static struct clocksource kvx_clksrc = {
- .read = kvx_pm_read,
- .mask = CLOCKSOURCE_MASK(64),
- .shift = 0,
-+ .priority = 70,
- };
-
- static int kvx_timer_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/mvebu.c b/drivers/clocksource/mvebu.c
-index eb5246e4e79b..d3214955dc8f 100644
---- a/drivers/clocksource/mvebu.c
-+++ b/drivers/clocksource/mvebu.c
-@@ -42,6 +42,7 @@ static struct clocksource cs = {
- .read = mvebu_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 70,
- };
-
- static int mvebu_timer_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/nomadik.c b/drivers/clocksource/nomadik.c
-index d71d9da6b8c0..7cf10352eac7 100644
---- a/drivers/clocksource/nomadik.c
-+++ b/drivers/clocksource/nomadik.c
-@@ -71,6 +71,7 @@ static struct clocksource nmdk_clksrc = {
- .read = nmdk_read_timer,
- .shift = 20,
- .mask = CLOCKSOURCE_MASK(32),
-+ .priority = 60,
- };
-
- static void nmdk_timer_reset(void)
-diff --git a/drivers/clocksource/orion.c b/drivers/clocksource/orion.c
-index d40b09e5debc..4a5684980064 100644
---- a/drivers/clocksource/orion.c
-+++ b/drivers/clocksource/orion.c
-@@ -31,6 +31,7 @@ static struct clocksource clksrc = {
- .read = orion_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 70,
- };
-
- static int orion_timer_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/rk_timer.c b/drivers/clocksource/rk_timer.c
-index 5cc8d32b601b..e94103077103 100644
---- a/drivers/clocksource/rk_timer.c
-+++ b/drivers/clocksource/rk_timer.c
-@@ -32,6 +32,7 @@ static struct clocksource rkcs = {
- .read = rockchip_get_ticks,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 80,
- };
-
- static int rockchip_timer_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
-index bbbc81788ce4..a133e384d74c 100644
---- a/drivers/clocksource/timer-atmel-pit.c
-+++ b/drivers/clocksource/timer-atmel-pit.c
-@@ -36,6 +36,7 @@ static struct clocksource cs = {
- .read = at91sam9_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 70,
- };
-
- static void at91_pit_stop(void)
-diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
-index 28f90d967d3f..7ca879f4f008 100644
---- a/drivers/clocksource/timer-imx-gpt.c
-+++ b/drivers/clocksource/timer-imx-gpt.c
-@@ -64,6 +64,7 @@ static struct clocksource cs = {
- .read = imx_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 70,
- };
-
- static int imx_clocksource_clock_change(struct notifier_block *nb, unsigned long event, void *data)
-diff --git a/drivers/clocksource/timer-ti-32k.c b/drivers/clocksource/timer-ti-32k.c
-index 1f3f15561e09..21cb68636954 100644
---- a/drivers/clocksource/timer-ti-32k.c
-+++ b/drivers/clocksource/timer-ti-32k.c
-@@ -47,6 +47,7 @@ static struct clocksource s32k_cs = {
- .read = s32k_clocksource_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 70,
- };
-
- /**
-diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c
-index d43609ad1967..cdd297f10c91 100644
---- a/drivers/clocksource/timer-ti-dm.c
-+++ b/drivers/clocksource/timer-ti-dm.c
-@@ -62,6 +62,7 @@ static struct clocksource dmtimer_cs = {
- .read = dmtimer_read,
- .mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
-+ .priority = 70,
- };
-
- static int omap_dmtimer_probe(struct device_d *dev)
-diff --git a/drivers/clocksource/uemd.c b/drivers/clocksource/uemd.c
-index 342260c5644b..a763eadc0c86 100644
---- a/drivers/clocksource/uemd.c
-+++ b/drivers/clocksource/uemd.c
-@@ -52,6 +52,7 @@ static uint64_t uemd_timer_cs_read(void)
- static struct clocksource uemd_cs = {
- .read = uemd_timer_cs_read,
- .mask = CLOCKSOURCE_MASK(32),
-+ .priority = 60,
- };
-
- static int uemd_timer_probe(struct device_d *dev)
---
-2.30.2
-
diff --git a/configs/platform-v7a/patches/barebox-2022.04.0/0004-ARM-cpu-board-dt-2nd-call-arm_cpu_lowlevel_init.patch b/configs/platform-v7a/patches/barebox-2022.04.0/0004-ARM-cpu-board-dt-2nd-call-arm_cpu_lowlevel_init.patch
deleted file mode 100644
index b0b825e48679..000000000000
--- a/configs/platform-v7a/patches/barebox-2022.04.0/0004-ARM-cpu-board-dt-2nd-call-arm_cpu_lowlevel_init.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 92473f8169118472f0f40179eb60cb2cde765bb7 Mon Sep 17 00:00:00 2001
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Sat, 23 Apr 2022 12:24:34 +0200
-Subject: [PATCH 4/5] ARM: cpu: board-dt-2nd: call arm_cpu_lowlevel_init
-
-The generic DT image could be started by boot firmware that doesn't do
-all the initialization that we do in arm_cpu_lowlevel_init(), so call it
-always for good measure. This enables using the generic image as second
-stage to the Raspberry Pi videocore.
-
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
----
- arch/arm/cpu/board-dt-2nd.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/cpu/board-dt-2nd.c b/arch/arm/cpu/board-dt-2nd.c
-index 0731aecd1a51..6f4a6f26a8c7 100644
---- a/arch/arm/cpu/board-dt-2nd.c
-+++ b/arch/arm/cpu/board-dt-2nd.c
-@@ -21,6 +21,8 @@ void dt_2nd_aarch64(void *fdt)
-
- /* entry point already set up stack */
-
-+ arm_cpu_lowlevel_init();
-+
- relocate_to_current_adr();
- setup_c();
-
-@@ -50,6 +52,8 @@ ENTRY_FUNCTION(start_dt_2nd, r0, r1, r2)
- {
- unsigned long image_start = (unsigned long)_text + global_variable_offset();
-
-+ arm_cpu_lowlevel_init();
-+
- arm_setup_stack(image_start);
-
- relocate_to_current_adr();
---
-2.30.2
-
diff --git a/configs/platform-v7a/patches/barebox-2022.04.0/0005-ARM-rpi-don-t-warn-about-lack-of-videocore-fdt.patch b/configs/platform-v7a/patches/barebox-2022.04.0/0005-ARM-rpi-don-t-warn-about-lack-of-videocore-fdt.patch
deleted file mode 100644
index 0586085e7148..000000000000
--- a/configs/platform-v7a/patches/barebox-2022.04.0/0005-ARM-rpi-don-t-warn-about-lack-of-videocore-fdt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 675a65a3b42ef74ae37638f780912139a7c31cc6 Mon Sep 17 00:00:00 2001
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Sat, 23 Apr 2022 12:54:55 +0200
-Subject: [PATCH 5/5] ARM: rpi: don't warn about lack of videocore fdt
-
-When barebox is booted as generic second stage DT image, it will throw
-an annoying but harmless error that the videocore FDT saved in PBL has
-invalid magic. This is expected because the generic code doesn't store
-the device tree, instead it passes it to barebox proper to probe from.
-Storing the DT in /vd.dtb would thus just be duplication.
-
-Remove the error message in this case.
-
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
----
- arch/arm/boards/raspberry-pi/rpi-common.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
-index 9aa150de5680..82da4d646482 100644
---- a/arch/arm/boards/raspberry-pi/rpi-common.c
-+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
-@@ -328,10 +328,8 @@ static void rpi_vc_fdt(void)
- return;
- }
-
-- if (magic != FDT_MAGIC) {
-- pr_err("videocore fdt saved in pbl has invalid magic\n");
-+ if (magic != FDT_MAGIC)
- return;
-- }
-
- size = be32_to_cpu(oftree->totalsize);
- if (write_file("/vc.dtb", saved_vc_fdt, size)) {
---
-2.30.2
-
diff --git a/configs/platform-v7a/patches/barebox-2022.04.0/series b/configs/platform-v7a/patches/barebox-2022.04.0/series
deleted file mode 100644
index be48ede51a32..000000000000
--- a/configs/platform-v7a/patches/barebox-2022.04.0/series
+++ /dev/null
@@ -1,5 +0,0 @@
-0001-ARM-asm-fix-miscompilation-of-32-bit-ENTRY_FUNCTION_.patch
-0002-clk-add-BCM2835-auxiliary-peripheral-clock-driver.patch
-0003-clocksource-assign-non-zero-priorities-to-all-clocks.patch
-0004-ARM-cpu-board-dt-2nd-call-arm_cpu_lowlevel_init.patch
-0005-ARM-rpi-don-t-warn-about-lack-of-videocore-fdt.patch
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 5b5c8bc383fe..b85bcfea35e4 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -178,8 +178,8 @@ PTXCONF_CONSOLE_SPEED="115200"
# PTXCONF_AT91BOOTSTRAP2 is not set
PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm"
PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2022.04.0"
-PTXCONF_BAREBOX_COMMON_MD5="e4970687cf7943eadf71b1ae6d344ff7"
+PTXCONF_BAREBOX_COMMON_VERSION="2022.06.0"
+PTXCONF_BAREBOX_COMMON_MD5="0df5eee6d253e2f98cbc811f1c5a9bf2"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AM335X=y
--
2.30.2
next prev parent reply other threads:[~2022-07-25 12:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-25 12:04 [DistroKit] [PATCH 1/8] v7a: tf-a: don't compile in unused NAND/NOR boot in FSBL Ahmad Fatoum
2022-07-25 12:04 ` [DistroKit] [PATCH 2/8] v7a: tf-a: update to v2.7 Ahmad Fatoum
2022-07-25 12:04 ` [DistroKit] [PATCH 3/8] genimage: patch in Firmware Image Package (FIP) support Ahmad Fatoum
2022-09-05 14:28 ` Robert Schwebel
2022-07-25 12:04 ` [DistroKit] [PATCH 4/8] v7a: barebox-stm32mp: start collecting device tree blobs Ahmad Fatoum
2022-07-25 12:04 ` [DistroKit] [PATCH 5/8] v7a: tf-a: start collecting FIP image components Ahmad Fatoum
2022-07-25 12:04 ` [DistroKit] [PATCH 6/8] v7a: tf-a: switch to FIP image Ahmad Fatoum
2022-07-25 12:04 ` Ahmad Fatoum [this message]
2022-07-25 12:04 ` [DistroKit] [PATCH 8/8] v7a: barebox: ignore card-detect for booted SD-Card Ahmad Fatoum
2022-09-05 13:51 ` [DistroKit] [PATCH 1/8] v7a: tf-a: don't compile in unused NAND/NOR boot in FSBL Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220725120445.1295669-7-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox