Skip to content

Commit 6f1fe98

Browse files
smaeulavpatel
authored andcommitted
lib: utils/timer: Remove Allwinner D1 CLINT compatibles
The allwinner,sun20i-d1-clint compatible string is not documented in any official binding, so it should not be used by drivers. The MSWI in the D1 CLINT is compatible with the ACLINT specification, so it can take advantage of generic driver support. However, that is only possible if the MSWI and MTIMER are split into separate DT nodes. This means the final binding for this device is likely to be incompatible with what is implemented here. Remove this compatible string from the driver to prevent it from appearing in a stable version and causing future issues. Signed-off-by: Samuel Holland <[email protected]> Reviewed-by: Anup Patel <[email protected]>
1 parent d76a196 commit 6f1fe98

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

lib/utils/ipi/fdt_ipi_mswi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ static int ipi_mswi_cold_init(void *fdt, int nodeoff,
5454
static const unsigned long clint_offset = CLINT_MSWI_OFFSET;
5555

5656
static const struct fdt_match ipi_mswi_match[] = {
57-
{ .compatible = "allwinner,sun20i-d1-clint", .data = &clint_offset },
5857
{ .compatible = "riscv,clint0", .data = &clint_offset },
5958
{ .compatible = "sifive,clint0", .data = &clint_offset },
6059
{ .compatible = "riscv,aclint-mswi" },

lib/utils/timer/fdt_timer_mtimer.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,12 @@ static int timer_mtimer_cold_init(void *fdt, int nodeoff,
109109
return 0;
110110
}
111111

112-
static const struct timer_mtimer_quirks d1_clint_quirks = {
113-
.mtime_offset = CLINT_MTIMER_OFFSET,
114-
.has_64bit_mmio = false,
115-
};
116-
117112
static const struct timer_mtimer_quirks sifive_clint_quirks = {
118113
.mtime_offset = CLINT_MTIMER_OFFSET,
119114
.has_64bit_mmio = true,
120115
};
121116

122117
static const struct fdt_match timer_mtimer_match[] = {
123-
{ .compatible = "allwinner,sun20i-d1-clint", .data = &d1_clint_quirks },
124118
{ .compatible = "riscv,clint0", .data = &sifive_clint_quirks },
125119
{ .compatible = "sifive,clint0", .data = &sifive_clint_quirks },
126120
{ .compatible = "riscv,aclint-mtimer" },

0 commit comments

Comments
 (0)