| Message ID | 20240529132448.459330-2-j-choudhary@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Add basic U-Boot Support for J722S-EVM | expand |
On 5/29/24 8:24 AM, Jayesh Choudhary wrote: > Sort CONFIG_SOC* and K3_SOC_ID alphabetically. Why? I kinda like the chronological order we have today, helps me remember what are the newer/older parts. Which then helps in seeing where the line is between when features are added, all parts after have it, etc.. No issue with alphabetical either, just looking for a "why" in the commit message, otherwise, Reviewed-by: Andrew Davis <afd@ti.com> > > Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com> > --- > arch/arm/mach-k3/include/mach/hardware.h | 37 ++++++++++++------------ > 1 file changed, 19 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h > index c724450638..c3aaded8dc 100644 > --- a/arch/arm/mach-k3/include/mach/hardware.h > +++ b/arch/arm/mach-k3/include/mach/hardware.h > @@ -8,37 +8,38 @@ > > #include <asm/io.h> > > -#ifdef CONFIG_SOC_K3_AM654 > -#include "am6_hardware.h" > +#ifdef CONFIG_SOC_K3_AM625 > +#include "am62_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_J721E > -#include "j721e_hardware.h" > +#ifdef CONFIG_SOC_K3_AM62A7 > +#include "am62a_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_J721S2 > -#include "j721s2_hardware.h" > +#ifdef CONFIG_SOC_K3_AM62P5 > +#include "am62p_hardware.h" > #endif > > #ifdef CONFIG_SOC_K3_AM642 > #include "am64_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_AM625 > -#include "am62_hardware.h" > +#ifdef CONFIG_SOC_K3_AM654 > +#include "am6_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_AM62A7 > -#include "am62a_hardware.h" > +#ifdef CONFIG_SOC_K3_J721E > +#include "j721e_hardware.h" > +#endif > + > +#ifdef CONFIG_SOC_K3_J721S2 > +#include "j721s2_hardware.h" > #endif > > #ifdef CONFIG_SOC_K3_J784S4 > #include "j784s4_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_AM62P5 > -#include "am62p_hardware.h" > -#endif > > /* Assuming these addresses and definitions stay common across K3 devices */ > #define CTRLMMR_WKUP_JTAG_ID (WKUP_CTRL_MMR0_BASE + 0x14) > @@ -63,14 +64,14 @@ static inline bool soc_is_##id(void) \ > JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT; \ > return soc == JTAG_ID_PARTNO_##ID; \ > } > -K3_SOC_ID(am65x, AM65X) > -K3_SOC_ID(j721e, J721E) > -K3_SOC_ID(j7200, J7200) > -K3_SOC_ID(am64x, AM64X) > -K3_SOC_ID(j721s2, J721S2) > K3_SOC_ID(am62x, AM62X) > K3_SOC_ID(am62ax, AM62AX) > K3_SOC_ID(am62px, AM62PX) > +K3_SOC_ID(am64x, AM64X) > +K3_SOC_ID(am65x, AM65X) > +K3_SOC_ID(j7200, J7200) > +K3_SOC_ID(j721e, J721E) > +K3_SOC_ID(j721s2, J721S2) > > #define K3_SEC_MGR_SYS_STATUS 0x44234100 > #define SYS_STATUS_DEV_TYPE_SHIFT 0
On 29/05/24 18:54, Jayesh Choudhary wrote: > Sort CONFIG_SOC* and K3_SOC_ID alphabetically. > > Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com> > --- > arch/arm/mach-k3/include/mach/hardware.h | 37 ++++++++++++------------ > 1 file changed, 19 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h > index c724450638..c3aaded8dc 100644 > --- a/arch/arm/mach-k3/include/mach/hardware.h > +++ b/arch/arm/mach-k3/include/mach/hardware.h > @@ -8,37 +8,38 @@ > > #include <asm/io.h> > > -#ifdef CONFIG_SOC_K3_AM654 > -#include "am6_hardware.h" > +#ifdef CONFIG_SOC_K3_AM625 > +#include "am62_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_J721E > -#include "j721e_hardware.h" > +#ifdef CONFIG_SOC_K3_AM62A7 > +#include "am62a_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_J721S2 > -#include "j721s2_hardware.h" > +#ifdef CONFIG_SOC_K3_AM62P5 > +#include "am62p_hardware.h" > #endif > > #ifdef CONFIG_SOC_K3_AM642 > #include "am64_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_AM625 > -#include "am62_hardware.h" > +#ifdef CONFIG_SOC_K3_AM654 > +#include "am6_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_AM62A7 > -#include "am62a_hardware.h" > +#ifdef CONFIG_SOC_K3_J721E > +#include "j721e_hardware.h" > +#endif > + > +#ifdef CONFIG_SOC_K3_J721S2 > +#include "j721s2_hardware.h" > #endif > > #ifdef CONFIG_SOC_K3_J784S4 > #include "j784s4_hardware.h" > #endif > > -#ifdef CONFIG_SOC_K3_AM62P5 > -#include "am62p_hardware.h" > -#endif > > /* Assuming these addresses and definitions stay common across K3 devices */ > #define CTRLMMR_WKUP_JTAG_ID (WKUP_CTRL_MMR0_BASE + 0x14) > @@ -63,14 +64,14 @@ static inline bool soc_is_##id(void) \ > JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT; \ > return soc == JTAG_ID_PARTNO_##ID; \ > } > -K3_SOC_ID(am65x, AM65X) > -K3_SOC_ID(j721e, J721E) > -K3_SOC_ID(j7200, J7200) > -K3_SOC_ID(am64x, AM64X) > -K3_SOC_ID(j721s2, J721S2) > K3_SOC_ID(am62x, AM62X) > K3_SOC_ID(am62ax, AM62AX) > K3_SOC_ID(am62px, AM62PX) > +K3_SOC_ID(am64x, AM64X) > +K3_SOC_ID(am65x, AM65X) > +K3_SOC_ID(j7200, J7200) > +K3_SOC_ID(j721e, J721E) > +K3_SOC_ID(j721s2, J721S2) > > #define K3_SEC_MGR_SYS_STATUS 0x44234100 > #define SYS_STATUS_DEV_TYPE_SHIFT 0 Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
Hello Andrew, On 29/05/24 20:35, Andrew Davis wrote: > On 5/29/24 8:24 AM, Jayesh Choudhary wrote: >> Sort CONFIG_SOC* and K3_SOC_ID alphabetically. > > Why? I kinda like the chronological order we have today, helps me remember > what are the newer/older parts. Which then helps in seeing where the line > is between when features are added, all parts after have it, etc.. > > No issue with alphabetical either, just looking for a "why" in the > commit message, otherwise, TI SoC J784S4-EVM UBOOT series had few such cleanups. So while posting this series, for files which I was touching, if such generic cleanups seemed appropriate, I did it. > > Reviewed-by: Andrew Davis <afd@ti.com> > >> >> Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com> >> --- >> arch/arm/mach-k3/include/mach/hardware.h | 37 ++++++++++++------------ >> 1 file changed, 19 insertions(+), 18 deletions(-) >> >> diff --git a/arch/arm/mach-k3/include/mach/hardware.h >> b/arch/arm/mach-k3/include/mach/hardware.h >> index c724450638..c3aaded8dc 100644 >> --- a/arch/arm/mach-k3/include/mach/hardware.h >> +++ b/arch/arm/mach-k3/include/mach/hardware.h >> @@ -8,37 +8,38 @@ >> #include <asm/io.h> >> -#ifdef CONFIG_SOC_K3_AM654 >> -#include "am6_hardware.h" >> +#ifdef CONFIG_SOC_K3_AM625 >> +#include "am62_hardware.h" >> #endif >> -#ifdef CONFIG_SOC_K3_J721E >> -#include "j721e_hardware.h" >> +#ifdef CONFIG_SOC_K3_AM62A7 >> +#include "am62a_hardware.h" >> #endif >> -#ifdef CONFIG_SOC_K3_J721S2 >> -#include "j721s2_hardware.h" >> +#ifdef CONFIG_SOC_K3_AM62P5 >> +#include "am62p_hardware.h" >> #endif >> #ifdef CONFIG_SOC_K3_AM642 >> #include "am64_hardware.h" >> #endif >> -#ifdef CONFIG_SOC_K3_AM625 >> -#include "am62_hardware.h" >> +#ifdef CONFIG_SOC_K3_AM654 >> +#include "am6_hardware.h" >> #endif >> -#ifdef CONFIG_SOC_K3_AM62A7 >> -#include "am62a_hardware.h" >> +#ifdef CONFIG_SOC_K3_J721E >> +#include "j721e_hardware.h" >> +#endif >> + >> +#ifdef CONFIG_SOC_K3_J721S2 >> +#include "j721s2_hardware.h" >> #endif >> #ifdef CONFIG_SOC_K3_J784S4 >> #include "j784s4_hardware.h" >> #endif >> -#ifdef CONFIG_SOC_K3_AM62P5 >> -#include "am62p_hardware.h" >> -#endif >> /* Assuming these addresses and definitions stay common across K3 >> devices */ >> #define CTRLMMR_WKUP_JTAG_ID (WKUP_CTRL_MMR0_BASE + 0x14) >> @@ -63,14 +64,14 @@ static inline bool soc_is_##id(void) \ >> JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT; \ >> return soc == JTAG_ID_PARTNO_##ID; \ >> } >> -K3_SOC_ID(am65x, AM65X) >> -K3_SOC_ID(j721e, J721E) >> -K3_SOC_ID(j7200, J7200) >> -K3_SOC_ID(am64x, AM64X) >> -K3_SOC_ID(j721s2, J721S2) >> K3_SOC_ID(am62x, AM62X) >> K3_SOC_ID(am62ax, AM62AX) >> K3_SOC_ID(am62px, AM62PX) >> +K3_SOC_ID(am64x, AM64X) >> +K3_SOC_ID(am65x, AM65X) >> +K3_SOC_ID(j7200, J7200) >> +K3_SOC_ID(j721e, J721E) >> +K3_SOC_ID(j721s2, J721S2) >> #define K3_SEC_MGR_SYS_STATUS 0x44234100 >> #define SYS_STATUS_DEV_TYPE_SHIFT 0
diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h index c724450638..c3aaded8dc 100644 --- a/arch/arm/mach-k3/include/mach/hardware.h +++ b/arch/arm/mach-k3/include/mach/hardware.h @@ -8,37 +8,38 @@ #include <asm/io.h> -#ifdef CONFIG_SOC_K3_AM654 -#include "am6_hardware.h" +#ifdef CONFIG_SOC_K3_AM625 +#include "am62_hardware.h" #endif -#ifdef CONFIG_SOC_K3_J721E -#include "j721e_hardware.h" +#ifdef CONFIG_SOC_K3_AM62A7 +#include "am62a_hardware.h" #endif -#ifdef CONFIG_SOC_K3_J721S2 -#include "j721s2_hardware.h" +#ifdef CONFIG_SOC_K3_AM62P5 +#include "am62p_hardware.h" #endif #ifdef CONFIG_SOC_K3_AM642 #include "am64_hardware.h" #endif -#ifdef CONFIG_SOC_K3_AM625 -#include "am62_hardware.h" +#ifdef CONFIG_SOC_K3_AM654 +#include "am6_hardware.h" #endif -#ifdef CONFIG_SOC_K3_AM62A7 -#include "am62a_hardware.h" +#ifdef CONFIG_SOC_K3_J721E +#include "j721e_hardware.h" +#endif + +#ifdef CONFIG_SOC_K3_J721S2 +#include "j721s2_hardware.h" #endif #ifdef CONFIG_SOC_K3_J784S4 #include "j784s4_hardware.h" #endif -#ifdef CONFIG_SOC_K3_AM62P5 -#include "am62p_hardware.h" -#endif /* Assuming these addresses and definitions stay common across K3 devices */ #define CTRLMMR_WKUP_JTAG_ID (WKUP_CTRL_MMR0_BASE + 0x14) @@ -63,14 +64,14 @@ static inline bool soc_is_##id(void) \ JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT; \ return soc == JTAG_ID_PARTNO_##ID; \ } -K3_SOC_ID(am65x, AM65X) -K3_SOC_ID(j721e, J721E) -K3_SOC_ID(j7200, J7200) -K3_SOC_ID(am64x, AM64X) -K3_SOC_ID(j721s2, J721S2) K3_SOC_ID(am62x, AM62X) K3_SOC_ID(am62ax, AM62AX) K3_SOC_ID(am62px, AM62PX) +K3_SOC_ID(am64x, AM64X) +K3_SOC_ID(am65x, AM65X) +K3_SOC_ID(j7200, J7200) +K3_SOC_ID(j721e, J721E) +K3_SOC_ID(j721s2, J721S2) #define K3_SEC_MGR_SYS_STATUS 0x44234100 #define SYS_STATUS_DEV_TYPE_SHIFT 0
Sort CONFIG_SOC* and K3_SOC_ID alphabetically. Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com> --- arch/arm/mach-k3/include/mach/hardware.h | 37 ++++++++++++------------ 1 file changed, 19 insertions(+), 18 deletions(-)