diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 15:14:53 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 15:14:54 +0200 |
| commit | 1c92b32649f950c78c36d15b2e7ecbed1dcf024c (patch) | |
| tree | 8a7367dbc3db0f85514f7f9a3d073a2053b877a0 /arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | |
| parent | 8ad83e3c8f1e9998aa3a7cb284ce773b5b4823f6 (diff) | |
| parent | e9a12e14322d7ddafeed6aec0d3fb02c0b5dc03c (diff) | |
Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: Amlogic updates for v5.4
Highlights
- new SoCs (G12B family): S922X, A311D
- new SoCs (SM1 family): S905X3
- new board: SEI Robotics SEI610 (SM1/S905X3)
- new board: Khadas VIM3 (G12B/A311D)
- DVFS/CPUfreq support on G12[AB] family
* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (40 commits)
arm64: dts: add support for SM1 based SEI Robotics SEI610
dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings
dt-bindings: arm: amlogic: add SM1 bindings
arm64: dts: meson-g12b-odroid-n2: enable DVFS
arm64: dts: meson-g12b-khadas-vim3: add initial device-tree
dt-bindings: arm: amlogic: fix x96-max/sei510 section in amlogic.yaml
arm64: dts: amlogic: g12 CPU timers stop in suspend
arm64: dts: meson-g12b: support a311d and s922x cpu operating points
dt-bindings: arm: amlogic: add support for the Khadas VIM3
dt-bindings: arm: amlogic: add bindings for the Amlogic G12B based A311D SoC
dt-bindings: arm: amlogic: add bindings for G12B based S922X SoC
arm64: dts: meson: add video decoder entries
arm64: dts: meson-gx: add video decoder entry
dt-bindings: media: amlogic,vdec: add default compatible
arm64: dts: meson: add ethernet fifo sizes
arm64: dts: meson-g12b: add cpus OPP tables
arm64: dts: meson-g12a: enable DVFS on G12A boards
arm64: dts: meson-g12a: add cpus OPP table
arm64: dts: meson-g12-common: add pwm_a on GPIOE_2 pinmux
arm64: dts: move common G12A & G12B modes to meson-g12-common.dtsi
...
Link: https://lore.kernel.org/r/7hr25fbi4v.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index f734faaf7b78..0cb40326b0d3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -845,3 +845,14 @@ compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; power-domains = <&pwrc_vpu>; }; + +&vdec { + compatible = "amlogic,gxbb-vdec", "amlogic,gx-vdec"; + clocks = <&clkc CLKID_DOS_PARSER>, + <&clkc CLKID_DOS>, + <&clkc CLKID_VDEC_1>, + <&clkc CLKID_VDEC_HEVC>; + clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc"; + resets = <&reset RESET_PARSER>; + reset-names = "esparser"; +}; |