[U-Boot] Pull request: u-boot-sunxi/master

Jagan Teki
2017-04-25T18:56:41Z

Hi Tom,

Please take this PR, probably the last PR for the release.

thanks!
Jagan.

The following changes since commit f6c1df44b815a08585e7fd3805a1db51a5955d09:

Prepare v2017.05-rc2 (2017-04-17 18:16:49 -0400)

are available in the git repository at:

git://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to e8f86a026125ff2b2d6bd6eac73d2542852aab84:

sunxi: fix the default value of CONS_INDEX on non-A23/A33 SUN8I (2017-04-25 11:44:21 +0200)

----------------------------------------------------------------
Andreas Färber (1):
sunxi: Fix arm64 fdtfile variable

Chen-Yu Tsai (13):
sunxi: Split up long Kconfig lines
sunxi: Add initial support for R40
sunxi: Enable AXP221s in I2C mode with the R40 SoC
sunxi: Fix watchdog reset function for R40
sunxi: Add mmc[1-3] pinmux settings for R40
sunxi: Set PLL lock enable bits for R40
sunxi: Provide defaults for R40 DRAM settings
gpio: sunxi: Add compatible string for R40 PIO
sunxi: Use H3/A64 DRAM initialization code for R40
sunxi: Enable SPL for R40
sunxi: Fix CPUCFG address for R40
sunxi: Add PSCI support for R40
sunxi: Add support for Bananapi M2 Ultra

Icenowy Zheng (4):
sunxi: add basic V3s support
sunxi: add DTSI file for V3s
sunxi: add support for Lichee Pi Zero
sunxi: fix the default value of CONS_INDEX on non-A23/A33 SUN8I

Jelle van der Waa (1):
sunxi: Add maintainer of the NanoPi NEO Air

Jernej Skrabec (3):
sunxi: video: Split out TCON code
sunxi: video: Convert lcdc to use struct display_timing
sunxi: Add clock support for DE2/HDMI/TCON on newer SoCs

Mylène Josserand (9):
sunxi: Move SUNXI_GMAC to Kconfig
sunxi: icnova-a20-swac_defconfig: Remove AXP209_POWER
sunxi: icnova-a20-swac_defconfig: Remove CMD_BMP from
sunxi: mk802_defconfig: Remove SYS_EXTRA_OPTIONS
sunxi: Convert SUNXI_EMAC to Kconfig
sunxi: Convert CONFIG_RGMII to Kconfig
sunxi: Convert CONFIG_SATAPWR to Kconfig
sunxi: Convert CONFIG_MACPWR to Kconfig
sunxi: Convert CONS_INDEX to Kconfig

arch/arm/cpu/armv7/sunxi/psci.c | 35 ++-
arch/arm/dts/Makefile | 4 +
arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts | 69 ++++++
arch/arm/dts/sun8i-r40.dtsi | 183 +++++++++++++++
arch/arm/dts/sun8i-v3s-licheepi-zero.dts | 83 +++++++
arch/arm/dts/sun8i-v3s.dtsi | 284 ++++++++++++++++++++++++
arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 56 +++++
arch/arm/include/asm/arch-sunxi/cpu.h | 1 +
arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 6 +-
arch/arm/include/asm/arch-sunxi/display.h | 103 ---------
arch/arm/include/asm/arch-sunxi/dram.h | 4 +-
arch/arm/include/asm/arch-sunxi/dram_sun8i_h3.h | 20 +-
arch/arm/include/asm/arch-sunxi/gpio.h | 1 +
arch/arm/include/asm/arch-sunxi/lcdc.h | 128 +++++++++++
arch/arm/include/asm/arch-sunxi/timer.h | 5 +-
arch/arm/include/asm/arch-sunxi/watchdog.h | 5 +-
arch/arm/mach-sunxi/Makefile | 1 +
arch/arm/mach-sunxi/board.c | 19 +-
arch/arm/mach-sunxi/clock_sun6i.c | 47 +++-
arch/arm/mach-sunxi/cpu_info.c | 4 +
arch/arm/mach-sunxi/dram_sun8i_h3.c | 121 ++++++++--
arch/arm/mach-sunxi/pmic_bus.c | 7 +
board/sunxi/Kconfig | 72 +++++-
board/sunxi/MAINTAINERS | 16 ++
board/sunxi/board.c | 48 +++-
configs/A10-OLinuXino-Lime_defconfig | 3 +-
configs/A10s-OLinuXino-M_defconfig | 2 +-
configs/A13-OLinuXinoM_defconfig | 1 -
configs/A13-OLinuXino_defconfig | 1 -
configs/A20-OLinuXino-Lime2_defconfig | 4 +-
configs/A20-OLinuXino-Lime_defconfig | 3 +-
configs/A20-OLinuXino_MICRO_defconfig | 3 +-
configs/A20-Olimex-SOM-EVB_defconfig | 4 +-
configs/Ampe_A76_defconfig | 1 -
configs/Bananapi_M2_Ultra_defconfig | 15 ++
configs/Bananapi_defconfig | 4 +-
configs/Bananapro_defconfig | 4 +-
configs/CHIP_defconfig | 1 -
configs/CHIP_pro_defconfig | 2 +-
configs/CSQ_CS908_defconfig | 2 +-
configs/Colombus_defconfig | 3 +-
configs/Cubieboard2_defconfig | 3 +-
configs/Cubieboard_defconfig | 3 +-
configs/Cubietruck_defconfig | 4 +-
configs/Empire_electronix_d709_defconfig | 1 -
configs/Empire_electronix_m712_defconfig | 1 -
configs/Hummingbird_A31_defconfig | 3 +-
configs/Itead_Ibox_A20_defconfig | 3 +-
configs/Lamobo_R1_defconfig | 5 +-
configs/LicheePi_Zero_defconfig | 12 +
configs/Linksprite_pcDuino3_Nano_defconfig | 4 +-
configs/Linksprite_pcDuino3_defconfig | 3 +-
configs/Linksprite_pcDuino_defconfig | 2 +-
configs/Marsboard_A10_defconfig | 2 +-
configs/Mele_A1000G_quad_defconfig | 2 +-
configs/Mele_A1000_defconfig | 3 +-
configs/Mele_I7_defconfig | 2 +-
configs/Mele_M3_defconfig | 2 +-
configs/Mele_M5_defconfig | 2 +-
configs/Mele_M9_defconfig | 2 +-
configs/Orangepi_defconfig | 4 +-
configs/Orangepi_mini_defconfig | 4 +-
configs/Sinlinx_SinA31s_defconfig | 2 +-
configs/Sinovoip_BPI_M2_defconfig | 3 +-
configs/Sinovoip_BPI_M3_defconfig | 2 +-
configs/Wits_Pro_A20_DKT_defconfig | 3 +-
configs/ba10_tv_box_defconfig | 2 +-
configs/difrnce_dit4350_defconfig | 1 -
configs/ga10h_v1_1_defconfig | 1 -
configs/gt90h_v4_defconfig | 1 -
configs/i12-tvbox_defconfig | 3 +-
configs/iNet_D978_rev2_defconfig | 1 -
configs/icnova-a20-swac_defconfig | 2 +-
configs/inet86dz_defconfig | 1 -
configs/inet98v_rev2_defconfig | 1 -
configs/jesurun_q5_defconfig | 3 +-
configs/mixtile_loftq_defconfig | 4 +-
configs/mk802_defconfig | 1 -
configs/orangepi_plus2e_defconfig | 2 +-
configs/orangepi_plus_defconfig | 3 +-
configs/polaroid_mid2407pxe03_defconfig | 1 -
configs/polaroid_mid2809pxe04_defconfig | 1 -
configs/q8_a13_tablet_defconfig | 1 -
configs/q8_a23_tablet_800x480_defconfig | 1 -
configs/q8_a33_tablet_1024x600_defconfig | 1 -
configs/q8_a33_tablet_800x480_defconfig | 1 -
configs/sun8i_a23_evb_defconfig | 1 -
drivers/gpio/sunxi_gpio.c | 1 +
drivers/net/Kconfig | 17 ++
drivers/power/Kconfig | 16 +-
drivers/serial/Kconfig | 11 +
drivers/video/Makefile | 2 +-
drivers/video/sunxi/Makefile | 8 +
drivers/video/sunxi/lcdc.c | 209 +++++++++++++++++
drivers/video/{ => sunxi}/sunxi_display.c | 220 ++++--------------
include/configs/sun8i.h | 2 +
include/configs/sunxi-common.h | 41 +++-
include/dt-bindings/clock/sun8i-v3s-ccu.h | 107 +++++++++
include/dt-bindings/reset/sun8i-v3s-ccu.h | 78 +++++++
99 files changed, 1793 insertions(+), 404 deletions(-)
create mode 100644 arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
create mode 100644 arch/arm/dts/sun8i-r40.dtsi
create mode 100644 arch/arm/dts/sun8i-v3s-licheepi-zero.dts
create mode 100644 arch/arm/dts/sun8i-v3s.dtsi
create mode 100644 arch/arm/include/asm/arch-sunxi/lcdc.h
create mode 100644 configs/Bananapi_M2_Ultra_defconfig
create mode 100644 configs/LicheePi_Zero_defconfig
create mode 100644 drivers/video/sunxi/Makefile
create mode 100644 drivers/video/sunxi/lcdc.c
rename drivers/video/{ => sunxi}/sunxi_display.c (87%)
create mode 100644 include/dt-bindings/clock/sun8i-v3s-ccu.h
create mode 100644 include/dt-bindings/reset/sun8i-v3s-ccu.h