diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/ti/clk-k3.c | 41 | ||||
| -rw-r--r-- | drivers/firmware/ti_sci_static_data.h | 2 | ||||
| -rw-r--r-- | drivers/power/domain/ti-power-domain.c | 36 | ||||
| -rw-r--r-- | drivers/ram/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/soc/soc_ti_k3.c | 29 |
5 files changed, 63 insertions, 47 deletions
diff --git a/drivers/clk/ti/clk-k3.c b/drivers/clk/ti/clk-k3.c index 41e5022ea0c..bf65f573cb8 100644 --- a/drivers/clk/ti/clk-k3.c +++ b/drivers/clk/ti/clk-k3.c @@ -59,6 +59,24 @@ static void clk_add_map(struct ti_clk_data *data, struct clk *clk, } static const struct soc_attr ti_k3_soc_clk_data[] = { +#if IS_ENABLED(CONFIG_SOC_K3_AM625) + { + .family = "AM62X", + .data = &am62x_clk_platdata, + }, +#endif +#if IS_ENABLED(CONFIG_SOC_K3_AM62A7) + { + .family = "AM62AX", + .data = &am62ax_clk_platdata, + }, +#endif +#if IS_ENABLED(CONFIG_SOC_K3_AM62P5) + { + .family = "AM62PX", + .data = &am62px_clk_platdata, + }, +#endif #if IS_ENABLED(CONFIG_SOC_K3_J721E) { .family = "J721E", @@ -68,36 +86,25 @@ static const struct soc_attr ti_k3_soc_clk_data[] = { .family = "J7200", .data = &j7200_clk_platdata, }, -#elif CONFIG_SOC_K3_J721S2 +#endif +#if IS_ENABLED(CONFIG_SOC_K3_J721S2) { .family = "J721S2", .data = &j721s2_clk_platdata, }, #endif -#ifdef CONFIG_SOC_K3_AM625 - { - .family = "AM62X", - .data = &am62x_clk_platdata, - }, -#endif -#ifdef CONFIG_SOC_K3_AM62A7 +#if IS_ENABLED(CONFIG_SOC_K3_J722S) { - .family = "AM62AX", - .data = &am62ax_clk_platdata, + .family = "J722S", + .data = &j722s_clk_platdata, }, #endif -#ifdef CONFIG_SOC_K3_J784S4 +#if IS_ENABLED(CONFIG_SOC_K3_J784S4) { .family = "J784S4", .data = &j784s4_clk_platdata, }, #endif -#ifdef CONFIG_SOC_K3_AM62P5 - { - .family = "AM62PX", - .data = &am62px_clk_platdata, - }, -#endif { /* sentinel */ } }; diff --git a/drivers/firmware/ti_sci_static_data.h b/drivers/firmware/ti_sci_static_data.h index 9662bd95f28..3370f80231d 100644 --- a/drivers/firmware/ti_sci_static_data.h +++ b/drivers/firmware/ti_sci_static_data.h @@ -85,7 +85,7 @@ static struct ti_sci_resource_static_data rm_static_data[] = { #endif /* CONFIG_SOC_K3_J721S2 */ #if IS_ENABLED(CONFIG_SOC_K3_AM625) || IS_ENABLED(CONFIG_SOC_K3_AM62A7) || \ - IS_ENABLED(CONFIG_SOC_K3_AM62P5) + IS_ENABLED(CONFIG_SOC_K3_AM62P5) || IS_ENABLED(CONFIG_SOC_K3_J722S) static struct ti_sci_resource_static_data rm_static_data[] = { /* BC channels */ { diff --git a/drivers/power/domain/ti-power-domain.c b/drivers/power/domain/ti-power-domain.c index b059dd37376..5e7a4c5648d 100644 --- a/drivers/power/domain/ti-power-domain.c +++ b/drivers/power/domain/ti-power-domain.c @@ -71,6 +71,24 @@ static void lpsc_write(u32 val, struct ti_lpsc *lpsc, u32 reg) } static const struct soc_attr ti_k3_soc_pd_data[] = { +#if IS_ENABLED(CONFIG_SOC_K3_AM625) + { + .family = "AM62X", + .data = &am62x_pd_platdata, + }, +#endif +#if IS_ENABLED(CONFIG_SOC_K3_AM62A7) + { + .family = "AM62AX", + .data = &am62ax_pd_platdata, + }, +#endif +#if IS_ENABLED(CONFIG_SOC_K3_AM62P5) + { + .family = "AM62PX", + .data = &am62px_pd_platdata, + }, +#endif #if IS_ENABLED(CONFIG_SOC_K3_J721E) { .family = "J721E", @@ -87,16 +105,10 @@ static const struct soc_attr ti_k3_soc_pd_data[] = { .data = &j721s2_pd_platdata, }, #endif -#if IS_ENABLED(CONFIG_SOC_K3_AM625) - { - .family = "AM62X", - .data = &am62x_pd_platdata, - }, -#endif -#if IS_ENABLED(CONFIG_SOC_K3_AM62A7) +#if IS_ENABLED(CONFIG_SOC_K3_J722S) { - .family = "AM62AX", - .data = &am62ax_pd_platdata, + .family = "J722S", + .data = &j722s_pd_platdata, }, #endif #if IS_ENABLED(CONFIG_SOC_K3_J784S4) @@ -105,12 +117,6 @@ static const struct soc_attr ti_k3_soc_pd_data[] = { .data = &j784s4_pd_platdata, }, #endif -#if IS_ENABLED(CONFIG_SOC_K3_AM62P5) - { - .family = "AM62PX", - .data = &am62px_pd_platdata, - }, -#endif { /* sentinel */ } }; diff --git a/drivers/ram/Kconfig b/drivers/ram/Kconfig index 9838a2798f9..a64d2dff68d 100644 --- a/drivers/ram/Kconfig +++ b/drivers/ram/Kconfig @@ -65,7 +65,7 @@ choice default K3_J721E_DDRSS if SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_J784S4 default K3_AM64_DDRSS if SOC_K3_AM642 default K3_AM64_DDRSS if SOC_K3_AM625 - default K3_AM62A_DDRSS if SOC_K3_AM62A7 || SOC_K3_AM62P5 + default K3_AM62A_DDRSS if SOC_K3_AM62A7 || SOC_K3_AM62P5 || SOC_K3_J722S config K3_J721E_DDRSS bool "Enable J721E DDRSS support" diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c index b585e47d46f..f948914d218 100644 --- a/drivers/soc/soc_ti_k3.c +++ b/drivers/soc/soc_ti_k3.c @@ -23,33 +23,36 @@ static const char *get_family_string(u32 idreg) soc = (idreg & JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT; switch (soc) { + case JTAG_ID_PARTNO_AM62X: + family = "AM62X"; + break; + case JTAG_ID_PARTNO_AM62AX: + family = "AM62AX"; + break; + case JTAG_ID_PARTNO_AM62PX: + family = "AM62PX"; + break; + case JTAG_ID_PARTNO_AM64X: + family = "AM64X"; + break; case JTAG_ID_PARTNO_AM65X: family = "AM65X"; break; - case JTAG_ID_PARTNO_J721E: - family = "J721E"; - break; case JTAG_ID_PARTNO_J7200: family = "J7200"; break; - case JTAG_ID_PARTNO_AM64X: - family = "AM64X"; + case JTAG_ID_PARTNO_J721E: + family = "J721E"; break; case JTAG_ID_PARTNO_J721S2: family = "J721S2"; break; - case JTAG_ID_PARTNO_AM62X: - family = "AM62X"; - break; - case JTAG_ID_PARTNO_AM62AX: - family = "AM62AX"; + case JTAG_ID_PARTNO_J722S: + family = "J722S"; break; case JTAG_ID_PARTNO_J784S4: family = "J784S4"; break; - case JTAG_ID_PARTNO_AM62PX: - family = "AM62PX"; - break; default: family = "Unknown Silicon"; }; |