summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-07-25 23:56:06 -0700
committerOlof Johansson <olof@lixom.net>2018-07-25 23:56:06 -0700
commit74e828c8913c4390b751232f33bf9bfeb0bacf95 (patch)
tree8e08f47129bd07ec97c06f38bcab3c912b3314aa /Documentation
parentba8e2b94d9a74d28d662f8f8a03169ffd92bf54e (diff)
parentecbd611882a18cc5e720e752cae92d1198b198ec (diff)
downloadlinux-74e828c8913c4390b751232f33bf9bfeb0bacf95.tar.gz
linux-74e828c8913c4390b751232f33bf9bfeb0bacf95.tar.bz2
linux-74e828c8913c4390b751232f33bf9bfeb0bacf95.zip
Merge tag 'sunxi-dt64-for-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
Allwinner arm64 DT changes for 4.19 Some interesting changes, especially: - MMC support for the H6 - PMIC support for the PineH64 - HDMI simplefb support for the A64 - PWM support for the A64 - New board: Pinebook, Amarula A64-Relic * tag 'sunxi-dt64-for-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (22 commits) arm64: allwinner: h6: enable MMC0/2 on Pine H64 arm64: allwinner: h6: add device tree nodes for MMC controllers dt-binding: mmc: sunxi: add H6 compatible (with A64 fallback) arm64: dts: allwinner: a64: Remove unused address-cells/size-cells of dwmac-sun8i arm64: dts: allwinner: h6: enable AXP805 PMIC on Pine H64 arm64: dts: allwinner: h6: Use macros for R_CCU clock and reset indices arm64: dts: allwinner: a64: add HDMI regulator to all DTs' simplefb_hdmi arm64: dts: allwinner: a64: add device tree node for HDMI simplefb arm64: dts: allwinner: a64: add necessary device tree nodes for DE2 CCU arm64: dts: allwinner: h6: Add LED device nodes for Pine H64 arm64: allwinner: a64: allow laptops to wake up from lid arm64: allwinner: a64: change TERES-I DLDO3's name to start with "vdd" arm64: allwinner: a64-sopine: Add cd-gpios to mmc0 node arm64: dts: allwinner: a64: add SRAM controller device tree node arm64: dts: allwinner: add support for Pinebook arm64: dts: allwinner: a64: Add PWM controllers arm64: dts: allwinner: a64: add R_I2C controller arm64: allwinner: a64-amarula-relic: Enable AP6330 WiFi support arm64: allwinner: a64: Add RTC clock to phandle 32kHz external oscillator arm64: allwinner: a64: Add Amarula A64-Relic initial support ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/mmc/sunxi-mmc.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt b/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt
index 132e0007d7d6..e9cb3ec5e502 100644
--- a/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt
@@ -16,6 +16,8 @@ Required properties:
* "allwinner,sun9i-a80-mmc"
* "allwinner,sun50i-a64-emmc"
* "allwinner,sun50i-a64-mmc"
+ * "allwinner,sun50i-h6-emmc", "allwinner.sun50i-a64-emmc"
+ * "allwinner,sun50i-h6-mmc", "allwinner.sun50i-a64-mmc"
- reg : mmc controller base registers
- clocks : a list with 4 phandle + clock specifier pairs
- clock-names : must contain "ahb", "mmc", "output" and "sample"