From c67703ebaa9dc531da353f9f7e3e4290bd66861a Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Sat, 15 Jun 2019 15:01:04 +0200
Subject: [PATCH] rcar_gen3: drivers: qos: Move QoS drivers out of staging
Now that QoS drivers are cleaned up , move them out of staging.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Change-Id: If61ab2157c30b8f5a6b91d2c56ddbb9098ef99e8
---
.../renesas/rcar/qos/D3/qos_init_d3.c | 0
.../renesas/rcar/qos/D3/qos_init_d3.h | 0
.../renesas/rcar/qos/D3/qos_init_d3_mstat.h | 0
.../renesas/rcar/qos/E3/qos_init_e3_v10.c | 0
.../renesas/rcar/qos/E3/qos_init_e3_v10.h | 0
.../rcar/qos/E3/qos_init_e3_v10_mstat390.h | 0
.../rcar/qos/E3/qos_init_e3_v10_mstat780.h | 0
.../renesas/rcar/qos/H3/qos_init_h3_v10.c | 0
.../renesas/rcar/qos/H3/qos_init_h3_v10.h | 0
.../rcar/qos/H3/qos_init_h3_v10_mstat.h | 0
.../renesas/rcar/qos/H3/qos_init_h3_v11.c | 0
.../renesas/rcar/qos/H3/qos_init_h3_v11.h | 0
.../rcar/qos/H3/qos_init_h3_v11_mstat.h | 0
.../renesas/rcar/qos/H3/qos_init_h3_v20.c | 0
.../renesas/rcar/qos/H3/qos_init_h3_v20.h | 0
.../rcar/qos/H3/qos_init_h3_v20_mstat195.h | 0
.../rcar/qos/H3/qos_init_h3_v20_mstat390.h | 0
.../rcar/qos/H3/qos_init_h3_v20_qoswt195.h | 0
.../rcar/qos/H3/qos_init_h3_v20_qoswt390.h | 0
.../renesas/rcar/qos/H3/qos_init_h3_v30.c | 0
.../renesas/rcar/qos/H3/qos_init_h3_v30.h | 0
.../rcar/qos/H3/qos_init_h3_v30_mstat195.h | 0
.../rcar/qos/H3/qos_init_h3_v30_mstat390.h | 0
.../rcar/qos/H3/qos_init_h3_v30_qoswt195.h | 0
.../rcar/qos/H3/qos_init_h3_v30_qoswt390.h | 0
.../renesas/rcar/qos/H3/qos_init_h3n_v30.c | 0
.../renesas/rcar/qos/H3/qos_init_h3n_v30.h | 0
.../rcar/qos/H3/qos_init_h3n_v30_mstat195.h | 0
.../rcar/qos/H3/qos_init_h3n_v30_mstat390.h | 0
.../rcar/qos/H3/qos_init_h3n_v30_qoswt195.h | 0
.../rcar/qos/H3/qos_init_h3n_v30_qoswt390.h | 0
.../renesas/rcar/qos/M3/qos_init_m3_v10.c | 0
.../renesas/rcar/qos/M3/qos_init_m3_v10.h | 0
.../rcar/qos/M3/qos_init_m3_v10_mstat.h | 0
.../renesas/rcar/qos/M3/qos_init_m3_v11.c | 0
.../renesas/rcar/qos/M3/qos_init_m3_v11.h | 0
.../rcar/qos/M3/qos_init_m3_v11_mstat195.h | 0
.../rcar/qos/M3/qos_init_m3_v11_mstat390.h | 0
.../rcar/qos/M3/qos_init_m3_v11_qoswt195.h | 0
.../rcar/qos/M3/qos_init_m3_v11_qoswt390.h | 0
.../renesas/rcar/qos/M3/qos_init_m3_v30.c | 0
.../renesas/rcar/qos/M3/qos_init_m3_v30.h | 0
.../rcar/qos/M3/qos_init_m3_v30_mstat195.h | 0
.../rcar/qos/M3/qos_init_m3_v30_mstat390.h | 0
.../rcar/qos/M3/qos_init_m3_v30_qoswt195.h | 0
.../rcar/qos/M3/qos_init_m3_v30_qoswt390.h | 0
.../renesas/rcar/qos/M3N/qos_init_m3n_v10.c | 0
.../renesas/rcar/qos/M3N/qos_init_m3n_v10.h | 0
.../rcar/qos/M3N/qos_init_m3n_v10_mstat195.h | 0
.../rcar/qos/M3N/qos_init_m3n_v10_mstat390.h | 0
.../rcar/qos/M3N/qos_init_m3n_v10_qoswt195.h | 0
.../rcar/qos/M3N/qos_init_m3n_v10_qoswt390.h | 0
.../renesas/rcar/qos/V3M/qos_init_v3m.c | 0
.../renesas/rcar/qos/V3M/qos_init_v3m.h | 0
.../renesas/rcar/qos/V3M/qos_init_v3m_mstat.h | 0
drivers/renesas/rcar/qos/qos.mk | 106 ++++++++++++++++++
.../renesas/rcar/qos/qos_common.h | 0
.../{staging => }/renesas/rcar/qos/qos_init.c | 0
.../{staging => }/renesas/rcar/qos/qos_init.h | 0
.../{staging => }/renesas/rcar/qos/qos_reg.h | 0
drivers/staging/renesas/rcar/qos/qos.mk | 106 ------------------
plat/renesas/rcar/platform.mk | 4 +-
62 files changed, 108 insertions(+), 108 deletions(-)
rename drivers/{staging => }/renesas/rcar/qos/D3/qos_init_d3.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/D3/qos_init_d3.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/D3/qos_init_d3_mstat.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/E3/qos_init_e3_v10.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/E3/qos_init_e3_v10.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/E3/qos_init_e3_v10_mstat390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/E3/qos_init_e3_v10_mstat780.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v10.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v10.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v10_mstat.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v11.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v11.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v11_mstat.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v20.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v20.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v20_mstat195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v20_mstat390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v30.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v30.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v30_mstat195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v30_mstat390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3n_v30.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3n_v30.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v10.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v10.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v10_mstat.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v11.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v11.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v11_mstat195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v11_mstat390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v30.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v30.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v30_mstat195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v30_mstat390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3N/qos_init_m3n_v10.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3N/qos_init_m3n_v10.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt195.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt390.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/V3M/qos_init_v3m.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/V3M/qos_init_v3m.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/V3M/qos_init_v3m_mstat.h (100%)
create mode 100644 drivers/renesas/rcar/qos/qos.mk
rename drivers/{staging => }/renesas/rcar/qos/qos_common.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/qos_init.c (100%)
rename drivers/{staging => }/renesas/rcar/qos/qos_init.h (100%)
rename drivers/{staging => }/renesas/rcar/qos/qos_reg.h (100%)
delete mode 100644 drivers/staging/renesas/rcar/qos/qos.mk
diff --git a/drivers/staging/renesas/rcar/qos/D3/qos_init_d3.c b/drivers/renesas/rcar/qos/D3/qos_init_d3.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/D3/qos_init_d3.c
rename to drivers/renesas/rcar/qos/D3/qos_init_d3.c
diff --git a/drivers/staging/renesas/rcar/qos/D3/qos_init_d3.h b/drivers/renesas/rcar/qos/D3/qos_init_d3.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/D3/qos_init_d3.h
rename to drivers/renesas/rcar/qos/D3/qos_init_d3.h
diff --git a/drivers/staging/renesas/rcar/qos/D3/qos_init_d3_mstat.h b/drivers/renesas/rcar/qos/D3/qos_init_d3_mstat.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/D3/qos_init_d3_mstat.h
rename to drivers/renesas/rcar/qos/D3/qos_init_d3_mstat.h
diff --git a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c b/drivers/renesas/rcar/qos/E3/qos_init_e3_v10.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c
rename to drivers/renesas/rcar/qos/E3/qos_init_e3_v10.c
diff --git a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h b/drivers/renesas/rcar/qos/E3/qos_init_e3_v10.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h
rename to drivers/renesas/rcar/qos/E3/qos_init_e3_v10.h
diff --git a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10_mstat390.h b/drivers/renesas/rcar/qos/E3/qos_init_e3_v10_mstat390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10_mstat390.h
rename to drivers/renesas/rcar/qos/E3/qos_init_e3_v10_mstat390.h
diff --git a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10_mstat780.h b/drivers/renesas/rcar/qos/E3/qos_init_e3_v10_mstat780.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10_mstat780.h
rename to drivers/renesas/rcar/qos/E3/qos_init_e3_v10_mstat780.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c b/drivers/renesas/rcar/qos/H3/qos_init_h3_v10.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v10.c
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v10.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v10.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10_mstat.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v10_mstat.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10_mstat.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v10_mstat.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c b/drivers/renesas/rcar/qos/H3/qos_init_h3_v11.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v11.c
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v11.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v11.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11_mstat.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v11_mstat.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11_mstat.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v11_mstat.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c b/drivers/renesas/rcar/qos/H3/qos_init_h3_v20.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v20.c
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v20.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v20.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20_mstat195.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v20_mstat195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20_mstat195.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v20_mstat195.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20_mstat390.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v20_mstat390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20_mstat390.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v20_mstat390.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt195.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt195.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt195.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt390.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt390.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v20_qoswt390.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c b/drivers/renesas/rcar/qos/H3/qos_init_h3_v30.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v30.c
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v30.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v30.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30_mstat195.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v30_mstat195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30_mstat195.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v30_mstat195.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30_mstat390.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v30_mstat390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30_mstat390.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v30_mstat390.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt195.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt195.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt195.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt390.h b/drivers/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt390.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3_v30_qoswt390.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c b/drivers/renesas/rcar/qos/H3/qos_init_h3n_v30.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c
rename to drivers/renesas/rcar/qos/H3/qos_init_h3n_v30.c
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h b/drivers/renesas/rcar/qos/H3/qos_init_h3n_v30.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3n_v30.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat195.h b/drivers/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat195.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat195.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat390.h b/drivers/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat390.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3n_v30_mstat390.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt195.h b/drivers/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt195.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt195.h
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt390.h b/drivers/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt390.h
rename to drivers/renesas/rcar/qos/H3/qos_init_h3n_v30_qoswt390.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c b/drivers/renesas/rcar/qos/M3/qos_init_m3_v10.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v10.c
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v10.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v10.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10_mstat.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v10_mstat.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10_mstat.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v10_mstat.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c b/drivers/renesas/rcar/qos/M3/qos_init_m3_v11.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v11.c
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v11.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v11.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11_mstat195.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v11_mstat195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11_mstat195.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v11_mstat195.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11_mstat390.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v11_mstat390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11_mstat390.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v11_mstat390.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt195.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt195.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt195.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt390.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt390.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v11_qoswt390.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30.c b/drivers/renesas/rcar/qos/M3/qos_init_m3_v30.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30.c
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v30.c
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v30.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v30.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30_mstat195.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v30_mstat195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30_mstat195.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v30_mstat195.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30_mstat390.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v30_mstat390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30_mstat390.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v30_mstat390.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt195.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt195.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt195.h
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt390.h b/drivers/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt390.h
rename to drivers/renesas/rcar/qos/M3/qos_init_m3_v30_qoswt390.h
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c b/drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
rename to drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h b/drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h
rename to drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10.h
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat195.h b/drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat195.h
rename to drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat195.h
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat390.h b/drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat390.h
rename to drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10_mstat390.h
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt195.h b/drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt195.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt195.h
rename to drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt195.h
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt390.h b/drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt390.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt390.h
rename to drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10_qoswt390.h
diff --git a/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.c b/drivers/renesas/rcar/qos/V3M/qos_init_v3m.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.c
rename to drivers/renesas/rcar/qos/V3M/qos_init_v3m.c
diff --git a/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.h b/drivers/renesas/rcar/qos/V3M/qos_init_v3m.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.h
rename to drivers/renesas/rcar/qos/V3M/qos_init_v3m.h
diff --git a/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m_mstat.h b/drivers/renesas/rcar/qos/V3M/qos_init_v3m_mstat.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m_mstat.h
rename to drivers/renesas/rcar/qos/V3M/qos_init_v3m_mstat.h
diff --git a/drivers/renesas/rcar/qos/qos.mk b/drivers/renesas/rcar/qos/qos.mk
new file mode 100644
index 000000000..da10da2d1
--- /dev/null
+++ b/drivers/renesas/rcar/qos/qos.mk
@@ -0,0 +1,106 @@
+#
+# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+ifeq (${RCAR_LSI},${RCAR_AUTO})
+# E3, H3N not available for LSI_AUTO
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v10.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v11.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v20.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v30.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v10.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v11.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v30.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/V3M/qos_init_v3m.c
+else ifdef RCAR_LSI_CUT_COMPAT
+ ifeq (${RCAR_LSI},${RCAR_H3})
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v10.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v11.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v20.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v30.c
+ endif
+ ifeq (${RCAR_LSI},${RCAR_H3N})
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3n_v30.c
+ endif
+ ifeq (${RCAR_LSI},${RCAR_M3})
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v10.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v11.c
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v30.c
+ endif
+ ifeq (${RCAR_LSI},${RCAR_M3N})
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
+ endif
+ ifeq (${RCAR_LSI},${RCAR_V3M})
+ BL2_SOURCES += drivers/renesas/rcar/qos/V3M/qos_init_v3m.c
+ endif
+ ifeq (${RCAR_LSI},${RCAR_E3})
+ BL2_SOURCES += drivers/renesas/rcar/qos/E3/qos_init_e3_v10.c
+ endif
+ ifeq (${RCAR_LSI},${RCAR_D3})
+ BL2_SOURCES += drivers/renesas/rcar/qos/D3/qos_init_d3.c
+ endif
+else
+ ifeq (${RCAR_LSI},${RCAR_H3})
+ ifeq (${LSI_CUT},10)
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v10.c
+ else ifeq (${LSI_CUT},11)
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v11.c
+ else ifeq (${LSI_CUT},20)
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v20.c
+ else ifeq (${LSI_CUT},30)
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v30.c
+ else
+# LSI_CUT 30 or later
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3_v30.c
+ endif
+ endif
+ ifeq (${RCAR_LSI},${RCAR_H3N})
+ ifeq (${LSI_CUT},30)
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3n_v30.c
+ else
+# LSI_CUT 30 or later
+ BL2_SOURCES += drivers/renesas/rcar/qos/H3/qos_init_h3n_v30.c
+ endif
+ endif
+ ifeq (${RCAR_LSI},${RCAR_M3})
+ ifeq (${LSI_CUT},10)
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v10.c
+ else ifeq (${LSI_CUT},11)
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v11.c
+ else ifeq (${LSI_CUT},13)
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v11.c
+ else ifeq (${LSI_CUT},30)
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v30.c
+ else
+# LSI_CUT 30 or later
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3/qos_init_m3_v30.c
+ endif
+ endif
+ ifeq (${RCAR_LSI},${RCAR_M3N})
+ ifeq (${LSI_CUT},10)
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
+ else
+# LSI_CUT 10 or later
+ BL2_SOURCES += drivers/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
+ endif
+ endif
+ ifeq (${RCAR_LSI},${RCAR_V3M})
+ BL2_SOURCES += drivers/renesas/rcar/qos/V3M/qos_init_v3m.c
+ endif
+ ifeq (${RCAR_LSI},${RCAR_E3})
+ ifeq (${LSI_CUT},10)
+ BL2_SOURCES += drivers/renesas/rcar/qos/E3/qos_init_e3_v10.c
+ else
+# LSI_CUT 10 or later
+ BL2_SOURCES += drivers/renesas/rcar/qos/E3/qos_init_e3_v10.c
+ endif
+ endif
+ ifeq (${RCAR_LSI},${RCAR_D3})
+ BL2_SOURCES += drivers/renesas/rcar/qos/E3/qos_init_d3.c
+ endif
+endif
+
+BL2_SOURCES += drivers/renesas/rcar/qos/qos_init.c
diff --git a/drivers/staging/renesas/rcar/qos/qos_common.h b/drivers/renesas/rcar/qos/qos_common.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/qos_common.h
rename to drivers/renesas/rcar/qos/qos_common.h
diff --git a/drivers/staging/renesas/rcar/qos/qos_init.c b/drivers/renesas/rcar/qos/qos_init.c
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/qos_init.c
rename to drivers/renesas/rcar/qos/qos_init.c
diff --git a/drivers/staging/renesas/rcar/qos/qos_init.h b/drivers/renesas/rcar/qos/qos_init.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/qos_init.h
rename to drivers/renesas/rcar/qos/qos_init.h
diff --git a/drivers/staging/renesas/rcar/qos/qos_reg.h b/drivers/renesas/rcar/qos/qos_reg.h
similarity index 100%
rename from drivers/staging/renesas/rcar/qos/qos_reg.h
rename to drivers/renesas/rcar/qos/qos_reg.h
diff --git a/drivers/staging/renesas/rcar/qos/qos.mk b/drivers/staging/renesas/rcar/qos/qos.mk
deleted file mode 100644
index d00e622cd..000000000
--- a/drivers/staging/renesas/rcar/qos/qos.mk
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-ifeq (${RCAR_LSI},${RCAR_AUTO})
-# E3, H3N not available for LSI_AUTO
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.c
-else ifdef RCAR_LSI_CUT_COMPAT
- ifeq (${RCAR_LSI},${RCAR_H3})
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c
- endif
- ifeq (${RCAR_LSI},${RCAR_H3N})
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c
- endif
- ifeq (${RCAR_LSI},${RCAR_M3})
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30.c
- endif
- ifeq (${RCAR_LSI},${RCAR_M3N})
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
- endif
- ifeq (${RCAR_LSI},${RCAR_V3M})
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.c
- endif
- ifeq (${RCAR_LSI},${RCAR_E3})
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c
- endif
- ifeq (${RCAR_LSI},${RCAR_D3})
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/D3/qos_init_d3.c
- endif
-else
- ifeq (${RCAR_LSI},${RCAR_H3})
- ifeq (${LSI_CUT},10)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c
- else ifeq (${LSI_CUT},11)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c
- else ifeq (${LSI_CUT},20)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c
- else ifeq (${LSI_CUT},30)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c
- else
-# LSI_CUT 30 or later
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c
- endif
- endif
- ifeq (${RCAR_LSI},${RCAR_H3N})
- ifeq (${LSI_CUT},30)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c
- else
-# LSI_CUT 30 or later
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c
- endif
- endif
- ifeq (${RCAR_LSI},${RCAR_M3})
- ifeq (${LSI_CUT},10)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c
- else ifeq (${LSI_CUT},11)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c
- else ifeq (${LSI_CUT},13)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c
- else ifeq (${LSI_CUT},30)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30.c
- else
-# LSI_CUT 30 or later
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v30.c
- endif
- endif
- ifeq (${RCAR_LSI},${RCAR_M3N})
- ifeq (${LSI_CUT},10)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
- else
-# LSI_CUT 10 or later
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
- endif
- endif
- ifeq (${RCAR_LSI},${RCAR_V3M})
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.c
- endif
- ifeq (${RCAR_LSI},${RCAR_E3})
- ifeq (${LSI_CUT},10)
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c
- else
-# LSI_CUT 10 or later
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c
- endif
- endif
- ifeq (${RCAR_LSI},${RCAR_D3})
- BL2_SOURCES += drivers/staging/renesas/rcar/qos/E3/qos_init_d3.c
- endif
-endif
-
-BL2_SOURCES += drivers/staging/renesas/rcar/qos/qos_init.c
diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk
index 3b3ca1995..17fdc0d6a 100644
--- a/plat/renesas/rcar/platform.mk
+++ b/plat/renesas/rcar/platform.mk
@@ -349,12 +349,12 @@ ERRATA_A57_859972 := 1
ERRATA_A57_813419 := 1
include drivers/staging/renesas/rcar/ddr/ddr.mk
-include drivers/staging/renesas/rcar/qos/qos.mk
+include drivers/renesas/rcar/qos/qos.mk
include drivers/staging/renesas/rcar/pfc/pfc.mk
include lib/libfdt/libfdt.mk
PLAT_INCLUDES := -Idrivers/staging/renesas/rcar/ddr \
- -Idrivers/staging/renesas/rcar/qos \
+ -Idrivers/renesas/rcar/qos \
-Idrivers/renesas/rcar/iic_dvfs \
-Idrivers/renesas/rcar/board \
-Idrivers/renesas/rcar/cpld/ \
--
GitLab