diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-05-19 23:34:00 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-05-29 13:46:36 +0200 |
| commit | 813598e3b46601d6dd8d373e689f60f7c60fbb48 (patch) | |
| tree | 1ca9ecffbca29ba54e3d3412e50012fee725ed87 | |
| parent | 012681b1fa822492bb8fdc5c2dd3d24d6092e110 (diff) | |
| download | talos-obmc-uboot-813598e3b46601d6dd8d373e689f60f7c60fbb48.tar.gz talos-obmc-uboot-813598e3b46601d6dd8d373e689f60f7c60fbb48.zip | |
sunxi: Use axp221 sid on a33
Unlike the A31 and the A23 the A33 actually has a SID inside the SoC again,
but sid[3] is 0 (at least on some SoCs), so it is better to use the axp221
sid.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/cpu_info.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/cpu_info.c b/arch/arm/cpu/armv7/sunxi/cpu_info.c index 30ec4ac4f0..8e8c84f2ad 100644 --- a/arch/arm/cpu/armv7/sunxi/cpu_info.c +++ b/arch/arm/cpu/armv7/sunxi/cpu_info.c @@ -78,18 +78,16 @@ int print_cpuinfo(void) int sunxi_get_sid(unsigned int *sid) { -#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_A23 #ifdef CONFIG_AXP221_POWER return axp221_get_sid(sid); -#else - return -ENODEV; -#endif -#else +#elif defined SUNXI_SID_BASE int i; for (i = 0; i< 4; i++) sid[i] = readl(SUNXI_SID_BASE + 4 * i); return 0; +#else + return -ENODEV; #endif } |
