Commit 5a74e85a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-dt64' of... 

Merge tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

arm64: dts: Amlogic updates for v5.6
- new boards: libretech-pc (S912 and S905D versions)
- new board: Videostrong KII Pro
- A1: add reset controller

* tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: add audio fifo depths
  arm64: dts: meson: add libretech-pc boards support
  dt-bindings: arm: amlogic: add libretech-pc bindings
  arm64: dts: meson: gxl: add i2c C pins
  arm64: dts: meson-sm1: add video decoder compatible
  arm64: dts: meson-g12-common: add video decoder node
  arm64: dts: meson-gxbb: add support for Videostrong KII Pro
  dt-bindings: arm: amlogic: add Videostrong KII Pro bindings
  dt-bindings: Add vendor prefix for Videostrong
  arm64: dts: meson: a1: add pinctrl controller support
  arm64: dts: meson: add reset controller for Meson-A1 SoC

Link: https://lore.kernel.org/r/7hsgkidi3k.fsf@baylibre.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 116a4b85 be638075

Documentation/devicetree/bindings/arm/amlogic.yaml

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ properties: 
              - friendlyarm,nanopi-k2

              - hardkernel,odroid-c2

              - nexbox,a95x

              - videostrong,kii-pro

              - wetek,hub

              - wetek,play2

          - const: amlogic,meson-gxbb
@@ -104,6 +105,7 @@ properties: 
          - enum:

              - amlogic,p230

              - amlogic,p231

              - libretech,aml-s905d-pc

              - phicomm,n1

          - const: amlogic,s905d

          - const: amlogic,meson-gxl
@@ -115,6 +117,7 @@ properties: 
              - amlogic,q201

              - khadas,vim2

              - kingnovel,r-box-pro

              - libretech,aml-s912-pc

              - nexbox,a1

              - tronsmart,vega-s96

          - const: amlogic,s912

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1012,6 +1012,8 @@ patternProperties: 
    description: Variscite Ltd.

  "^via,.*":

    description: VIA Technologies, Inc.

  "^videostrong,.*":

    description: Videostrong Technology Co., Ltd.

  "^virtio,.*":

    description: Virtual I/O Device Specification, developed by the OASIS consortium

  "^vishay,.*":

arch/arm64/boot/dts/amlogic/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 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-g12b-ugoos-am6.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb

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

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
@@ -29,11 +30,13 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb

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-s912-libretech-pc.dtb

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

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

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb

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

+25 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/gpio/meson-a1-gpio.h>



/ {

	compatible = "amlogic,a1";
@@ -74,6 +75,30 @@ apb: bus@fe000000 { 
			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x1000000>;





			reset: reset-controller@0 {

				compatible = "amlogic,meson-a1-reset";

				reg = <0x0 0x0 0x0 0x8c>;

				#reset-cells = <1>;

			};



			periphs_pinctrl: pinctrl@0400 {

				compatible = "amlogic,meson-a1-periphs-pinctrl";

				#address-cells = <2>;

				#size-cells = <2>;

				ranges;



				gpio: bank@0400 {

					reg = <0x0 0x0400 0x0 0x003c>,

					      <0x0 0x0480 0x0 0x0118>;

					reg-names = "mux", "gpio";

					gpio-controller;

					#gpio-cells = <2>;

					gpio-ranges = <&periphs_pinctrl 0 0 62>;

				};



			};



			uart_AO: serial@1c00 {

				compatible = "amlogic,meson-gx-uart",

					     "amlogic,meson-ao-uart";

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

+6 −0
Original line number Diff line number Diff line
@@ -1169,6 +1169,7 @@ toddr_a: audio-controller@100 { 
				interrupts = <GIC_SPI 84 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc_audio AUD_CLKID_TODDR_A>;

				resets = <&arb AXG_ARB_TODDR_A>;

				amlogic,fifo-depth = <512>;

				status = "disabled";

			};
@@ -1180,6 +1181,7 @@ toddr_b: audio-controller@140 { 
				interrupts = <GIC_SPI 85 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc_audio AUD_CLKID_TODDR_B>;

				resets = <&arb AXG_ARB_TODDR_B>;

				amlogic,fifo-depth = <256>;

				status = "disabled";

			};
@@ -1191,6 +1193,7 @@ toddr_c: audio-controller@180 { 
				interrupts = <GIC_SPI 86 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc_audio AUD_CLKID_TODDR_C>;

				resets = <&arb AXG_ARB_TODDR_C>;

				amlogic,fifo-depth = <256>;

				status = "disabled";

			};
@@ -1202,6 +1205,7 @@ frddr_a: audio-controller@1c0 { 
				interrupts = <GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;

				resets = <&arb AXG_ARB_FRDDR_A>;

				amlogic,fifo-depth = <512>;

				status = "disabled";

			};
@@ -1213,6 +1217,7 @@ frddr_b: audio-controller@200 { 
				interrupts = <GIC_SPI 89 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc_audio AUD_CLKID_FRDDR_B>;

				resets = <&arb AXG_ARB_FRDDR_B>;

				amlogic,fifo-depth = <256>;

				status = "disabled";

			};
@@ -1224,6 +1229,7 @@ frddr_c: audio-controller@240 { 
				interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc_audio AUD_CLKID_FRDDR_C>;

				resets = <&arb AXG_ARB_FRDDR_C>;

				amlogic,fifo-depth = <256>;

				status = "disabled";

			};