diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-01-04 17:06:25 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-04 17:06:25 +0100 |
commit | d84baa5a62ed1e89da0e7f78d778794d47bc80af (patch) | |
tree | 8a8d36017dd2d5fdfdf4e6d46a764e412bb0953f /arch/arm/mach-versatile | |
parent | 3bfbed8d83a5c48d6c43178402a93b90c342a8f1 (diff) | |
parent | eac6a3639decefcc8eb0941dd3cebe79993670ad (diff) | |
download | linux-d84baa5a62ed1e89da0e7f78d778794d47bc80af.tar.gz linux-d84baa5a62ed1e89da0e7f78d778794d47bc80af.tar.bz2 linux-d84baa5a62ed1e89da0e7f78d778794d47bc80af.zip |
Merge tag 'sunxi-fixes-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Pull "Allwinner fixes for 4.15" from Chen-Yu Tsai:
First, one fix that adds proper regulator references for the EMAC
external PHYs on A64 boards. The EMAC bindings were developed for 4.13,
but reverted at the last minute. They were finalized and brought back
for 4.15. However in the time between, regulator support for the A64
boards was merged. When EMAC device tree changes were reintroduced,
this was not taken into account.
Second, a patch that adds OF based modalias uevent for RSB slave devices.
This has been missing since the introduction of RSB, and recently with
PMIC regulator support introduced for the A64, has been seen affecting
distributions, which have the all-important PMIC mfd drivers built as
modules, which then don't get loaded.
Other minor cleanups include final conversion of raw indices to CCU
binding macros for sun[4567]i HDMI, cleanup of dummy regulators on the
A64 SOPINE, a SD card detection polarity fix for the Orange Pi Zero
Plus2, and adding a missing compatible for the PMIC on the TBS A711
tablet.
* tag 'sunxi-fixes-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: sun8i: a711: Reinstate the PMIC compatible
arm64: dts: orange-pi-zero-plus2: fix sdcard detect
arm64: allwinner: a64-sopine: Fix to use dcdc1 regulator instead of vcc3v3
ARM: dts: sunxi: Convert to CCU index macros for HDMI controller
sunxi-rsb: Include OF based modalias in device uevent
arm64: allwinner: a64: add Ethernet PHY regulator for several boards
Diffstat (limited to 'arch/arm/mach-versatile')
0 files changed, 0 insertions, 0 deletions