diff options
author | Hans de Goede <hdegoede@redhat.com> | 2014-11-26 02:04:24 +0300 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2015-01-14 16:56:36 +0300 |
commit | cac5b1cc0d6daa0c0a037fd24a87d4db4e0a1456 (patch) | |
tree | a24c15323e90e3a930db7c88dcfabfa927547bfb /arch | |
parent | f3fba5665b066615a39d157a4a4970824695b91d (diff) | |
download | u-boot-cac5b1cc0d6daa0c0a037fd24a87d4db4e0a1456.tar.xz |
sunxi: Add sunxi_get_sid helper function
On sun6i the SID is stored in the pmic, rather then in the SoC itself,
add a helper function to abstract this away.
This makes our MAC address generation code also work on sun6i.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/cpu_info.c | 19 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-sunxi/cpu.h | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/cpu_info.c b/arch/arm/cpu/armv7/sunxi/cpu_info.c index 5146dc422f..7a3a4ca81b 100644 --- a/arch/arm/cpu/armv7/sunxi/cpu_info.c +++ b/arch/arm/cpu/armv7/sunxi/cpu_info.c @@ -10,6 +10,7 @@ #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/clock.h> +#include <axp221.h> #ifdef CONFIG_MACH_SUN6I int sunxi_get_ss_bonding_id(void) @@ -72,3 +73,21 @@ int print_cpuinfo(void) return 0; } #endif + +int sunxi_get_sid(unsigned int *sid) +{ +#ifdef CONFIG_MACH_SUN6I +#ifdef CONFIG_AXP221_POWER + return axp221_get_sid(sid); +#else + return -ENODEV; +#endif +#else + int i; + + for (i = 0; i< 4; i++) + sid[i] = readl(SUNXI_SID_BASE + 4 * i); + + return 0; +#endif +} diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h index 8aeed2fc72..9500262ca9 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu.h +++ b/arch/arm/include/asm/arch-sunxi/cpu.h @@ -147,6 +147,7 @@ void sunxi_board_init(void); void sunxi_reset(void); int sunxi_get_ss_bonding_id(void); +int sunxi_get_sid(unsigned int *sid); #endif /* __ASSEMBLY__ */ #endif /* _CPU_H */ |