mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-04 05:50:17 +00:00 
			
		
		
		
	rockchip: theobroma-systems: puma: migrate to rockchip_early_misc_init_r
Only setup_iodomain() and setup_boottargets differ from the original misc_init_r from Rockchip mach code, so let's use rockchip_early_misc_init_r instead of reimplementing the whole misc_init_r from Rockchip. Cc: Quentin Schulz <foss+uboot@0leil.net> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
This commit is contained in:
		
							parent
							
								
									7672355fe0
								
							
						
					
					
						commit
						1624d1ecd5
					
				@ -10,7 +10,6 @@
 | 
				
			|||||||
#include <asm/arch-rockchip/clock.h>
 | 
					#include <asm/arch-rockchip/clock.h>
 | 
				
			||||||
#include <asm/arch-rockchip/hardware.h>
 | 
					#include <asm/arch-rockchip/hardware.h>
 | 
				
			||||||
#include <asm/arch-rockchip/grf_rk3399.h>
 | 
					#include <asm/arch-rockchip/grf_rk3399.h>
 | 
				
			||||||
#include <asm/arch-rockchip/misc.h>
 | 
					 | 
				
			||||||
#include "../common/common.h"
 | 
					#include "../common/common.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void setup_iodomain(void)
 | 
					static void setup_iodomain(void)
 | 
				
			||||||
@ -27,25 +26,8 @@ static void setup_iodomain(void)
 | 
				
			|||||||
	rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_GPIO4CD_SHIFT);
 | 
						rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_GPIO4CD_SHIFT);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int misc_init_r(void)
 | 
					int rockchip_early_misc_init_r(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	const u32 cpuid_offset = 0x7;
 | 
					 | 
				
			||||||
	const u32 cpuid_length = 0x10;
 | 
					 | 
				
			||||||
	u8 cpuid[cpuid_length];
 | 
					 | 
				
			||||||
	int ret;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid);
 | 
					 | 
				
			||||||
	if (ret)
 | 
					 | 
				
			||||||
		return ret;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	ret = rockchip_cpuid_set(cpuid, cpuid_length);
 | 
					 | 
				
			||||||
	if (ret)
 | 
					 | 
				
			||||||
		return ret;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	ret = rockchip_setup_macaddr();
 | 
					 | 
				
			||||||
	if (ret)
 | 
					 | 
				
			||||||
		return ret;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	setup_iodomain();
 | 
						setup_iodomain();
 | 
				
			||||||
	setup_boottargets();
 | 
						setup_boottargets();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user