diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 12:28:48 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 12:28:48 +0100 |
| commit | 7598a4e035b81c5e2a3dae17b33d77232141124a (patch) | |
| tree | 38aa05872def89de9862b1a1b3aaeed545b68160 /Documentation/devicetree/bindings/pinctrl | |
| parent | e4ccf203ff1f826709f72daa85b6ee90bd7de4ed (diff) | |
| parent | 43b9f617b5f98f2f7abb508fef5e535e5fb66a41 (diff) | |
| download | lwn-7598a4e035b81c5e2a3dae17b33d77232141124a.tar.gz lwn-7598a4e035b81c5e2a3dae17b33d77232141124a.zip | |
Merge tag 'amlogic-dt64-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
Pull "Amlogic 64-bit DT updates for v4.16, round 2" from Kevin Hilman:
This adds a few more basics (clock, pinctrl, PWM, reset) for the new AXG
family of Amlogic SoCs.
* tag 'amlogic-dt64-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: dts: meson-axg: add new reset DT node
ARM64: dts: meson-axg: add PWM DT info for Meson-Axg SoC
ARM64: dts: meson-axg: add pinctrl DT info for Meson-AXG SoC
documentation: Add compatibles for Amlogic Meson AXG pin controllers
arm64: dts: meson-axg: add clock DT info for Meson AXG SoC
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl')
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt index 2392557ede27..2c12f9789116 100644 --- a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt @@ -9,6 +9,8 @@ Required properties for the root node: "amlogic,meson-gxbb-aobus-pinctrl" "amlogic,meson-gxl-periphs-pinctrl" "amlogic,meson-gxl-aobus-pinctrl" + "amlogic,meson-axg-periphs-pinctrl" + "amlogic,meson-axg-aobus-pinctrl" - reg: address and size of registers controlling irq functionality === GPIO sub-nodes === |