Linux mainlining history

This page contains history of mainlining effort up to kernel version 4.18. Newer versions can be seen on the main Sunxi Linux Mainlining Effort page.

Merged into 4.18
Driver Changes
 * A33
 * MIPI DSI


 * A83t
 * SMP Support


 * H6
 * R_CCU / PRCM
 * R_PIO


 * R40
 * EMAC support

Device Tree Changes
 * A33
 * MIPI DSI


 * A83t
 * SMP Support
 * SID


 * H3 / H5
 * R_I2C
 * CPUFreq


 * H6
 * R_CCU / PRCM
 * R_PIO
 * R_INTC
 * R_I2C
 * PCF8563 RTC for PineH64


 * R40
 * EMAC support
 * Ethernet enabled for Banana Pi M2 Ultra

New Devices Supported
 * Nintendo NES Classic Edition
 * Libre Computer Board ALL-H3-CC‎ ver. H2+ / H5
 * Olimex A20-SOM-EVB-eMMC

Merged into 4.17
Driver changes


 * A80
 * SMP


 * A83T
 * HDMI support
 * PMIC ADC and Battery power supply support


 * H3 / H5
 * HDMI support


 * H6
 * Basic support
 * PIO pinctrl support (R_PIO not supported)
 * CCU clock/reset support (R_CCU/PRCM not supported)

Device tree changes


 * A64
 * SimpleFB
 * I2S
 * SPDIF
 * Watchdog


 * SPI enabled for Orange Pi R1


 * SDIO WiFi enabled for FriendlyARM NanoPi NEO Air


 * eMMC enabled for FriendlyARM Nanopi M1 Plus, FriendlyARM NanoPi NEO Air


 * HDMI video output enabled for MK802, MK808C, Mele I7, Banana Pi M3, Banana Pi, Orange Pi Mini, Banana Pi M2+, Beelink X2, Libre Computer ALL-H3-CC, FriendlyARM NanoPi M1, Xunlong Orange Pi 2, Xunlong Orange Pi Lite, Xunlong Orange Pi One, Orange Pi PC, Orange Pi PC 2, Xunlong Orange Pi Prime, Xunlong Orange Pi Zero Plus 2


 * LEDs enabled for Banana Pi M3


 * VGA output enabled for Cubieboard 4


 * Audio codec enabled for Olimex A33-OLinuXino


 * Power supplies enabled for Olimex A33-OLinuXino, A23/A33 reference tablet design, TBS A711 (battery only)

New devices supported
 * Olimex TERES-I laptop
 * Xunlong Orange Pi Zero Plus
 * Olimex A20-SOM204
 * PineH64

Merged into 4.16
Drivers:
 * Display
 * LVDS support
 * DE2 (multi-plane support, HW scaling)
 * A83T
 * Display (LCD) support
 * I2S support
 * H3/H5
 * SimpleFB support

Device tree changes:
 * SoC specific
 * A83T
 * I2C, I2S added
 * First display pipeline (LCD/LVDS)
 * GPIO for AXP81x PMIC
 * H3/H5
 * SimpleFB


 * Board specific
 * Audio codec enabled for Olimex A13-Olinuxino
 * WiFi/BT enabled for Xunlong Orange Pi Zero Plus 2
 * AXP803 regulators added for Xunlong Orange Pi Win
 * EMAC enabled for FriendlyARM NanoPi NEO Plus2, Cubietech Cubietruck Plus, Sinovoip Banana Pi M3, FriendlyARM NanoPi M1
 * USB OTG enabled for FriendlyARM NanoPi NEO
 * LEDs enabled for Sinovoip Banana Pi M64
 * HDMI enabled for LinkSprite pcDuino3 Nano

New boards supported:
 * Xunlong Orange Pi R1
 * Libre Computer Board ALL-H3-CC (H3 variant)

Merged into 4.15
Drivers:
 * A10/A20/A31
 * display
 * HDMI controller
 * sunxi-ng clocks
 * audio PLL sigma-delta modulation support for accurate audio playback
 * A33
 * Audio codec fixes
 * A64
 * DMA controller

Device tree changes:
 * SoC specific
 * A10/A20
 * CCU sunxi-ng style clock conversion
 * Display pipeline
 * HDMI controller
 * A31
 * HDMI controller
 * I2S controllers
 * A64
 * DMA controller
 * EMAC
 * SPI
 * H3/H5
 * EMAC
 * R40
 * Basic dtsi
 * Watchdog
 * USB


 * Board specific
 * IR receiver for FriendlyARM NanoPi M1
 * WiFi, BT and IR receiver for FriendlyARM Nanopi M1 Plus
 * HDMI enabled on Merrii Hummingbird A31, Sinlinx SinA31s, MSI Primo81, Cubietech Cubieboard, Cubietech Cubieboard2, Cubietech Cubietruck, Banana Pi M1+, Olimex A10-OLinuXino-Lime, Olimex A20-OLinuXino-Lime, Olimex A20-OLinuXino-Lime2, Olimex A20-OLinuXino-Micro
 * ACIN and Battery power supplies enabled on Lamobo R1 and A13 reference design tablets
 * AXP803 PMIC regulators and WiFi enabled for Allwinner A83TDevBoard, Banana Pi M3, Cubietech Cubietruck Plus
 * AXP803 PMIC regulators and USB OTG enabled for TBS A711
 * EMAC re-enabled for various A64/H3/H5 boards


 * Cleanups
 * Removal of GPIO pinmux settings for A10 and A80

New boards supported:
 * TBS A711
 * FriendlyARM NanoPi NEO Plus2
 * Olimex A20-OLinuXino-Micro eMMC variant
 * Banana Pi M2 Ultra
 * Sinovoip Banana Pi M2 Berry

Merged into 4.14
Drivers:


 * A10s
 * HDMI DDC I2C Adapter
 * HDMI CEC support
 * most of Allwinner SoC
 * sun4i-ss SecuritySystem PRNG driver
 * A10/A20
 * CCU Clock-ng support
 * A10/A20/A31/A33/H3
 * MUSB fixes (commit) (commit)
 * A64
 * SRAM controller driver
 * A83T
 * SD/MMC support
 * AXP813 PMIC
 * USB support
 * H3
 * I2S support
 * R40
 * CCU sunxi-ng style clock driver support
 * pinctrl support


 * AXP PMICs
 * PEK time fix for AXP22x

Device tree changes:
 * SoC specific
 * A83T / A64
 * R_INTC interrupt controller
 * A83T
 * RSB support
 * SD/MMC support
 * AXP813 PMIC and codec
 * USB host support


 * Board specific
 * AXP803 basic support and regulators for Pine64 and SoPine
 * USB and WiFi enabled for Sinovoip Banana Pi M64
 * Ethernet for Beelink X2
 * USB OTG for Beelink X2
 * SD/MMC for Cubietech Cubietruck Plus and Allwinner A83TDevBoard
 * AXP813 PMIC for Cubietech Cubietruck Plus and Allwinner A83TDevBoard
 * AC100 chip for Cubietech Cubietruck Plus and Allwinner A83TDevBoard
 * USB hosts for Cubietech Cubietruck Plus and Allwinner A83TDevBoard

New boards supported:


 * Sinovoip Banana Pi M2 Magic
 * Olimex A64-OLinuXino
 * FriendlyARM NanoPi A64
 * Sinovoip Banana Pi M3

Merged into 4.13
Drivers:


 * A10s
 * HDMI support


 * V3s
 * Clock driver for Display Engine 2.0
 * DRM/KMS display driver support for Display Engine 2.0
 * codec support


 * A64 / A83T / H2+ / H3 / H5
 * dwmac-sun8i ethernet driver Unfinished due to unstable DT binding


 * A83T
 * Clock driver

Device tree changes:


 * SoC Specific
 * LRADC, MMC1, SPI, Display Engine 2.0 for V3s


 * Board Specific
 * Enable AXP PMIC battery support on NextThingCo CHIP, Sinlinx SinA33
 * Enable USB OTG on Banana Pi M2+, Orange Pi PC, Orange Pi PC Plus, Orange Pi Plus 2E
 * Enable dedicated USB hosts for USB OTG on Pine64
 * Enable dwmac-sun8i for Ethernet on various boards Removed due to unstable DT binding

Added board support:
 * FriendlyARM NanoPi NEO2
 * Xunlong Orange Pi Prime
 * Xunlong Orange Pi Win
 * Orange Pi Zero Plus 2 H5
 * LicheePi Zero dock board

Merged into 4.12

 * H3
 * USB OTG support


 * H5
 * New SoC variant, similar to H3, but ARM64 with Cortex-A53 cores.
 * pinctrl driver
 * CCU (sunxi-ng) driver
 * USB OTG support


 * A31/H3 SPI
 * Support transfers larger than 64 bytes


 * AXP PMICs
 * AXP803 basic support
 * ACIN Power Supply driver
 * ADC IIO driver
 * Battery Power Supply driver

Added board support: FriendlyARM NanoPi NEO Air, Xunlong Orange Pi PC 2

Merged into 4.11

 * A23
 * Audio codec device tree changes


 * A31
 * SPDIF output support


 * A33
 * cpufreq support
 * Audio codec support


 * A64
 * MMC Support
 * USB support


 * A80
 * sunxi-ng style clock support


 * H2+
 * New SoC variant, similar to H3


 * H3
 * Audio codec device tree changes
 * SPDIF output support


 * V3s
 * New SoC support
 * USB PHY driver
 * pinctrl driver
 * CCU driver

Added board support: LicheePi One, Xunlong Orange Pi Zero, LicheePi Zero, Sinovoip Banana Pi M64

Merged into 4.10

 * A23
 * Audio Codec driver


 * A31/A31s
 * Display Driver (first pipeline)
 * Audio Codec support


 * A64
 * Clock driver


 * A80
 * External SDIO WiFi


 * H3
 * Audio Codec driver
 * SPI

Added board support: NextThingCo CHIP Pro, Pine64, FriendlyARM NanoPi M1

Merged into 4.9

 * GR8
 * SoC Support


 * AXP209
 * GPIO support


 * A31
 * SPDIF support


 * A23/A33
 * sunxi-ng CCU driver


 * A31/A31s
 * sunxi-ng CCU driver


 * A33
 * Display Driver


 * A64
 * USB PHY support


 * H3
 * PWM support
 * I2C support


 * AXP806 PMIC
 * regulator support


 * AC100 RTC / codec IC
 * mfd driver
 * RTC driver

Added board support: Orange Pi PC Plus, Olimex A33-OLinuXino, Xunlong Orange Pi Lite, Inet q972, Empire Electronix M712, Xunlong Orange Pi Plus 2, Xunlong Orange Pi Plus 2E, FriendlyARM NanoPi NEO,

Merged into 4.8

 * A10/A20
 * Display engine clocks (TCON, FE, DE)
 * I2S audio interface driver


 * H3
 * Clocks (through sunxi-ng)
 * USB multi-reset lines support
 * AXP2xx driver:
 * External drivebus support
 * AXP223 USB power supply support
 * AXP809 PMIC support


 * BCM53125 support
 * This switch is used in Lamobo / Banana Pi R1

Merged into 4.7

 * A13/R8
 * Display Engine support


 * A10/A20
 * SPDIF Support


 * A31/A23/H3 DMAengine improvements for H3 audio support (WiP: Jean-Francois Moine) patch-v6


 * H3
 * USB support (multi-reset line support delayed til 4.8)

Added board support:
 * Xunlong Orange Pi One
 * Xunlong Orange Pi 2
 * Xunlong Orange Pi PC
 * Dserve DSRV9703C
 * Polaroid MID2809PXE4
 * colorfly e708 q1
 * Difrence DIT4350

Merged into 4.6



 * Allwinner A83T support
 * Initial bringup
 * timer, watchdog and reboot


 * H3
 * R_PIO support


 * A64
 * pinctrl driver
 * generic arm64 Allwinner platform (ARCH_SUNXI) support


 * NAND
 * ECC layout definition rework (partially) and randomizer support


 * A10/A20 SPDIF driver


 * AXP223 PMIC support


 * eMMC HS-DDR support for all currently supported SoCs except A80

Added board support: Allwinner A83TDevBoard, Cubietech Cubietruck Plus

Merged into 4.5

 * Allwinner A80 support
 * IR receiver driver
 * NMI controller
 * PRCM driver
 * R_PIO support
 * RSB driver


 * Allwinner H3 SoC support
 * H3 USB PHY clocks


 * A10/A20 Video Engine clocks


 * MIC1 capture for sun4i codec


 * Audio codec enabled on various boards

Added board support: Xunlong Orange Pi Plus

A quick fix is to revert commit 88f8b1b which introduced the regression. See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-March/415939.html, https://www.mail-archive.com/netdev@vger.kernel.org/msg104119.html, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823493. Version v4.5-rc7 is known to be still okay, v4.6-rc2 fixes stmmac again.

Merged into 4.4

 * R8 SoC support


 * A10 / A20
 * CAN driver (commit)


 * A10 / A10s / A13 / A20
 * Audio Codec driver
 * Audio clocks (PLL2)
 * Audio codec related DTS bits
 * Enabled on Cubieboard, Cubieboard2, Cubietruck, C.H.I.P., Mele A1000


 * A23 / A33
 * RSB (Reduced Serial Bus) driver
 * PWM enabled


 * A83T
 * PIO driver


 * AXP202/AXP209
 * USB power supply driver
 * Support for OTG vbus detection via AXP pmic
 * DTS nodes for OTG vbus support

Added board support: Olimex A20 EVB (commit), Unified Q8 format tablet, Wits Pro A20 DKT (commit), Yones Toptech bs1078v2 (commit), Wobo i5 (commit), C.H.I.P (commit), Sinlinx SinA31s, MSI Primo81 (commit)

Merged into 4.3

 * A10 / A13 / A20 / A23 / A31
 * Enable OTG controller (commit)


 * A10 / A10s / A13 / A20
 * Support for DMA engine


 * A23 / A33
 * Support for USB-controllers


 * most of Allwinner SoC
 * Support for Security System (commit)


 * AXP152
 * AXP152 mfd support

Added board support: Iteaduino Plus A10, Ippo-q8h-a33 v1.2

Merged into 4.2

 * A10 / A10s / A13 / A20 / A31 / A23
 * SRAM Controller


 * A23
 * SMP support (commit)
 * Architected timer support


 * A31/A31s
 * CPUFreq support


 * A33
 * Machine support (commit)
 * Bring-up sharing most drivers with A23
 * pinctl driver (commit)
 * PIO controller (commit)


 * A80
 * Architected timer support
 * USB support


 * AXP221 PMIC driver


 * H3
 * Introduce H3 support (commit)
 * DMA Controller (commit)

Added board support: LinkSprite pcDuino3 Nano, Cubietech Cubieboard4, Gemei G9, Auxtek T004, Utoo P66, Wexler TAB 7200, MK808C, Jesurun Q5, Xunlong Orange Pi, Xunlong Orange Pi Mini, Sinlinx SinA33

Merged into 4.1

 * A80
 * USB PHY driver


 * AXP202/AXP209
 * DT bindings

Merged into 4.0

 * A10 / A20
 * PS/2 Controller


 * A13 / A31
 * IR receiver


 * A31s
 * bring-up sharing majority of drivers with A31
 * pinctrl driver


 * A80
 * MMC


 * All SoCs
 * LRADC Input driver
 * CPUFreq
 * PWM Driver


 * AXP209 power button input driver

Added board support: CSQ CS908, LeMaker Banana Pro, Chuwi V7 CW0825, Rikomagic mk802, Rikomagic mk802ii, Rikomagic mk802_a10s, MarsBoard A10, Hyundai A7HD

Merged into 3.19

 * A10 / A10s / A13 / A20 / A31 / A23
 * Simple Framebuffer
 * In order to use that, you'll need a recent mainline u-boot (2015.01+)
 * USB phy driver support for usb0


 * A10 / A20
 * NAND
 * Only works for SLC NAND for now
 * Some additional work is needed for MLC NANDs


 * A23
 * DMAengine driver (shared with A31)


 * A80
 * initial machine support
 * basic clocks and reset
 * pinctrl driver
 * extra UART, I2C, LEDS

Related merges: sunxi-simplefb-for-3.19

Added board support: Mele M3, LeMaker Banana Pi, Merrii A80 Optimus Board, Olimex A20-OLinuXino-Lime2

Merged into 3.18

 * A31/A23
 * RTC
 * Watchdog


 * A23
 * MMC
 * pinctrl
 * DMA
 * I2C

Added board support: Olimex A20-OLinuXino-Lime, Merrii Hummingbird A20, HSG H702

Merged into 3.17

 * A10/A20
 * IR driver


 * A31
 * PIO/R_PIO external interrupts
 * DMAengine
 * GMAC


 * A23
 * Timers, UARTs, initial bringup
 * Basic clocks
 * PIO/R_PIO drivers

Related merges: clk-for-linus-3.17, mfd-for-linus-3.17, pinctrl-v3.17-1, soc-for-3.17, dt-for-3.17, slave-dma for-linus, v4l_for_linus,

Added Board Support: Merrii Hummingbird A31, BA10, LinkSprite pcDuino V3, Ippo q8h

Merged into 3.16

 * AXP20x regulator support


 * All
 * MMC support


 * A31
 * USB support
 * PRCM
 * SMBus Regmap
 * Special Pins Muxer
 * P2WI Controller


 * A10
 * Touchscreen controller
 * Touchscreen controller temperature sensor

Related Merges:

defconfig-for-3.16, drivers-for-3.16, dt-for-3.16, soc-for-3.16, usb-3.16-rc1, pinctrl-v3.16-1, clk-for-linus-3.16, clk-for-linus-3.16-part2, mmc-updates-for-3.16-rc1, mfd-for-linus-3.16, regulator-v3.16, input-for-linus

Added board support: Mele M9, R7

Merged into 3.15

 * All SoCs
 * SPI
 * A10/A10s/A13/A20
 * OHCI
 * EHCI
 * A10/A20
 * AHCI
 * A20/A31
 * NMI controller
 * A20
 * GMAC
 * A31
 * I2C

Related merges:, , , , , ,

Added board support: LinkSprite_pcDuino, Inet 97f, A10-OLinuXino-LIME

Merged into 3.14

 * A31
 * Reset Controller Support
 * SMP
 * A20
 * SMP (via PSCI)
 * External clock outputs
 * High Speed Timers
 * RTC driver (A10/A20) (commit)
 * RTP (DT only)
 * GMAC support in stmmac driver
 * AP6210 WiFi (BCM43362) support in brcmfmac driver

Related merges:, , , ,

Added board support: Olimex A13-OLinuXino-Micro (commit)

Merged into 3.13

 * SID Driver
 * I2C for A20
 * sunxi_defconfig
 * Bug fixes

Added board support: Cubietruck

Merged into 3.12

 * A31 support
 * Basic SoC + GPIO
 * Clock support
 * A20 support
 * Basic SoC + GPIO
 * Clock support
 * A10s clocks
 * Clock Source and Clock Event rework
 * Watchdog driver

Related merges:, , , , ,

Added board support: A31 EVB, A20-OLinuXino-Micro, Cubieboard2, Mele A1000

Merged into 3.11

 * IRQ support for the PIO
 * I2C Driver
 * EMAC Driver
 * A10s support

Related merges:, , , , ,

Added board support: Olimex A10s-OLinuXino-Micro

Merged into 3.10

 * LED support
 * Clock driver
 * Complete UART support

Related merges:, ,

Added Board Support: Pineriver_H24

Merged into 3.9

 * PINCTRL driver
 * GPIO-lib based driver

Related merges:

Added Board Support: Miniand_Hackberry

Merged into 3.8

 * Initial support for Allwinner SoCs (commit)
 * Timer (commit)
 * UART
 * Device Tree
 * Interrupt controller (commit)

Related merges: ,

Added board support: Cubieboard, A13-OLinuXino