diff options
author | Olof Johansson <olof@lixom.net> | 2017-08-29 22:25:07 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-08-29 22:25:07 -0700 |
commit | 1df295087079e2c87cc52e8aa3c6c87c62e88895 (patch) | |
tree | dae0f4f93fbf28b3ae0f6d2ddb9ba4d394131604 /arch/arm64/boot/dts/amlogic/meson-gx.dtsi | |
parent | Merge tag 'mvebu-dt64-4.14-3' of git://git.infradead.org/linux-mvebu into next/dt64 (diff) | |
parent | ARM64: dts: meson-gxl-libretech-cc: Add GPIO lines names (diff) | |
download | linux-dev-1df295087079e2c87cc52e8aa3c6c87c62e88895.tar.xz linux-dev-1df295087079e2c87cc52e8aa3c6c87c62e88895.zip |
Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64
Amlogic 64-bit DT updates for v4.14, round 2
- clock updates w/dependencies on clock tree
- GPIO names updates
* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM64: dts: meson-gxl-libretech-cc: Add GPIO lines names
ARM64: dts: meson-gx: Add AO CEC nodes
ARM64: dts: meson-gx: update AO clkc to new bindings
dt-bindings: clock: gxbb-aoclk: Add CEC 32k clock
clk: meson: gxbb: Add sd_emmc clk0 clkids
clk: meson-gxbb: expose almost every clock in the bindings
clk: meson8b: expose every clock in the bindings
clk: meson: gxbb: fix protection against undefined clks
clk: meson: meson8b: fix protection against undefined clks
dt-bindings: clock: meson8b: describe the embedded reset controller
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gx.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 8814708947fc..f175db846286 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -367,11 +367,21 @@ #size-cells = <2>; ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>; - clkc_AO: clock-controller@040 { - compatible = "amlogic,gx-aoclkc", "amlogic,gxbb-aoclkc"; - reg = <0x0 0x00040 0x0 0x4>; - #clock-cells = <1>; - #reset-cells = <1>; + sysctrl_AO: sys-ctrl@0 { + compatible = "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd"; + reg = <0x0 0x0 0x0 0x100>; + + clkc_AO: clock-controller { + compatible = "amlogic,meson-gx-aoclkc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + }; + + cec_AO: cec@100 { + compatible = "amlogic,meson-gx-ao-cec"; + reg = <0x0 0x00100 0x0 0x14>; + interrupts = <GIC_SPI 199 IRQ_TYPE_EDGE_RISING>; }; sec_AO: ao-secure@140 { |