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

Commit 6d599c8d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64-2' of... 

Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64

Pull "Amlogic 64-bit DT changes for v4.13 (round 2)" from Kevin Hilman:

- support new SPI controller driver
- several more leaf clocks exposed to DT
- New board: S905x LibreTech CC board

* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson-gxl: Add Libre Technology CC support
  dt-bindings: arm: amlogic: Add Libre Technology CC board
  dt-bindings: add Libre Technology vendor prefix
  ARM64: dts: meson-gx: Add SPICC nodes
  clk: meson-gxbb: un-export the CPU clock
  clk: meson-gxbb: expose UART clocks
  clk: meson-gxbb: expose SPICC gate
  clk: meson-gxbb: expose spdif master clock
  clk: meson-gxbb: expose i2s master clock
  clk: meson-gxbb: expose spdif clock gates
parents 2b29ca22 cd84aff1

Documentation/devicetree/bindings/arm/amlogic.txt

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ Board compatible values (alphabetically, grouped by SoC): 
  - "amlogic,p212" (Meson gxl s905x)

  - "hwacom,amazetv" (Meson gxl s905x)

  - "khadas,vim" (Meson gxl s905x)

  - "libretech,cc" (Meson gxl s905x)



  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ lantiq Lantiq Semiconductor 
lego	LEGO Systems A/S

lenovo	Lenovo Group Ltd.

lg	LG Corporation

libretech	Shenzhen Libre Technology Co., Ltd

licheepi	Lichee Pi

linaro	Linaro Limited

linux	Linux-specific binding

arch/arm64/boot/dts/amlogic/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb

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

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb

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

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

+9 −0
Original line number Diff line number Diff line
@@ -304,6 +304,15 @@ 
				status = "disabled";

			};



			spicc: spi@8d80 {

				compatible = "amlogic,meson-gx-spicc";

				reg = <0x0 0x08d80 0x0 0x80>;

				interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};



			spifc: spi@8c80 {

				compatible = "amlogic,meson-gx-spifc", "amlogic,meson-gxbb-spifc";

				reg = <0x0 0x08c80 0x0 0x80>;

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

+7 −0
Original line number Diff line number Diff line
@@ -671,6 +671,13 @@ 
	clock-names = "core", "clkin0", "clkin1";

};



&spicc {

	clocks = <&clkc CLKID_SPICC>;

	clock-names = "core";

	resets = <&reset RESET_PERIPHS_SPICC>;

	num-cs = <1>;

};



&spifc {

	clocks = <&clkc CLKID_SPI>;

};