Skip to content

Commit e5c7bcb

Browse files
Wolfram Sangbroonie
authored andcommitted
spi: sh-msiof: Enforce fixed DTDL for R-Car H3
Documentation says only DTDL of 200 is allowed for this SoC. Fixes: 4286db8 ("spi: sh-msiof: Add R-Car Gen 2 and 3 fallback bindings") Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Link: https://msgid.link/r/20231212081239.14254-1-wsa+renesas@sang-engineering.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 0d7096c commit e5c7bcb

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

drivers/spi/spi-sh-msiof.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,15 @@
2929

3030
#include <asm/unaligned.h>
3131

32+
#define SH_MSIOF_FLAG_FIXED_DTDL_200 BIT(0)
33+
3234
struct sh_msiof_chipdata {
3335
u32 bits_per_word_mask;
3436
u16 tx_fifo_size;
3537
u16 rx_fifo_size;
3638
u16 ctlr_flags;
3739
u16 min_div_pow;
40+
u32 flags;
3841
};
3942

4043
struct sh_msiof_spi_priv {
@@ -1072,6 +1075,16 @@ static const struct sh_msiof_chipdata rcar_gen3_data = {
10721075
.min_div_pow = 1,
10731076
};
10741077

1078+
static const struct sh_msiof_chipdata rcar_r8a7795_data = {
1079+
.bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16) |
1080+
SPI_BPW_MASK(24) | SPI_BPW_MASK(32),
1081+
.tx_fifo_size = 64,
1082+
.rx_fifo_size = 64,
1083+
.ctlr_flags = SPI_CONTROLLER_MUST_TX,
1084+
.min_div_pow = 1,
1085+
.flags = SH_MSIOF_FLAG_FIXED_DTDL_200,
1086+
};
1087+
10751088
static const struct of_device_id sh_msiof_match[] __maybe_unused = {
10761089
{ .compatible = "renesas,sh-mobile-msiof", .data = &sh_data },
10771090
{ .compatible = "renesas,msiof-r8a7743", .data = &rcar_gen2_data },
@@ -1082,6 +1095,7 @@ static const struct of_device_id sh_msiof_match[] __maybe_unused = {
10821095
{ .compatible = "renesas,msiof-r8a7793", .data = &rcar_gen2_data },
10831096
{ .compatible = "renesas,msiof-r8a7794", .data = &rcar_gen2_data },
10841097
{ .compatible = "renesas,rcar-gen2-msiof", .data = &rcar_gen2_data },
1098+
{ .compatible = "renesas,msiof-r8a7795", .data = &rcar_r8a7795_data },
10851099
{ .compatible = "renesas,msiof-r8a7796", .data = &rcar_gen3_data },
10861100
{ .compatible = "renesas,rcar-gen3-msiof", .data = &rcar_gen3_data },
10871101
{ .compatible = "renesas,rcar-gen4-msiof", .data = &rcar_gen3_data },
@@ -1279,6 +1293,9 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
12791293
return -ENXIO;
12801294
}
12811295

1296+
if (chipdata->flags & SH_MSIOF_FLAG_FIXED_DTDL_200)
1297+
info->dtdl = 200;
1298+
12821299
if (info->mode == MSIOF_SPI_TARGET)
12831300
ctlr = spi_alloc_target(&pdev->dev,
12841301
sizeof(struct sh_msiof_spi_priv));

0 commit comments

Comments
 (0)