diff options
author | Olof Johansson <olof@lixom.net> | 2017-09-05 20:41:43 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-09-05 20:41:43 -0700 |
commit | b884026a2b80529fc7a4de729b92ee0ba555bfed (patch) | |
tree | 2209b3faf920ff1f7cc5e78645aea5e04bac2c14 /arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | |
parent | Merge tag 'at91-ab-4.14-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt (diff) | |
parent | Merge tag 'mvebu-dt64-4.14-4' of git://git.infradead.org/linux-mvebu into next/dt64 (diff) | |
download | linux-dev-b884026a2b80529fc7a4de729b92ee0ba555bfed.tar.xz linux-dev-b884026a2b80529fc7a4de729b92ee0ba555bfed.zip |
Merge branch 'next/dt64' into next/dt
* next/dt64: (233 commits)
arm64: dts: marvell: mcbin: enable more networking ports
arm64: dts: marvell: add a reference to the sysctrl syscon in the ppv2 node
arm64: dts: marvell: add TX interrupts for PPv2.2
arm64: dts: uniphier: add PXs3 SoC support
arm64: dts: uniphier: fix size of sdctrl node
arm64: dts: uniphier: add AIDET nodes
arm64: dts: uniphier: add reset controller node of analog amplifier
arm64: dts: marvell: add Device Tree files for Armada-8KP
arm64: dts: rockchip: add Haikou baseboard with RK3399-Q7 SoM
arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM
dt-bindings: add rk3399-q7 SoM
arm64: dts: rockchip: add rk3328-rock64 board
arm64: dts: rockchip: add rk3328 pdm node
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
arm64: dts: rockchip: add more rk3399 iommu nodes
arm64: dts: rockchip: add rk3368 iommu nodes
arm64: dts: rockchip: add rk3328 iommu nodes
arm64: zynqmp: Add generic compatible string for I2C EEPROM
...
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts')
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index a1078b3e1c76..9c59c3c6d1b6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -171,6 +171,13 @@ }; }; +&cec_AO { + status = "okay"; + pinctrl-0 = <&ao_cec_pins>; + pinctrl-names = "default"; + hdmi-phandle = <&hdmi_tx>; +}; + ðmac { status = "okay"; pinctrl-0 = <ð_rmii_pins>; |