Drops already merged patch: 0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch
Signed-off-by: Yogesh Tyagi <[email protected]> --- ...er-Add-missing-stubs-to-regulator-co.patch | 89 ------------------- recipes-kernel/linux/linux-intel_5.10.bb | 7 +- 2 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 recipes-kernel/linux/linux-intel/0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch diff --git a/recipes-kernel/linux/linux-intel/0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch b/recipes-kernel/linux/linux-intel/0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch deleted file mode 100644 index 2044b3cf..00000000 --- a/recipes-kernel/linux/linux-intel/0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 1c80d994d3dbdaefb429305461e95a86be5b3862 Mon Sep 17 00:00:00 2001 -From: Dmitry Osipenko <[email protected]> -Date: Tue, 10 May 2022 16:53:06 +0800 -Subject: [PATCH] regulator: consumer: Add missing stubs to - regulator/consumer.h - -commit 51dfb6ca3728bd0a0a3c23776a12d2a15a1d2457 upstream - -Add missing stubs to regulator/consumer.h in order to fix COMPILE_TEST -of the kernel. In particular this should fix compile-testing of OPP core -because of a missing stub for regulator_sync_voltage(). - -Reported-by: kernel test robot <[email protected]> -Signed-off-by: Dmitry Osipenko <[email protected]> -Link: https://lore.kernel.org/r/[email protected] -Signed-off-by: Mark Brown <[email protected]> - -Backport from mainline to fix build failure when CONFIG_REGULATOR=n which -is default in linux-yocto. -5.10.114 in mainline stable tree does not handle this case. -Link: https://lore.kernel.org/all/[email protected]/ - -Upstream-Status: Backported [https://github.com/torvalds/linux/commit/51dfb6ca3728bd0a0a3c23776a12d2a15a1d2457] - -Signed-off-by: He Zhe <[email protected]> -Signed-off-by: Bruce Ashfield <[email protected]> -Signed-off-by: Naveen Saini <[email protected]> ---- - include/linux/regulator/consumer.h | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h -index 2024944fd2f7..20e84a84fb77 100644 ---- a/include/linux/regulator/consumer.h -+++ b/include/linux/regulator/consumer.h -@@ -331,6 +331,12 @@ regulator_get_exclusive(struct device *dev, const char *id) - return ERR_PTR(-ENODEV); - } - -+static inline struct regulator *__must_check -+devm_regulator_get_exclusive(struct device *dev, const char *id) -+{ -+ return ERR_PTR(-ENODEV); -+} -+ - static inline struct regulator *__must_check - regulator_get_optional(struct device *dev, const char *id) - { -@@ -486,6 +492,11 @@ static inline int regulator_get_voltage(struct regulator *regulator) - return -EINVAL; - } - -+static inline int regulator_sync_voltage(struct regulator *regulator) -+{ -+ return -EINVAL; -+} -+ - static inline int regulator_is_supported_voltage(struct regulator *regulator, - int min_uV, int max_uV) - { -@@ -578,6 +589,25 @@ static inline int devm_regulator_unregister_notifier(struct regulator *regulator - return 0; - } - -+static inline int regulator_suspend_enable(struct regulator_dev *rdev, -+ suspend_state_t state) -+{ -+ return -EINVAL; -+} -+ -+static inline int regulator_suspend_disable(struct regulator_dev *rdev, -+ suspend_state_t state) -+{ -+ return -EINVAL; -+} -+ -+static inline int regulator_set_suspend_voltage(struct regulator *regulator, -+ int min_uV, int max_uV, -+ suspend_state_t state) -+{ -+ return -EINVAL; -+} -+ - static inline void *regulator_get_drvdata(struct regulator *regulator) - { - return NULL; --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-intel_5.10.bb b/recipes-kernel/linux/linux-intel_5.10.bb index 3ed2541c..f5f637a3 100644 --- a/recipes-kernel/linux/linux-intel_5.10.bb +++ b/recipes-kernel/linux/linux-intel_5.10.bb @@ -7,14 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ file://0001-io-mapping-Cleanup-atomic-iomap.patch \ - file://0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch \ " DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "5.10.115" -SRCREV_machine ?= "9d73f92a1109a0f9e916edb861214ce1cea6863a" -SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3" +LINUX_VERSION ?= "5.10.145" +SRCREV_machine ?= "7ef4401a0744e0b7da538da95970366fbb74527c" +SRCREV_meta ?= "e8e3b361b40a4bbf452caa0dfb255dad7ca9b0ce" # For Crystalforest and Romley KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio" -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7751): https://lists.yoctoproject.org/g/meta-intel/message/7751 Mute This Topic: https://lists.yoctoproject.org/mt/95038792/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
