diff options
author | Hans de Goede <hdegoede@redhat.com> | 2014-12-17 12:18:14 -0500 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-01-05 03:50:39 -0500 |
commit | b0f2faa5ca02358ebfe404801e2ad604dc88c471 (patch) | |
tree | 40aadc1360ed4d04a32897663b5c5ee0d0ac597c /arch/arm | |
parent | 97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff) |
ARM: sunxi: Add "allwinner,sun6i-a31s" to mach-sunxi
So far the A31s is 100% compatible with the A31, still lets do the same
as what we've done for the A13 / A10s and give it its own compatible string,
in case we need to differentiate later.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
[Maxime: Removed unusude CPU_OF_DECLARE_METHOD]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-sunxi/platsmp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-sunxi/platsmp.c b/arch/arm/mach-sunxi/platsmp.c index e44d028555a4..587b0468efcc 100644 --- a/arch/arm/mach-sunxi/platsmp.c +++ b/arch/arm/mach-sunxi/platsmp.c | |||
@@ -120,4 +120,4 @@ static struct smp_operations sun6i_smp_ops __initdata = { | |||
120 | .smp_prepare_cpus = sun6i_smp_prepare_cpus, | 120 | .smp_prepare_cpus = sun6i_smp_prepare_cpus, |
121 | .smp_boot_secondary = sun6i_smp_boot_secondary, | 121 | .smp_boot_secondary = sun6i_smp_boot_secondary, |
122 | }; | 122 | }; |
123 | CPU_METHOD_OF_DECLARE(sun6i_smp, "allwinner,sun6i-a31", &sun6i_smp_ops); | 123 | CPU_METHOD_OF_DECLARE(sun6i_a31_smp, "allwinner,sun6i-a31", &sun6i_smp_ops); |
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 1f986758784a..d4bb2395d39c 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c | |||
@@ -29,6 +29,7 @@ MACHINE_END | |||
29 | 29 | ||
30 | static const char * const sun6i_board_dt_compat[] = { | 30 | static const char * const sun6i_board_dt_compat[] = { |
31 | "allwinner,sun6i-a31", | 31 | "allwinner,sun6i-a31", |
32 | "allwinner,sun6i-a31s", | ||
32 | NULL, | 33 | NULL, |
33 | }; | 34 | }; |
34 | 35 | ||