diff options
| author | Tom Rini <trini@konsulko.com> | 2025-03-25 11:55:05 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-03-25 11:55:05 -0600 |
| commit | 47f433d577a0e1e937c12bbdf632119f0c8b492e (patch) | |
| tree | ce75a6dcc59a4f3e06cd3ac0850f900ee0f86cb7 | |
| parent | 3d8be1f5ec30180748259a251efe4f63c8b4b329 (diff) | |
| parent | b452ed448fb2ad44a4b0a07908a3673c25beb5d9 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-riscv
CI: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/25312
- Fix warning
- Fix incorrect return value
| -rw-r--r-- | board/openpiton/riscv64/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/clk/sophgo/clk-common.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/board/openpiton/riscv64/Kconfig b/board/openpiton/riscv64/Kconfig index 21da1dc346d..e4bd8903aab 100644 --- a/board/openpiton/riscv64/Kconfig +++ b/board/openpiton/riscv64/Kconfig @@ -35,6 +35,5 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply SPL_SMP imply SPL_MMC imply SMP - imply SPL_RISCV_MMODE endif diff --git a/drivers/clk/sophgo/clk-common.h b/drivers/clk/sophgo/clk-common.h index 95b82e968d0..a9e83d0d689 100644 --- a/drivers/clk/sophgo/clk-common.h +++ b/drivers/clk/sophgo/clk-common.h @@ -45,12 +45,14 @@ static inline u32 cv1800b_clk_getbit(void *base, struct cv1800b_clk_regbit *bit) static inline u32 cv1800b_clk_setbit(void *base, struct cv1800b_clk_regbit *bit) { - return setbits_le32(base + bit->offset, BIT(bit->shift)); + setbits_le32(base + bit->offset, BIT(bit->shift)); + return 0; } static inline u32 cv1800b_clk_clrbit(void *base, struct cv1800b_clk_regbit *bit) { - return clrbits_le32(base + bit->offset, BIT(bit->shift)); + clrbits_le32(base + bit->offset, BIT(bit->shift)); + return 0; } static inline u32 cv1800b_clk_getfield(void *base, |