| Message ID | 20220615140305.9013-1-vigneshr@ti.com |
|---|---|
| State | Accepted |
| Commit | e4b4501edede200df526dd06af0fdbecf836f2ef |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | firmware: ti_sci_static_data: Make file board agnostic | expand |
On 19:33-20220615, Vignesh Raghavendra wrote: > Static DMA channel data for R5 SPL is mostly board agnostic so use SOC > configs instead of EVM specific config to ease adding new board support. > > Drop J7200 EVM specific settings as its same as J721e > > Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> Gee thanks. Reviewed-by: Nishanth Menon <nm@ti.com> > --- > drivers/firmware/ti_sci_static_data.h | 42 +++------------------------ > 1 file changed, 4 insertions(+), 38 deletions(-) > > diff --git a/drivers/firmware/ti_sci_static_data.h b/drivers/firmware/ti_sci_static_data.h > index 8529ef2900..5ae0556a9a 100644 > --- a/drivers/firmware/ti_sci_static_data.h > +++ b/drivers/firmware/ti_sci_static_data.h > @@ -16,7 +16,7 @@ struct ti_sci_resource_static_data { > > #if IS_ENABLED(CONFIG_K3_DM_FW) > > -#if IS_ENABLED(CONFIG_TARGET_J721E_R5_EVM) > +#if IS_ENABLED(CONFIG_SOC_K3_J721E) > static struct ti_sci_resource_static_data rm_static_data[] = { > /* Free rings */ > { > @@ -48,43 +48,9 @@ static struct ti_sci_resource_static_data rm_static_data[] = { > }, > { }, > }; > -#endif /* CONFIG_TARGET_J721E_R5_EVM */ > +#endif /* CONFIG_SOC_K3_J721E */ > > -#if IS_ENABLED(CONFIG_TARGET_J7200_R5_EVM) > -static struct ti_sci_resource_static_data rm_static_data[] = { > - /* Free rings */ > - { > - .dev_id = 235, > - .subtype = 1, > - .range_start = 124, > - .range_num = 32, > - }, > - /* TX channels */ > - { > - .dev_id = 236, > - .subtype = 13, > - .range_start = 6, > - .range_num = 2, > - }, > - /* RX channels */ > - { > - .dev_id = 236, > - .subtype = 10, > - .range_start = 6, > - .range_num = 2, > - }, > - /* RX Free flows */ > - { > - .dev_id = 236, > - .subtype = 0, > - .range_start = 60, > - .range_num = 8, > - }, > - { }, > -}; > -#endif /* CONFIG_TARGET_J7200_R5_EVM */ > - > -#if IS_ENABLED(CONFIG_TARGET_J721S2_R5_EVM) > +#if IS_ENABLED(CONFIG_SOC_K3_J721S2) > static struct ti_sci_resource_static_data rm_static_data[] = { > /* Free rings */ > { > @@ -116,7 +82,7 @@ static struct ti_sci_resource_static_data rm_static_data[] = { > }, > { }, > }; > -#endif /* CONFIG_TARGET_J721S2_R5_EVM */ > +#endif /* CONFIG_SOC_K3_J721S2 */ > > #if IS_ENABLED(CONFIG_SOC_K3_AM625) > static struct ti_sci_resource_static_data rm_static_data[] = { > -- > 2.36.1 >
On Wed, Jun 15, 2022 at 07:33:05PM +0530, Vignesh Raghavendra wrote: > Static DMA channel data for R5 SPL is mostly board agnostic so use SOC > configs instead of EVM specific config to ease adding new board support. > > Drop J7200 EVM specific settings as its same as J721e > > Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> > Reviewed-by: Nishanth Menon <nm@ti.com> Applied to u-boot/next, thanks!
diff --git a/drivers/firmware/ti_sci_static_data.h b/drivers/firmware/ti_sci_static_data.h index 8529ef2900..5ae0556a9a 100644 --- a/drivers/firmware/ti_sci_static_data.h +++ b/drivers/firmware/ti_sci_static_data.h @@ -16,7 +16,7 @@ struct ti_sci_resource_static_data { #if IS_ENABLED(CONFIG_K3_DM_FW) -#if IS_ENABLED(CONFIG_TARGET_J721E_R5_EVM) +#if IS_ENABLED(CONFIG_SOC_K3_J721E) static struct ti_sci_resource_static_data rm_static_data[] = { /* Free rings */ { @@ -48,43 +48,9 @@ static struct ti_sci_resource_static_data rm_static_data[] = { }, { }, }; -#endif /* CONFIG_TARGET_J721E_R5_EVM */ +#endif /* CONFIG_SOC_K3_J721E */ -#if IS_ENABLED(CONFIG_TARGET_J7200_R5_EVM) -static struct ti_sci_resource_static_data rm_static_data[] = { - /* Free rings */ - { - .dev_id = 235, - .subtype = 1, - .range_start = 124, - .range_num = 32, - }, - /* TX channels */ - { - .dev_id = 236, - .subtype = 13, - .range_start = 6, - .range_num = 2, - }, - /* RX channels */ - { - .dev_id = 236, - .subtype = 10, - .range_start = 6, - .range_num = 2, - }, - /* RX Free flows */ - { - .dev_id = 236, - .subtype = 0, - .range_start = 60, - .range_num = 8, - }, - { }, -}; -#endif /* CONFIG_TARGET_J7200_R5_EVM */ - -#if IS_ENABLED(CONFIG_TARGET_J721S2_R5_EVM) +#if IS_ENABLED(CONFIG_SOC_K3_J721S2) static struct ti_sci_resource_static_data rm_static_data[] = { /* Free rings */ { @@ -116,7 +82,7 @@ static struct ti_sci_resource_static_data rm_static_data[] = { }, { }, }; -#endif /* CONFIG_TARGET_J721S2_R5_EVM */ +#endif /* CONFIG_SOC_K3_J721S2 */ #if IS_ENABLED(CONFIG_SOC_K3_AM625) static struct ti_sci_resource_static_data rm_static_data[] = {
Static DMA channel data for R5 SPL is mostly board agnostic so use SOC configs instead of EVM specific config to ease adding new board support. Drop J7200 EVM specific settings as its same as J721e Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> --- drivers/firmware/ti_sci_static_data.h | 42 +++------------------------ 1 file changed, 4 insertions(+), 38 deletions(-)