Linux mainlining history

From linux-sunxi.org
Jump to navigation Jump to search

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

New Devices Supported

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

New devices supported

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

New boards supported:

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
  • Cleanups
    • Removal of GPIO pinmux settings for A10 and A80

New boards supported:

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
  • A64
    • SRAM controller driver
  • A83T
    • SD/MMC support
    • AXP813 PMIC
    • USB support
  • H3
  • 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

New boards supported:

Merged into 4.13

Drivers:

  • 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

Device tree changes:

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

Added board support:

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
  • A31
    • SPDIF support
  • A33
    • Display Driver
  • A64
    • USB PHY support
  • H3
    • PWM support (commit)]
    • 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

Added board support: Banana Pi M2+ H2+, Banana Pi M1+

Merged into 4.7

  • A13/R8
    • Display Engine 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:

Merged into 4.6

  • Sticky-note-pin.png Note: For devices that use eMMC, old device trees may no longer work with this version (i.e. you have to rebuild your .dtb files). Expect eMMC I/O errors otherwise.
  • 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

Exclamation.png Known problems:

  • Release tag v4.5 contains a change that broke stmmac networking on quite a few sunxi devices. The symptoms are
[ 13.196778] libphy: PHY stmmac-0:ffffffff not found
[ 13.204800] eth0: Could not attach to PHY
[ 13.204809] stmmac_open: Cannot attach to PHY (error: -19)

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/[email protected]/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
  • A23 / A33
    • RSB (Reduced Serial Bus) driver
    • PWM enabled
  • 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), Sinovoip Banana Pi M2 (commit)

Merged into 4.3

  • A23 / A33
    • Support for USB-controllers

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

Merged into 4.2

  • A80
    • Architected timer support
    • USB support

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

Merged into 4.0

  • A31s
    • bring-up sharing majority of drivers with A31
    • pinctrl driver
    • Touchscreen controller
  • 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 [1]
      • Only works for SLC NAND for now
      • Some additional work is needed for MLC NANDs
  • A23
    • DMAengine driver (shared with A31) [2]
  • A80
    • initial machine support [3]
    • basic clocks and reset [4]
    • pinctrl driver [5]
    • extra UART, I2C, LEDS [6]

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

  • 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 [9]
    • Touchscreen controller temperature sensor [10]

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: [11], [12], [13], [14], [15], [16], [17]

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: [18], [19], [20], [21], [22]

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

Merged into 3.13

  • SID Driver
  • I2C for A20
  • sunxi_defconfig
  • Bug fixes [23]

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: [24], [25], [26], [27], [28], [29]

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: [30], [31], [32], [33], [34], [35]

Added board support: Olimex A10s-OLinuXino-Micro

Merged into 3.10

  • LED support
  • Clock driver
  • Complete UART support

Related merges: [36], [37], [38]

Added Board Support: Pineriver_H24

Merged into 3.9

  • PINCTRL driver
  • GPIO-lib based driver

Related merges: [39]

Added Board Support: Miniand_Hackberry

Merged into 3.8

Related merges: [40], [41]

Added board support: Cubieboard, A13-OLinuXino

Retrieved from "https://linux-sunxi.org/index.php?title=Linux_mainlining_history&oldid=23100"