diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2022-06-07 21:04:29 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2022-06-10 12:46:00 +0800 |
commit | 627c26ab876afa88ee9e77fa2dfb722bad637cfe (patch) | |
tree | aaf4c386192ee336d3d2dfa7ca203e880f5db220 /recipes-kernel/linux | |
parent | df622318d8d9739dca491653049a01b90ae34dc1 (diff) | |
download | meta-intel-627c26ab876afa88ee9e77fa2dfb722bad637cfe.tar.gz |
linux-intel/5.10: update to v5.10.115
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-kernel/linux')
-rw-r--r-- | recipes-kernel/linux/linux-intel/0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch | 89 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-intel_5.10.bb | 5 |
2 files changed, 92 insertions, 2 deletions
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 new file mode 100644 index 00000000..2044b3cf --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch | |||
@@ -0,0 +1,89 @@ | |||
1 | From 1c80d994d3dbdaefb429305461e95a86be5b3862 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dmitry Osipenko <digetx@gmail.com> | ||
3 | Date: Tue, 10 May 2022 16:53:06 +0800 | ||
4 | Subject: [PATCH] regulator: consumer: Add missing stubs to | ||
5 | regulator/consumer.h | ||
6 | |||
7 | commit 51dfb6ca3728bd0a0a3c23776a12d2a15a1d2457 upstream | ||
8 | |||
9 | Add missing stubs to regulator/consumer.h in order to fix COMPILE_TEST | ||
10 | of the kernel. In particular this should fix compile-testing of OPP core | ||
11 | because of a missing stub for regulator_sync_voltage(). | ||
12 | |||
13 | Reported-by: kernel test robot <lkp@intel.com> | ||
14 | Signed-off-by: Dmitry Osipenko <digetx@gmail.com> | ||
15 | Link: https://lore.kernel.org/r/20210120205844.12658-1-digetx@gmail.com | ||
16 | Signed-off-by: Mark Brown <broonie@kernel.org> | ||
17 | |||
18 | Backport from mainline to fix build failure when CONFIG_REGULATOR=n which | ||
19 | is default in linux-yocto. | ||
20 | 5.10.114 in mainline stable tree does not handle this case. | ||
21 | Link: https://lore.kernel.org/all/62796b82.1c69fb81.1bf47.0bcf@mx.google.com/ | ||
22 | |||
23 | Upstream-Status: Backported [https://github.com/torvalds/linux/commit/51dfb6ca3728bd0a0a3c23776a12d2a15a1d2457] | ||
24 | |||
25 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
26 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
27 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
28 | --- | ||
29 | include/linux/regulator/consumer.h | 30 ++++++++++++++++++++++++++++++ | ||
30 | 1 file changed, 30 insertions(+) | ||
31 | |||
32 | diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h | ||
33 | index 2024944fd2f7..20e84a84fb77 100644 | ||
34 | --- a/include/linux/regulator/consumer.h | ||
35 | +++ b/include/linux/regulator/consumer.h | ||
36 | @@ -331,6 +331,12 @@ regulator_get_exclusive(struct device *dev, const char *id) | ||
37 | return ERR_PTR(-ENODEV); | ||
38 | } | ||
39 | |||
40 | +static inline struct regulator *__must_check | ||
41 | +devm_regulator_get_exclusive(struct device *dev, const char *id) | ||
42 | +{ | ||
43 | + return ERR_PTR(-ENODEV); | ||
44 | +} | ||
45 | + | ||
46 | static inline struct regulator *__must_check | ||
47 | regulator_get_optional(struct device *dev, const char *id) | ||
48 | { | ||
49 | @@ -486,6 +492,11 @@ static inline int regulator_get_voltage(struct regulator *regulator) | ||
50 | return -EINVAL; | ||
51 | } | ||
52 | |||
53 | +static inline int regulator_sync_voltage(struct regulator *regulator) | ||
54 | +{ | ||
55 | + return -EINVAL; | ||
56 | +} | ||
57 | + | ||
58 | static inline int regulator_is_supported_voltage(struct regulator *regulator, | ||
59 | int min_uV, int max_uV) | ||
60 | { | ||
61 | @@ -578,6 +589,25 @@ static inline int devm_regulator_unregister_notifier(struct regulator *regulator | ||
62 | return 0; | ||
63 | } | ||
64 | |||
65 | +static inline int regulator_suspend_enable(struct regulator_dev *rdev, | ||
66 | + suspend_state_t state) | ||
67 | +{ | ||
68 | + return -EINVAL; | ||
69 | +} | ||
70 | + | ||
71 | +static inline int regulator_suspend_disable(struct regulator_dev *rdev, | ||
72 | + suspend_state_t state) | ||
73 | +{ | ||
74 | + return -EINVAL; | ||
75 | +} | ||
76 | + | ||
77 | +static inline int regulator_set_suspend_voltage(struct regulator *regulator, | ||
78 | + int min_uV, int max_uV, | ||
79 | + suspend_state_t state) | ||
80 | +{ | ||
81 | + return -EINVAL; | ||
82 | +} | ||
83 | + | ||
84 | static inline void *regulator_get_drvdata(struct regulator *regulator) | ||
85 | { | ||
86 | return NULL; | ||
87 | -- | ||
88 | 2.25.1 | ||
89 | |||
diff --git a/recipes-kernel/linux/linux-intel_5.10.bb b/recipes-kernel/linux/linux-intel_5.10.bb index 26790d9f..3ed2541c 100644 --- a/recipes-kernel/linux/linux-intel_5.10.bb +++ b/recipes-kernel/linux/linux-intel_5.10.bb | |||
@@ -7,12 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | |||
7 | 7 | ||
8 | SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | 8 | SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ |
9 | file://0001-io-mapping-Cleanup-atomic-iomap.patch \ | 9 | file://0001-io-mapping-Cleanup-atomic-iomap.patch \ |
10 | file://0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | DEPENDS += "elfutils-native openssl-native util-linux-native" | 13 | DEPENDS += "elfutils-native openssl-native util-linux-native" |
13 | 14 | ||
14 | LINUX_VERSION ?= "5.10.100" | 15 | LINUX_VERSION ?= "5.10.115" |
15 | SRCREV_machine ?= "8e5c6f8269920b343e40bdf7b3b1a33918009395" | 16 | SRCREV_machine ?= "9d73f92a1109a0f9e916edb861214ce1cea6863a" |
16 | SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3" | 17 | SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3" |
17 | 18 | ||
18 | # For Crystalforest and Romley | 19 | # For Crystalforest and Romley |