diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-05 10:41:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 09:06:38 +0200 |
| commit | 471a7582ef24c65e5d1e7d9d2508578d7c4045fd (patch) | |
| tree | 566c47a3c0a55a0fba6ed0c534ee96c45666c663 /drivers | |
| parent | 60b38fad076c44aa4a08b6772bc8adc52c30566d (diff) | |
| download | barebox-471a7582ef24c65e5d1e7d9d2508578d7c4045fd.tar.gz barebox-471a7582ef24c65e5d1e7d9d2508578d7c4045fd.tar.xz | |
remoteproc: imx: Change SoC order in code
Sort the SoC specific functions alphabetically to have a more natural
order before adding more SoCs to the driver.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/remoteproc/imx_rproc.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 47dffb1c03..bb9c227ba9 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -94,6 +94,27 @@ struct imx_rproc { struct clk *clk; }; +static const struct imx_rproc_att imx_rproc_att_imx6sx[] = { + /* dev addr , sys addr , size , flags */ + /* TCML (M4 Boot Code) - alias */ + { 0x00000000, 0x007F8000, 0x00008000, 0 }, + /* OCRAM_S (Code) */ + { 0x00180000, 0x008F8000, 0x00004000, 0 }, + /* OCRAM_S (Code) - alias */ + { 0x00180000, 0x008FC000, 0x00004000, 0 }, + /* TCML (Code) */ + { 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN }, + /* DDR (Code) - alias, first part of DDR (Data) */ + { 0x10000000, 0x80000000, 0x0FFF8000, 0 }, + + /* TCMU (Data) */ + { 0x20000000, 0x00800000, 0x00008000, ATT_OWN }, + /* OCRAM_S (Data) - alias? */ + { 0x208F8000, 0x008F8000, 0x00004000, 0 }, + /* DDR (Data) */ + { 0x80000000, 0x80000000, 0x60000000, 0 }, +}; + static const struct imx_rproc_att imx_rproc_att_imx7d[] = { /* dev addr , sys addr , size , flags */ /* OCRAM_S (M4 Boot code) - alias */ @@ -123,25 +144,13 @@ static const struct imx_rproc_att imx_rproc_att_imx7d[] = { { 0x80000000, 0x80000000, 0x60000000, 0 }, }; -static const struct imx_rproc_att imx_rproc_att_imx6sx[] = { - /* dev addr , sys addr , size , flags */ - /* TCML (M4 Boot Code) - alias */ - { 0x00000000, 0x007F8000, 0x00008000, 0 }, - /* OCRAM_S (Code) */ - { 0x00180000, 0x008F8000, 0x00004000, 0 }, - /* OCRAM_S (Code) - alias */ - { 0x00180000, 0x008FC000, 0x00004000, 0 }, - /* TCML (Code) */ - { 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN }, - /* DDR (Code) - alias, first part of DDR (Data) */ - { 0x10000000, 0x80000000, 0x0FFF8000, 0 }, - - /* TCMU (Data) */ - { 0x20000000, 0x00800000, 0x00008000, ATT_OWN }, - /* OCRAM_S (Data) - alias? */ - { 0x208F8000, 0x008F8000, 0x00004000, 0 }, - /* DDR (Data) */ - { 0x80000000, 0x80000000, 0x60000000, 0 }, +static const struct imx_rproc_dcfg imx_rproc_cfg_imx6sx = { + .src_reg = IMX6SX_SRC_SCR, + .src_mask = IMX6SX_M4_RST_MASK, + .src_start = IMX6SX_M4_START, + .src_stop = IMX6SX_M4_STOP, + .att = imx_rproc_att_imx6sx, + .att_size = ARRAY_SIZE(imx_rproc_att_imx6sx), }; static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = { @@ -153,15 +162,6 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = { .att_size = ARRAY_SIZE(imx_rproc_att_imx7d), }; -static const struct imx_rproc_dcfg imx_rproc_cfg_imx6sx = { - .src_reg = IMX6SX_SRC_SCR, - .src_mask = IMX6SX_M4_RST_MASK, - .src_start = IMX6SX_M4_START, - .src_stop = IMX6SX_M4_STOP, - .att = imx_rproc_att_imx6sx, - .att_size = ARRAY_SIZE(imx_rproc_att_imx6sx), -}; - static int imx_rproc_start(struct rproc *rproc) { struct imx_rproc *priv = rproc->priv; @@ -389,8 +389,8 @@ err_put_rproc: } static const struct of_device_id imx_rproc_of_match[] = { - { .compatible = "fsl,imx7d-cm4", .data = &imx_rproc_cfg_imx7d }, { .compatible = "fsl,imx6sx-cm4", .data = &imx_rproc_cfg_imx6sx }, + { .compatible = "fsl,imx7d-cm4", .data = &imx_rproc_cfg_imx7d }, {}, }; |