From be5d6079c83889b0d482010ab04988b8da4d02b1 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Fri, 14 Jun 2019 16:09:05 +0200
Subject: [PATCH] rcar_gen3: drivers: qos: M3N: Configure DBSC QoS from a table
Convert the DBSC QoS setting function to a simple table of register-value
pairs and pass it to common rcar_qos_dbsc_setting() to write those values
to matching registers.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Change-Id: I46b445a77b39412e7a41ae0e0e087a409d0c22e3
---
.../renesas/rcar/qos/M3N/qos_init_m3n_v10.c | 73 +++++++++----------
1 file changed, 33 insertions(+), 40 deletions(-)
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
index 116143ed0..446340bb4 100644
--- a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
+++ b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
@@ -58,54 +58,47 @@
#endif /* RCAR_REWT_TRAINING != RCAR_REWT_TRAINING_DISABLE */
#endif
-static void dbsc_setting(void)
-{
- /* Register write enable */
- io_write_32(DBSC_DBSYSCNT0, 0x00001234U);
-
+struct rcar_gen3_dbsc_qos_settings m3n_v10_qos[] = {
/* BUFCAM settings */
- io_write_32(DBSC_DBCAM0CNF1, 0x00043218);
- io_write_32(DBSC_DBCAM0CNF2, 0x000000F4);
- io_write_32(DBSC_DBSCHCNT0, 0x000F0037);
- io_write_32(DBSC_DBSCHSZ0, 0x00000001);
- io_write_32(DBSC_DBSCHRW0, 0x22421111);
+ { DBSC_DBCAM0CNF1, 0x00043218 },
+ { DBSC_DBCAM0CNF2, 0x000000F4 },
+ { DBSC_DBSCHCNT0, 0x000F0037 },
+ { DBSC_DBSCHSZ0, 0x00000001 },
+ { DBSC_DBSCHRW0, 0x22421111 },
/* DDR3 */
- io_write_32(DBSC_SCFCTST2, 0x012F1123);
+ { DBSC_SCFCTST2, 0x012F1123 },
/* QoS Settings */
- io_write_32(DBSC_DBSCHQOS00, 0x00000F00);
- io_write_32(DBSC_DBSCHQOS01, 0x00000B00);
- io_write_32(DBSC_DBSCHQOS02, 0x00000000);
- io_write_32(DBSC_DBSCHQOS03, 0x00000000);
- io_write_32(DBSC_DBSCHQOS40, 0x00000300);
- io_write_32(DBSC_DBSCHQOS41, 0x000002F0);
- io_write_32(DBSC_DBSCHQOS42, 0x00000200);
- io_write_32(DBSC_DBSCHQOS43, 0x00000100);
- io_write_32(DBSC_DBSCHQOS90, 0x00000100);
- io_write_32(DBSC_DBSCHQOS91, 0x000000F0);
- io_write_32(DBSC_DBSCHQOS92, 0x000000A0);
- io_write_32(DBSC_DBSCHQOS93, 0x00000040);
- io_write_32(DBSC_DBSCHQOS130, 0x00000100);
- io_write_32(DBSC_DBSCHQOS131, 0x000000F0);
- io_write_32(DBSC_DBSCHQOS132, 0x000000A0);
- io_write_32(DBSC_DBSCHQOS133, 0x00000040);
- io_write_32(DBSC_DBSCHQOS140, 0x000000C0);
- io_write_32(DBSC_DBSCHQOS141, 0x000000B0);
- io_write_32(DBSC_DBSCHQOS142, 0x00000080);
- io_write_32(DBSC_DBSCHQOS143, 0x00000040);
- io_write_32(DBSC_DBSCHQOS150, 0x00000040);
- io_write_32(DBSC_DBSCHQOS151, 0x00000030);
- io_write_32(DBSC_DBSCHQOS152, 0x00000020);
- io_write_32(DBSC_DBSCHQOS153, 0x00000010);
-
- /* Register write protect */
- io_write_32(DBSC_DBSYSCNT0, 0x00000000U);
-}
+ { DBSC_DBSCHQOS00, 0x00000F00 },
+ { DBSC_DBSCHQOS01, 0x00000B00 },
+ { DBSC_DBSCHQOS02, 0x00000000 },
+ { DBSC_DBSCHQOS03, 0x00000000 },
+ { DBSC_DBSCHQOS40, 0x00000300 },
+ { DBSC_DBSCHQOS41, 0x000002F0 },
+ { DBSC_DBSCHQOS42, 0x00000200 },
+ { DBSC_DBSCHQOS43, 0x00000100 },
+ { DBSC_DBSCHQOS90, 0x00000100 },
+ { DBSC_DBSCHQOS91, 0x000000F0 },
+ { DBSC_DBSCHQOS92, 0x000000A0 },
+ { DBSC_DBSCHQOS93, 0x00000040 },
+ { DBSC_DBSCHQOS130, 0x00000100 },
+ { DBSC_DBSCHQOS131, 0x000000F0 },
+ { DBSC_DBSCHQOS132, 0x000000A0 },
+ { DBSC_DBSCHQOS133, 0x00000040 },
+ { DBSC_DBSCHQOS140, 0x000000C0 },
+ { DBSC_DBSCHQOS141, 0x000000B0 },
+ { DBSC_DBSCHQOS142, 0x00000080 },
+ { DBSC_DBSCHQOS143, 0x00000040 },
+ { DBSC_DBSCHQOS150, 0x00000040 },
+ { DBSC_DBSCHQOS151, 0x00000030 },
+ { DBSC_DBSCHQOS152, 0x00000020 },
+ { DBSC_DBSCHQOS153, 0x00000010 },
+};
void qos_init_m3n_v10(void)
{
- dbsc_setting();
+ rcar_qos_dbsc_setting(m3n_v10_qos, ARRAY_SIZE(m3n_v10_qos), true);
/* DRAM Split Address mapping */
#if RCAR_DRAM_SPLIT == RCAR_DRAM_SPLIT_4CH
--
GitLab