Skip to content

Commit 677184d

Browse files
committed
Merge tag 'samsung-drivers-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/drivers
Samsung SoC drivers for v6.14 1. Add new bindings for sysreg in Exynos8895. 2. Minor improvements in Exynos USI bindings. 3. Fix for Smatch warning in Exynos PMU syscon driver. * tag 'samsung-drivers-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: soc: samsung: exynos-pmu: Fix uninitialized ret in tensor_set_bits_atomic() dt-bindings: soc: samsung: exynos-sysreg: add sysreg compatibles for exynos8895 dt-bindings: samsung: exynos-usi: Restrict possible samsung,mode values Link: https://lore.kernel.org/r/20250112180846.64154-1-krzysztof.kozlowski@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 97d1395 + eca836d commit 677184d

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ properties:
6464

6565
samsung,mode:
6666
$ref: /schemas/types.yaml#/definitions/uint32
67+
enum: [0, 1, 2, 3]
6768
description:
6869
Selects USI function (which serial protocol to use). Refer to
6970
<include/dt-bindings/soc/samsung,exynos-usi.h> for valid USI mode values.

Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ properties:
2121
- samsung,exynos3-sysreg
2222
- samsung,exynos4-sysreg
2323
- samsung,exynos5-sysreg
24+
- samsung,exynos8895-fsys0-sysreg
25+
- samsung,exynos8895-fsys1-sysreg
26+
- samsung,exynos8895-peric0-sysreg
27+
- samsung,exynos8895-peric1-sysreg
2428
- samsung,exynosautov920-peric0-sysreg
2529
- samsung,exynosautov920-peric1-sysreg
2630
- tesla,fsd-cam-sysreg
@@ -79,6 +83,10 @@ allOf:
7983
- samsung,exynos850-cmgp-sysreg
8084
- samsung,exynos850-peri-sysreg
8185
- samsung,exynos850-sysreg
86+
- samsung,exynos8895-fsys0-sysreg
87+
- samsung,exynos8895-fsys1-sysreg
88+
- samsung,exynos8895-peric0-sysreg
89+
- samsung,exynos8895-peric1-sysreg
8290
then:
8391
required:
8492
- clocks

drivers/soc/samsung/exynos-pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static int tensor_set_bits_atomic(void *ctx, unsigned int offset, u32 val,
126126
if (ret)
127127
return ret;
128128
}
129-
return ret;
129+
return 0;
130130
}
131131

132132
static bool tensor_is_atomic(unsigned int reg)

0 commit comments

Comments
 (0)