Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c92b326 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 8ad83e3c e9a12e14

Documentation/devicetree/bindings/arm/amlogic.yaml

+17 −3
Original line number Diff line number Diff line
@@ -91,13 +91,11 @@ properties: 
      - description: Boards with the Amlogic Meson GXL S905X SoC

        items:

          - enum:

              - amediatech,x96-max

              - amlogic,p212

              - hwacom,amazetv

              - khadas,vim

              - libretech,cc

              - nexbox,a95x

              - seirobotics,sei510

          - const: amlogic,s905x

          - const: amlogic,meson-gxl
@@ -129,16 +127,32 @@ properties: 
          - const: amlogic,a113d

          - const: amlogic,meson-axg



      - description: Boards with the Amlogic Meson G12A S905D2 SoC

      - description: Boards with the Amlogic Meson G12A S905D2/X2/Y2 SoC

        items:

          - enum:

              - amediatech,x96-max

              - amlogic,u200

              - seirobotics,sei510

          - const: amlogic,g12a



      - description: Boards with the Amlogic Meson G12B A311D SoC

        items:

          - enum:

              - khadas,vim3

          - const: amlogic,a311d

          - const: amlogic,g12b



      - description: Boards with the Amlogic Meson G12B S922X SoC

        items:

          - enum:

              - hardkernel,odroid-n2

              - khadas,vim3

          - const: amlogic,s922x

          - const: amlogic,g12b



      - description: Boards with the Amlogic Meson SM1 S905X3 SoC

        items:

          - enum:

              - seirobotics,sei610

          - const: amlogic,sm1

...

Documentation/devicetree/bindings/media/amlogic,vdec.txt

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Required properties: 
	- GXBB (S905) : "amlogic,gxbb-vdec"

	- GXL (S905X, S905D) : "amlogic,gxl-vdec"

	- GXM (S912) : "amlogic,gxm-vdec"

	followed by the common "amlogic,gx-vdec"

- reg: base address and size of he following memory-mapped regions :

	- dos

	- esparser
@@ -47,8 +48,8 @@ Required properties: 


Example:



vdec: video-decoder@c8820000 {

	compatible = "amlogic,gxbb-vdec";

vdec: video-codec@c8820000 {

	compatible = "amlogic,gxbb-vdec", "amlogic,gx-vdec";

	reg = <0x0 0xc8820000 0x0 0x10000>,

	      <0x0 0xc110a580 0x0 0xe4>;

	reg-names = "dos", "esparser";

arch/arm64/boot/dts/amlogic/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
@@ -32,3 +34,4 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ 
				 <&clkc CLKID_FCLK_DIV2>,

				 <&clkc CLKID_MPLL2>;

			clock-names = "stmmaceth", "clkin0", "clkin1";

			rx-fifo-depth = <4096>;

			tx-fifo-depth = <2048>;

			status = "disabled";

		};

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

0 → 100644
+2420 −0

File added.

Preview size limit exceeded, changes collapsed.