diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-12 09:32:59 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-12 09:50:15 -0300 |
| commit | 587f7c6cc6efa97914bd3aa296aacebd74f66a0b (patch) | |
| tree | 83c1e5804ae456847e0a3df6c3861a1a3811df07 /drivers/soc | |
| parent | e120342f45674fe68a42f95c4ba563dd83dd4f38 (diff) | |
| parent | d57287729e229188e7d07ef0117fe927664e08cb (diff) | |
Merge tag 'v5.15.87' into 5.15-2.2.x-imx
This is the 5.15.87 stable release
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/soc/ux500/ux500-soc-id.c | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 499718e131d7..6a97e8af9390 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -63,6 +63,7 @@ config QCOM_GSBI config QCOM_LLCC tristate "Qualcomm Technologies, Inc. LLCC driver" depends on ARCH_QCOM || COMPILE_TEST + select REGMAP_MMIO help Qualcomm Technologies, Inc. platform specific Last Level Cache Controller(LLCC) driver for platforms such as, diff --git a/drivers/soc/ux500/ux500-soc-id.c b/drivers/soc/ux500/ux500-soc-id.c index a9472e0e5d61..27d6e25a0115 100644 --- a/drivers/soc/ux500/ux500-soc-id.c +++ b/drivers/soc/ux500/ux500-soc-id.c @@ -167,20 +167,18 @@ ATTRIBUTE_GROUPS(ux500_soc); static const char *db8500_read_soc_id(struct device_node *backupram) { void __iomem *base; - void __iomem *uid; const char *retstr; + u32 uid[5]; base = of_iomap(backupram, 0); if (!base) return NULL; - uid = base + 0x1fc0; + memcpy_fromio(uid, base + 0x1fc0, sizeof(uid)); /* Throw these device-specific numbers into the entropy pool */ - add_device_randomness(uid, 0x14); + add_device_randomness(uid, sizeof(uid)); retstr = kasprintf(GFP_KERNEL, "%08x%08x%08x%08x%08x", - readl((u32 *)uid+0), - readl((u32 *)uid+1), readl((u32 *)uid+2), - readl((u32 *)uid+3), readl((u32 *)uid+4)); + uid[0], uid[1], uid[2], uid[3], uid[4]); iounmap(base); return retstr; } |