projects
/
platform
/
kernel
/
opensbi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e0f603b
)
generic/starfive: Add the PMIC compatible string
author
Hoegeun Kwon
<hoegeun.kwon@samsung.com>
Mon, 20 Nov 2023 04:21:48 +0000
(13:21 +0900)
committer
Jaehoon Chung
<jh80.chung@samsung.com>
Wed, 27 Dec 2023 23:59:14 +0000
(08:59 +0900)
Add the PMIC compatible string "x-powers,axp15060", it is used in
mainline kernel.
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
[cherry picked from commit
8e07322e121d10050bb4382e9c8642b4b3d86e13
]
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Change-Id: I4e6741807bfb5182dbfee515fbdb55e21c76dd31
platform/generic/starfive/jh7110.c
patch
|
blob
|
history
diff --git
a/platform/generic/starfive/jh7110.c
b/platform/generic/starfive/jh7110.c
index dcd6306be5fc996b0f0a6cdf69df2c5bfce1aff5..6f87303d18980b9abc82d2b85913ad30b16be725 100644
(file)
--- a/
platform/generic/starfive/jh7110.c
+++ b/
platform/generic/starfive/jh7110.c
@@
-134,7
+134,8
@@
static void pmic_ops(struct pmic *pmic, int type)
if (ret)
return;
- if (!sbi_strcmp("stf,axp15060-regulator", pmic->compatible)) {
+ if (!sbi_strcmp("stf,axp15060-regulator", pmic->compatible) ||
+ !sbi_strcmp("x-powers,axp15060", pmic->compatible)) {
ret = i2c_adapter_reg_read(pmic->adapter, pmic->dev_addr,
AXP15060_POWER_REG, &val);
@@
-230,6
+231,7
@@
static int pm_reset_init(void *fdt, int nodeoff,
static const struct fdt_match pm_reset_match[] = {
{ .compatible = "stf,axp15060-regulator", .data = (void *)true },
+ { .compatible = "x-powers,axp15060", .data = (void *)true },
{ },
};