[PATCH] ARM: layerscape: Use ARCH_LS104?A insead of TARGET_LS104?ARDB

[Sean Anderson]

On 7/7/22 11:08 AM, Sean Anderson wrote:
> 
> 
> On 4/26/22 2:31 PM, Sean Anderson wrote:
>> These frequency calculations depend on the RCW format, which is not
>> dependent on any particular board. Switch to using ARCH symbols instead
>> of TARGET.
>> 
>> This whole function could probably use less ifdefs, but for now just do
>> a minimal conversion.
>> 
>> Fixes: 24cb6f2295 ("fsl-layerscape: Add fsl_esdhc peripheral clock support")
>> Signed-off-by: Sean Anderson <sean.anderson at seco.com>
>> ---
>> 
>>  arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
>> 
>> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
>> index 570105a75e..840e6d412b 100644
>> --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
>> +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
>> @@ -29,8 +29,8 @@ void get_sys_info(struct sys_info *sys_info)
>>   * mux 2 clock for LS1043A/LS1046A.
>>   */
>>  #if defined(CONFIG_SYS_DPAA_FMAN) || \
>> -	    defined(CONFIG_TARGET_LS1046ARDB) || \
>> -	    defined(CONFIG_TARGET_LS1043ARDB)
>> +	    defined(CONFIG_ARCH_LS1046A) || \
>> +	    defined(CONFIG_ARCH_LS1043A)
>>  	u32 rcw_tmp;
>>  #endif
>>  	struct ccsr_clk *clk = (void *)(CONFIG_SYS_FSL_CLK_ADDR);
>> @@ -129,13 +129,13 @@ void get_sys_info(struct sys_info *sys_info)
>>  
>>  #define HWA_CGA_M2_CLK_SEL	0x00000007
>>  #define HWA_CGA_M2_CLK_SHIFT	0
>> -#if defined(CONFIG_TARGET_LS1046ARDB) || defined(CONFIG_TARGET_LS1043ARDB)
>> +#if defined(CONFIG_ARCH_LS1046A) || defined(CONFIG_ARCH_LS1043A)
>>  	rcw_tmp = in_be32(&gur->rcwsr[15]);
>>  	switch ((rcw_tmp & HWA_CGA_M2_CLK_SEL) >> HWA_CGA_M2_CLK_SHIFT) {
>>  	case 1:
>>  		sys_info->freq_cga_m2 = freq_c_pll[1];
>>  		break;
>> -#if defined(CONFIG_TARGET_LS1046ARDB)
>> +#if defined(CONFIG_ARCH_LS1046A)
>>  	case 2:
>>  		sys_info->freq_cga_m2 = freq_c_pll[1] / 2;
>>  		break;
>> @@ -143,7 +143,7 @@ void get_sys_info(struct sys_info *sys_info)
>>  	case 3:
>>  		sys_info->freq_cga_m2 = freq_c_pll[1] / 3;
>>  		break;
>> -#if defined(CONFIG_TARGET_LS1046ARDB)
>> +#if defined(CONFIG_ARCH_LS1046A)
>>  	case 6:
>>  		sys_info->freq_cga_m2 = freq_c_pll[0] / 2;
>>  		break;
>> 
> 
> ping?
> 

Looks like this was already applied as bcb3dae3251 ("ARM: layerscape: Use
ARCH_LS104?A insead of TARGET_LS104?ARDB").

--Sean