diff mbox

[U-Boot,11/12] sun9i: Basic sun9i (A80) support

Message ID 1421333554-29822-12-git-send-email-hdegoede@redhat.com
State Superseded
Delegated to: Hans de Goede
Headers show

Commit Message

Hans de Goede Jan. 15, 2015, 2:52 p.m. UTC 
Add initial sun9i (A80) support, only uart + mmc are supported for now.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/cpu/armv7/sunxi/Makefile        |  2 ++
 arch/arm/cpu/armv7/sunxi/board.c         |  4 ++++
 arch/arm/cpu/armv7/sunxi/cpu_info.c      |  5 +++++
 arch/arm/cpu/armv7/sunxi/lowlevel_init.S | 12 +++++++++++-
 arch/arm/include/asm/arch-sunxi/gpio.h   |  3 +++
 board/sunxi/Kconfig                      |  5 +++++
 include/configs/sun9i.h                  | 23 +++++++++++++++++++++++
 7 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 include/configs/sun9i.h

Comments

Ian Campbell Jan. 17, 2015, 10:59 p.m. UTC | #1 
On Thu, 2015-01-15 at 15:52 +0100, Hans de Goede wrote:
> Add initial sun9i (A80) support, only uart + mmc are supported for now.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Ian Campbell <ijc@hellion.org.uk>

> +#define CONFIG_SYS_PROMPT	"sun9i# "

Should we make all these say "sunxi# " in the common header instead (the
precise SoC is printed in the banner anyhow), or derive from
CONFIG_SYS_CONFIG_NAME?

Ian.
Hans de Goede Jan. 19, 2015, 7:44 p.m. UTC | #2 
Hi,

On 17-01-15 23:59, Ian Campbell wrote:
> On Thu, 2015-01-15 at 15:52 +0100, Hans de Goede wrote:
>> Add initial sun9i (A80) support, only uart + mmc are supported for now.
>>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>
> Acked-by: Ian Campbell <ijc@hellion.org.uk>
>
>> +#define CONFIG_SYS_PROMPT	"sun9i# "
>
> Should we make all these say "sunxi# " in the common header instead (the
> precise SoC is printed in the banner anyhow),

Yeah that sounds like a good idea, care to submit a patch for that ?

Regards,

Hans
Ian Campbell Jan. 20, 2015, 8:43 a.m. UTC | #3 
On Mon, 2015-01-19 at 20:44 +0100, Hans de Goede wrote:
> Hi,
> 
> On 17-01-15 23:59, Ian Campbell wrote:
> > On Thu, 2015-01-15 at 15:52 +0100, Hans de Goede wrote:
> >> Add initial sun9i (A80) support, only uart + mmc are supported for now.
> >>
> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> >
> > Acked-by: Ian Campbell <ijc@hellion.org.uk>
> >
> >> +#define CONFIG_SYS_PROMPT	"sun9i# "
> >
> > Should we make all these say "sunxi# " in the common header instead (the
> > precise SoC is printed in the banner anyhow),
> 
> Yeah that sounds like a good idea, care to submit a patch for that ?

Yep, will do once this one hits #next so I don't need to rebase etc.

> 
> Regards,
> 
> Hans
>
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile
index 27264f5..6602cda 100644
--- a/arch/arm/cpu/armv7/sunxi/Makefile
+++ b/arch/arm/cpu/armv7/sunxi/Makefile
@@ -13,7 +13,9 @@  obj-y	+= board.o
 obj-y	+= clock.o
 obj-y	+= cpu_info.o
 obj-y	+= pinmux.o
+ifndef CONFIG_MACH_SUN9I
 obj-y	+= usbc.o
+endif
 obj-$(CONFIG_MACH_SUN6I)	+= prcm.o
 obj-$(CONFIG_MACH_SUN8I)	+= prcm.o
 obj-$(CONFIG_MACH_SUN6I)	+= p2wi.o
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c
index 4449942..0108a14 100644
--- a/arch/arm/cpu/armv7/sunxi/board.c
+++ b/arch/arm/cpu/armv7/sunxi/board.c
@@ -71,6 +71,10 @@  int gpio_init(void)
 	sunxi_gpio_set_cfgpin(SUNXI_GPH(20), SUN6I_GPH20_UART0_TX);
 	sunxi_gpio_set_cfgpin(SUNXI_GPH(21), SUN6I_GPH21_UART0_RX);
 	sunxi_gpio_set_pull(SUNXI_GPH(21), SUNXI_GPIO_PULL_UP);
+#elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_MACH_SUN9I)
+	sunxi_gpio_set_cfgpin(SUNXI_GPH(12), SUN9I_GPH12_UART0_TX);
+	sunxi_gpio_set_cfgpin(SUNXI_GPH(13), SUN9I_GPH13_UART0_RX);
+	sunxi_gpio_set_pull(SUNXI_GPH(13), SUNXI_GPIO_PULL_UP);
 #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I)
 	sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG3_UART1_TX);
 	sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG4_UART1_RX);
diff --git a/arch/arm/cpu/armv7/sunxi/cpu_info.c b/arch/arm/cpu/armv7/sunxi/cpu_info.c
index b6cb9de..09ea7f2 100644
--- a/arch/arm/cpu/armv7/sunxi/cpu_info.c
+++ b/arch/arm/cpu/armv7/sunxi/cpu_info.c
@@ -11,6 +11,7 @@ 
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <axp221.h>
+#include <errno.h>
 
 #ifdef CONFIG_MACH_SUN6I
 int sunxi_get_ss_bonding_id(void)
@@ -66,6 +67,8 @@  int print_cpuinfo(void)
 	puts("CPU:   Allwinner A20 (SUN7I)\n");
 #elif defined CONFIG_MACH_SUN8I
 	puts("CPU:   Allwinner A23 (SUN8I)\n");
+#elif defined CONFIG_MACH_SUN9I
+	puts("CPU:   Allwinner A80 (SUN9I)\n");
 #else
 #warning Please update cpu_info.c with correct CPU information
 	puts("CPU:   SUNXI Family\n");
@@ -82,6 +85,8 @@  int sunxi_get_sid(unsigned int *sid)
 #else
 	return -ENODEV;
 #endif
+#elif defined CONFIG_MACH_SUN9I
+	return -ENODEV; /* Not supported yet */
 #else
 	int i;
 
diff --git a/arch/arm/cpu/armv7/sunxi/lowlevel_init.S b/arch/arm/cpu/armv7/sunxi/lowlevel_init.S
index b80b3eb..8a069f7 100644
--- a/arch/arm/cpu/armv7/sunxi/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/sunxi/lowlevel_init.S
@@ -14,10 +14,20 @@ 
  */
 ENTRY(save_boot_params)
 #if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN7I || \
-    defined CONFIG_MACH_SUN8I
+    defined CONFIG_MACH_SUN8I || defined CONFIG_MACH_SUN9I
 	mrc	p15, 0, r0, c1, c0, 1
 	orr	r0, r0, #(1<<6)
 	mcr	p15, 0, r0, c1, c0, 1
 #endif
+#if defined CONFIG_MACH_SUN9I
+	/*
+	 * Dark magic poke of some register in the SYS_CTRL region.
+	 * Allwinners own u-boot does this and without this u-boot causes a
+	 * CPU / system reset as soon as it loads.
+	 */
+	ldr	r0, =0x008000e0
+	ldr	r1, =0x16aa0001
+	str	r1, [r0]
+#endif
 	bx	lr
 ENDPROC(save_boot_params)
diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
index 71cc879..3db7fd3 100644
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -174,6 +174,9 @@  enum sunxi_gpio_number {
 
 #define SUN4I_GPH22_SDC1	5
 
+#define SUN9I_GPH12_UART0_TX	2
+#define SUN9I_GPH13_UART0_RX	2
+
 #define SUN6I_GPH20_UART0_TX	2
 #define SUN6I_GPH21_UART0_RX	2
 
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 847a86f..e65b8af 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -31,6 +31,10 @@  config MACH_SUN8I
 	select CPU_V7
 	select SUPPORT_SPL
 
+config MACH_SUN9I
+	bool "sun9i (Allwinner A80)"
+	select CPU_V7
+
 endchoice
 
 if MACH_SUN6I || MACH_SUN8I
@@ -56,6 +60,7 @@  config SYS_CONFIG_NAME
 	default "sun6i" if MACH_SUN6I
 	default "sun7i" if MACH_SUN7I
 	default "sun8i" if MACH_SUN8I
+	default "sun9i" if MACH_SUN9I
 
 choice
 	prompt "Board"
diff --git a/include/configs/sun9i.h b/include/configs/sun9i.h
new file mode 100644
index 0000000..3fcf477
--- /dev/null
+++ b/include/configs/sun9i.h
@@ -0,0 +1,23 @@ 
+/*
+ * (C) Copyright 2015 Hans de Goede <hdegoede@redhat.com>
+ *
+ * Configuration settings for the Allwinner A80 (sun9i) CPU
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+/*
+ * A80 specific configuration
+ */
+
+#define CONFIG_SYS_PROMPT	"sun9i# "
+
+/*
+ * Include common sunxi configuration where most the settings are
+ */
+#include <configs/sunxi-common.h>
+
+#endif /* __CONFIG_H */