Allwinner late changes for 4.2
A bunch of defconfig changes, and some patches to make the Allwinner H3 and A33 boot properly. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVmUC5AAoJEBx+YmzsjxAgc24P/Ah6q+SSSv68adzGQp6LGO8t ru2OWZwlQn+w2gHJK9qAytmQdpSRqbbjB+8muLz9WwNNjHliDmJawUvBPdC2p03L ZrugiVUSKBeQOzdqvG0B3vOO3xszDE06DA+i0PZaBWH2uXDVfohhCFQ2n2/oQsS7 eDSlBl1EHtZOKEHtuEi988YDJhYDnJeSG/SWwyUbW73QH5eYYl+9TnSXdwDKGmJS JyfWkafIsI3EKWUYmOJ2NgUv13pYQU9k/we53n+PxeGevsPuenJH8r2j/N8pWtUl srfZP82aEYCqlY4M6QL21k2KOPW8MIDMOOk9dh8l8k9nSC2oJXqsROJQpw2nrJRo oPoT+gxWacc+AutX3Hz+XjXNsCIsE3q0Yd7yBfiszXroPtkIBslJGhdJRbh3VrxO JS7lKVubJepePpARiWT4ginenWPgGPirDHWixSUcfgBnMN6fpdhOGpdDxWePy1IJ 7wox3lRThnBhhvI1HuLES92XEiRYhin21LA00juPbvCMbQKuG2W9fBryXTi3U3LC g3RQfy3ViZbrEw/7iTjlm2MVYSRxSdA1SAQHNS5Q+4fem22XKeSlzHON/0izrCdV 10zWNUAlolESWhCyD3TMScFl7WG+KMrjaHE/02+q7wSA6sr1aMGfjL6buVA7R5bF KiCWz4Sqp8p/a4RejDVl =m0CY -----END PGP SIGNATURE----- Merge tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes Merge "Allwinner late changes for 4.2" from Maxime Ripard: Allwinner late changes for 4.2 A bunch of defconfig changes, and some patches to make the Allwinner H3 and A33 boot properly. * tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: sunxi: Enable simplefb in the defconfig ARM: Remove deprecated symbol from defconfig files ARM: sunxi: Add Machine support for A33 ARM: sunxi: Introduce Allwinner H3 support Documentation: sunxi: Update Allwinner SoC documentation
This commit is contained in:
Коммит
d024bae2c4
|
@ -36,7 +36,7 @@ SunXi family
|
||||||
+ User Manual
|
+ User Manual
|
||||||
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 (sun8i)
|
||||||
+ Datasheet
|
+ Datasheet
|
||||||
http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf
|
http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf
|
||||||
+ User Manual
|
+ User Manual
|
||||||
|
@ -55,7 +55,23 @@ SunXi family
|
||||||
+ User Manual
|
+ User Manual
|
||||||
http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf
|
http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf
|
||||||
|
|
||||||
|
- Allwinner A33 (sun8i)
|
||||||
|
+ Datasheet
|
||||||
|
http://dl.linux-sunxi.org/A33/A33%20Datasheet%20release%201.1.pdf
|
||||||
|
+ User Manual
|
||||||
|
http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf
|
||||||
|
|
||||||
|
- Allwinner H3 (sun8i)
|
||||||
|
+ Datasheet
|
||||||
|
http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.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
|
||||||
+ Datasheet
|
+ Datasheet
|
||||||
http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf
|
http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf
|
||||||
|
|
||||||
|
* Octa ARM Cortex-A7 based SoCs
|
||||||
|
- Allwinner A83T
|
||||||
|
+ Not Supported
|
||||||
|
+ Datasheet
|
||||||
|
http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf
|
||||||
|
|
|
@ -9,4 +9,6 @@ using one of the following compatible strings:
|
||||||
allwinner,sun6i-a31
|
allwinner,sun6i-a31
|
||||||
allwinner,sun7i-a20
|
allwinner,sun7i-a20
|
||||||
allwinner,sun8i-a23
|
allwinner,sun8i-a23
|
||||||
|
allwinner,sun8i-a33
|
||||||
|
allwinner,sun8i-h3
|
||||||
allwinner,sun9i-a80
|
allwinner,sun9i-a80
|
||||||
|
|
|
@ -353,7 +353,6 @@ CONFIG_POWER_RESET_AS3722=y
|
||||||
CONFIG_POWER_RESET_GPIO=y
|
CONFIG_POWER_RESET_GPIO=y
|
||||||
CONFIG_POWER_RESET_GPIO_RESTART=y
|
CONFIG_POWER_RESET_GPIO_RESTART=y
|
||||||
CONFIG_POWER_RESET_KEYSTONE=y
|
CONFIG_POWER_RESET_KEYSTONE=y
|
||||||
CONFIG_POWER_RESET_SUN6I=y
|
|
||||||
CONFIG_POWER_RESET_RMOBILE=y
|
CONFIG_POWER_RESET_RMOBILE=y
|
||||||
CONFIG_SENSORS_LM90=y
|
CONFIG_SENSORS_LM90=y
|
||||||
CONFIG_SENSORS_LM95245=y
|
CONFIG_SENSORS_LM95245=y
|
||||||
|
|
|
@ -2,6 +2,7 @@ CONFIG_NO_HZ=y
|
||||||
CONFIG_HIGH_RES_TIMERS=y
|
CONFIG_HIGH_RES_TIMERS=y
|
||||||
CONFIG_BLK_DEV_INITRD=y
|
CONFIG_BLK_DEV_INITRD=y
|
||||||
CONFIG_PERF_EVENTS=y
|
CONFIG_PERF_EVENTS=y
|
||||||
|
CONFIG_MODULES=y
|
||||||
CONFIG_ARCH_SUNXI=y
|
CONFIG_ARCH_SUNXI=y
|
||||||
CONFIG_SMP=y
|
CONFIG_SMP=y
|
||||||
CONFIG_NR_CPUS=8
|
CONFIG_NR_CPUS=8
|
||||||
|
@ -77,7 +78,6 @@ CONFIG_SPI_SUN6I=y
|
||||||
CONFIG_GPIO_SYSFS=y
|
CONFIG_GPIO_SYSFS=y
|
||||||
CONFIG_POWER_SUPPLY=y
|
CONFIG_POWER_SUPPLY=y
|
||||||
CONFIG_POWER_RESET=y
|
CONFIG_POWER_RESET=y
|
||||||
CONFIG_POWER_RESET_SUN6I=y
|
|
||||||
CONFIG_THERMAL=y
|
CONFIG_THERMAL=y
|
||||||
CONFIG_CPU_THERMAL=y
|
CONFIG_CPU_THERMAL=y
|
||||||
CONFIG_WATCHDOG=y
|
CONFIG_WATCHDOG=y
|
||||||
|
@ -87,6 +87,10 @@ CONFIG_REGULATOR=y
|
||||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
||||||
CONFIG_REGULATOR_AXP20X=y
|
CONFIG_REGULATOR_AXP20X=y
|
||||||
CONFIG_REGULATOR_GPIO=y
|
CONFIG_REGULATOR_GPIO=y
|
||||||
|
CONFIG_FB=y
|
||||||
|
CONFIG_FB_SIMPLE=y
|
||||||
|
CONFIG_FRAMEBUFFER_CONSOLE=y
|
||||||
|
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_EHCI_HCD=y
|
CONFIG_USB_EHCI_HCD=y
|
||||||
CONFIG_USB_EHCI_HCD_PLATFORM=y
|
CONFIG_USB_EHCI_HCD_PLATFORM=y
|
||||||
|
|
|
@ -35,7 +35,7 @@ config MACH_SUN7I
|
||||||
select SUN5I_HSTIMER
|
select SUN5I_HSTIMER
|
||||||
|
|
||||||
config MACH_SUN8I
|
config MACH_SUN8I
|
||||||
bool "Allwinner A23 (sun8i) SoCs support"
|
bool "Allwinner sun8i Family SoCs support"
|
||||||
default ARCH_SUNXI
|
default ARCH_SUNXI
|
||||||
select ARM_GIC
|
select ARM_GIC
|
||||||
select MFD_SUN6I_PRCM
|
select MFD_SUN6I_PRCM
|
||||||
|
|
|
@ -67,10 +67,13 @@ MACHINE_END
|
||||||
|
|
||||||
static const char * const sun8i_board_dt_compat[] = {
|
static const char * const sun8i_board_dt_compat[] = {
|
||||||
"allwinner,sun8i-a23",
|
"allwinner,sun8i-a23",
|
||||||
|
"allwinner,sun8i-a33",
|
||||||
|
"allwinner,sun8i-h3",
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family")
|
DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i Family")
|
||||||
|
.init_time = sun6i_timer_init,
|
||||||
.dt_compat = sun8i_board_dt_compat,
|
.dt_compat = sun8i_board_dt_compat,
|
||||||
.init_late = sunxi_dt_cpufreq_init,
|
.init_late = sunxi_dt_cpufreq_init,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -1391,6 +1391,7 @@ static void __init sun6i_init_clocks(struct device_node *node)
|
||||||
CLK_OF_DECLARE(sun6i_a31_clk_init, "allwinner,sun6i-a31", sun6i_init_clocks);
|
CLK_OF_DECLARE(sun6i_a31_clk_init, "allwinner,sun6i-a31", sun6i_init_clocks);
|
||||||
CLK_OF_DECLARE(sun6i_a31s_clk_init, "allwinner,sun6i-a31s", sun6i_init_clocks);
|
CLK_OF_DECLARE(sun6i_a31s_clk_init, "allwinner,sun6i-a31s", sun6i_init_clocks);
|
||||||
CLK_OF_DECLARE(sun8i_a23_clk_init, "allwinner,sun8i-a23", sun6i_init_clocks);
|
CLK_OF_DECLARE(sun8i_a23_clk_init, "allwinner,sun8i-a23", sun6i_init_clocks);
|
||||||
|
CLK_OF_DECLARE(sun8i_a33_clk_init, "allwinner,sun8i-a33", sun6i_init_clocks);
|
||||||
|
|
||||||
static void __init sun9i_init_clocks(struct device_node *node)
|
static void __init sun9i_init_clocks(struct device_node *node)
|
||||||
{
|
{
|
||||||
|
|
Загрузка…
Ссылка в новой задаче