Allwinner Core Additions for 3.19
This has mostly been about introducing A80 support -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUa8NAAAoJEBx+YmzsjxAgNZ0P/22p1VKumZyoNRKF3vHn+iNV MBDa7UgVWXXQvBuysPs4n0MmG4sF/jKuD9IzVp6AI6U0M4HFqYwNJJl5ScT0+9ho jXgdZ/CfDGmbkQGHLYeDbj+ShuZFtpkcpf0373qh3EaJyoJaOTaYRlbkpVp/GSfb M97Q/cqYw+rOqs/YrSJOQgKAAePl6Avi6hOVJ/cRATBvsdm80fcQ0SbuhTVWlH9j 5UXtLMDDbsCHnXCV05OkzkgQyJhNIhWuK8rURMTFG1HY5kkMQKSg1V8HSdjMoQp4 dx+HP8J5j3deshCOcRGxO4aCo3CPp8GYR2c5jPXYCTTnjrhCOiHI25GAcmOhuXXI Tpixwo08pqTzTrevI8q6heAwBk2c3JA5INKswHOuRd988oD7vSfJpEYmyN+H6v1S wjzNDdsPecH+1hVZhp5iQ0NzDX7K/9N8gt24A/shin2cnCHgkVoU1/MFq/S3ZLQk qtibbcvdgBXAiX5BWlqPi2pWUdQ6LWXh3+UvLu6uEIvg5lrhoPsOilbuUbgQ7fdR B6OOwWur9MoV/Y/C8aquubU9Dwj8nrmYJ5lzNvkffD6zFAx7Pg803WewaNowAoGG e9MU6gAAn4/Km8Oig+dIkptnYHW+nPoodPNyoAMaJ9Ce+3YzpxclPVjEAzyzkZFh +1geJcIUj9hYSJeKT0gu =cJ5x -----END PGP SIGNATURE----- Merge tag 'sunxi-core-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc Pull "Allwinner Core Additions for 3.19" from Maxime Ripard: This has mostly been about introducing A80 support * tag 'sunxi-core-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: sunxi: make sun6i SMP ops static ARM: sunxi: Select ARCH_HAS_RESET_CONTROLLER and RESET_CONTROLLER for sun9i Documentation: sunxi: Add A80 datasheet link devicetree: bindings: Document supported Allwinner sunxi SoCs ARM: sunxi: Introduce Allwinner A80 support devicetree: bindings: Add vendor prefix for Merrii Technology Co., Ltd. ARM: sunxi: Add debug uart used by sun9i (Allwinner A80) Documentation: sunxi: Update Allwinner SoC documentation (A31/A31s/A23) Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
8d6d5e128f
|
@ -37,16 +37,26 @@ SunXi family
|
||||||
http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf
|
http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf
|
||||||
|
|
||||||
- Allwinner A23
|
- Allwinner A23
|
||||||
+ Not Supported
|
+ Datasheet
|
||||||
|
http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf
|
||||||
|
+ User Manual
|
||||||
|
http://dl.linux-sunxi.org/A23/A23%20User%20Manual%20V1.0%2020130830.pdf
|
||||||
|
|
||||||
* Quad ARM Cortex-A7 based SoCs
|
* Quad ARM Cortex-A7 based SoCs
|
||||||
- Allwinner A31 (sun6i)
|
- Allwinner A31 (sun6i)
|
||||||
+ Datasheet
|
+ Datasheet
|
||||||
http://dl.linux-sunxi.org/A31/A31%20Datasheet%20-%20v1.00%20(2012-12-24).pdf
|
http://dl.linux-sunxi.org/A31/A3x_release_document/A31/IC/A31%20datasheet%20V1.3%2020131106.pdf
|
||||||
|
+ User Manual
|
||||||
|
http://dl.linux-sunxi.org/A31/A3x_release_document/A31/IC/A31%20user%20manual%20V1.1%2020130630.pdf
|
||||||
|
|
||||||
- Allwinner A31s (sun6i)
|
- Allwinner A31s (sun6i)
|
||||||
+ Not Supported
|
+ Not Supported
|
||||||
|
+ Datasheet
|
||||||
|
http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20datasheet%20V1.3%2020131106.pdf
|
||||||
|
+ User Manual
|
||||||
|
http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf
|
||||||
|
|
||||||
* Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs
|
* Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs
|
||||||
- Allwinner A80
|
- Allwinner A80
|
||||||
+ Not Supported
|
+ Datasheet
|
||||||
|
http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf
|
||||||
|
|
12
Documentation/devicetree/bindings/arm/sunxi.txt
Normal file
12
Documentation/devicetree/bindings/arm/sunxi.txt
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
Allwinner sunXi Platforms Device Tree Bindings
|
||||||
|
|
||||||
|
Each device tree must specify which Allwinner SoC it uses,
|
||||||
|
using one of the following compatible strings:
|
||||||
|
|
||||||
|
allwinner,sun4i-a10
|
||||||
|
allwinner,sun5i-a10s
|
||||||
|
allwinner,sun5i-a13
|
||||||
|
allwinner,sun6i-a31
|
||||||
|
allwinner,sun7i-a20
|
||||||
|
allwinner,sun8i-a23
|
||||||
|
allwinner,sun9i-a80
|
|
@ -90,6 +90,7 @@ lltc Linear Technology Corporation
|
||||||
marvell Marvell Technology Group Ltd.
|
marvell Marvell Technology Group Ltd.
|
||||||
maxim Maxim Integrated Products
|
maxim Maxim Integrated Products
|
||||||
mediatek MediaTek Inc.
|
mediatek MediaTek Inc.
|
||||||
|
merrii Merrii Technology Co., Ltd.
|
||||||
micrel Micrel Inc.
|
micrel Micrel Inc.
|
||||||
microchip Microchip Technology Inc.
|
microchip Microchip Technology Inc.
|
||||||
mitsubishi Mitsubishi Electric Corporation
|
mitsubishi Mitsubishi Electric Corporation
|
||||||
|
|
|
@ -750,6 +750,14 @@ choice
|
||||||
Say Y here if you want kernel low-level debugging support
|
Say Y here if you want kernel low-level debugging support
|
||||||
on SOCFPGA based platforms.
|
on SOCFPGA based platforms.
|
||||||
|
|
||||||
|
config DEBUG_SUN9I_UART0
|
||||||
|
bool "Kernel low-level debugging messages via sun9i UART0"
|
||||||
|
depends on MACH_SUN9I
|
||||||
|
select DEBUG_UART_8250
|
||||||
|
help
|
||||||
|
Say Y here if you want kernel low-level debugging support
|
||||||
|
on Allwinner A80 based platforms on the UART0.
|
||||||
|
|
||||||
config DEBUG_SUNXI_UART0
|
config DEBUG_SUNXI_UART0
|
||||||
bool "Kernel low-level debugging messages via sunXi UART0"
|
bool "Kernel low-level debugging messages via sunXi UART0"
|
||||||
depends on ARCH_SUNXI
|
depends on ARCH_SUNXI
|
||||||
|
@ -1142,6 +1150,7 @@ config DEBUG_UART_PHYS
|
||||||
default 0x02530c00 if DEBUG_KEYSTONE_UART0
|
default 0x02530c00 if DEBUG_KEYSTONE_UART0
|
||||||
default 0x02531000 if DEBUG_KEYSTONE_UART1
|
default 0x02531000 if DEBUG_KEYSTONE_UART1
|
||||||
default 0x03010fe0 if ARCH_RPC
|
default 0x03010fe0 if ARCH_RPC
|
||||||
|
default 0x07000000 if DEBUG_SUN9I_UART0
|
||||||
default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
|
default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
|
||||||
DEBUG_VEXPRESS_UART0_CA9
|
DEBUG_VEXPRESS_UART0_CA9
|
||||||
default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
|
default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
|
||||||
|
@ -1231,6 +1240,7 @@ config DEBUG_UART_VIRT
|
||||||
default 0xf2100000 if DEBUG_PXA_UART1
|
default 0xf2100000 if DEBUG_PXA_UART1
|
||||||
default 0xf4090000 if ARCH_LPC32XX
|
default 0xf4090000 if ARCH_LPC32XX
|
||||||
default 0xf4200000 if ARCH_GEMINI
|
default 0xf4200000 if ARCH_GEMINI
|
||||||
|
default 0xf7000000 if DEBUG_SUN9I_UART0
|
||||||
default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \
|
default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \
|
||||||
DEBUG_S3C2410_UART0)
|
DEBUG_S3C2410_UART0)
|
||||||
default 0xf7004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \
|
default 0xf7004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \
|
||||||
|
|
|
@ -42,4 +42,11 @@ config MACH_SUN8I
|
||||||
select MFD_SUN6I_PRCM
|
select MFD_SUN6I_PRCM
|
||||||
select RESET_CONTROLLER
|
select RESET_CONTROLLER
|
||||||
|
|
||||||
|
config MACH_SUN9I
|
||||||
|
bool "Allwinner (sun9i) SoCs support"
|
||||||
|
default ARCH_SUNXI
|
||||||
|
select ARCH_HAS_RESET_CONTROLLER
|
||||||
|
select ARM_GIC
|
||||||
|
select RESET_CONTROLLER
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -116,7 +116,7 @@ static int sun6i_smp_boot_secondary(unsigned int cpu,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct smp_operations sun6i_smp_ops __initdata = {
|
static struct smp_operations sun6i_smp_ops __initdata = {
|
||||||
.smp_prepare_cpus = sun6i_smp_prepare_cpus,
|
.smp_prepare_cpus = sun6i_smp_prepare_cpus,
|
||||||
.smp_boot_secondary = sun6i_smp_boot_secondary,
|
.smp_boot_secondary = sun6i_smp_boot_secondary,
|
||||||
};
|
};
|
||||||
|
|
|
@ -63,3 +63,12 @@ static const char * const sun8i_board_dt_compat[] = {
|
||||||
DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family")
|
DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family")
|
||||||
.dt_compat = sun8i_board_dt_compat,
|
.dt_compat = sun8i_board_dt_compat,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
||||||
|
static const char * const sun9i_board_dt_compat[] = {
|
||||||
|
"allwinner,sun9i-a80",
|
||||||
|
NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
DT_MACHINE_START(SUN9I_DT, "Allwinner sun9i Family")
|
||||||
|
.dt_compat = sun9i_board_dt_compat,
|
||||||
|
MACHINE_END
|
||||||
|
|
Loading…
Reference in a new issue