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

Commit 0fd5e852 authored by Olof Johansson's avatar Olof Johansson
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 next/dt64

Amlogic 64-bit DT changes for v4.13
- cleanup/reorganize alphabetically to better avoid conflicts
- add HDMI and CVBS nodes for multiple boards
- new pinctrl pins: SPI, HDMI CEC
- SCPI: fix thermal sensor reporting

New board support
- NanoPi K2 (GXBB)
- R-Box Pro (GXM)

* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

: (36 commits)
  ARM64: dts: meson-gxl-s905x-p212: Add HDMI and CVBS nodes
  ARM64: dts: meson-gxl-s905x-khadas-vim: Add HDMI nodes
  ARM64: dts: meson-gxl-s905d-p230: Add HDMI nodes
  ARM64: dts: meson-gxbb-wetek-play2: Add HDMI and CVBS Nodes
  ARM64: dts: meson-gx: Fix sensors reporting from SCP
  ARM64: dts: meson-gxl: Add SPI pinctrl nodes
  ARM64: dts: meson-gxbb: Add SPI pinctrl nodes
  ARM64: dts: meson-gxl: Add Ethernet PHY LEDS pins nodes
  ARM64: dts: meson-gxl: Add CEC pins nodes
  ARM64: dts: meson-gxbb: Add CEC pins nodes
  ARM64: dts: Fix GXBB periphs pinctrl pull-enable register base
  ARM64: dts: Fix GXL periphs pinctrl pull-enable register base
  ARM64: dts: meson-gxl: Fix pinctrl periphs gpio-ranges
  arm64: dts: amlogic: Add NanoPi K2
  dt-bindings: arm: amlogic: Add NanoPi K2
  arm64: dts: meson-gxm: Add R-Box Pro
  dt-bindings: arm: amlogic: Add R-Box Pro
  dt-bindings: Add Kingnovel vendor prefix
  arm64: dts: meson-gx-p23x-q20x: Fix node order
  arm64: dts: meson-gxm-nexbox-a1: Fix node order
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8aba6143 27f87bd2

Documentation/devicetree/bindings/arm/amlogic.txt

+15 −7
Original line number Diff line number Diff line
@@ -29,26 +29,34 @@ Boards with the Amlogic Meson GXM S912 SoC shall have the following properties: 
  Required root node property:

    compatible: "amlogic,s912", "amlogic,meson-gxm";



Board compatible values:

Board compatible values (alphabetically, grouped by SoC):



  - "geniatech,atv1200" (Meson6)



  - "minix,neo-x8" (Meson8)

  - "tronfy,mxq" (Meson8b)



  - "hardkernel,odroid-c1" (Meson8b)

  - "tronfy,mxq" (Meson8b)



  - "amlogic,p200" (Meson gxbb)

  - "amlogic,p201" (Meson gxbb)

  - "friendlyarm,nanopi-k2" (Meson gxbb)

  - "hardkernel,odroid-c2" (Meson gxbb)

  - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)

  - "tronsmart,vega-s95-pro", "tronsmart,vega-s95" (Meson gxbb)

  - "tronsmart,vega-s95-meta", "tronsmart,vega-s95" (Meson gxbb)

  - "tronsmart,vega-s95-telos", "tronsmart,vega-s95" (Meson gxbb)

  - "hardkernel,odroid-c2" (Meson gxbb)

  - "amlogic,p200" (Meson gxbb)

  - "amlogic,p201" (Meson gxbb)

  - "wetek,hub" (Meson gxbb)

  - "wetek,play2" (Meson gxbb)



  - "amlogic,p212" (Meson gxl s905x)

  - "hwacom,amazetv" (Meson gxl s905x)

  - "khadas,vim" (Meson gxl s905x)



  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

  - "hwacom,amazetv" (Meson gxl s905x)



  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

  - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)

  - "kingnovel,r-box-pro" (Meson gxm S912)

  - "nexbox,a1" (Meson gxm s912)

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ keithkoep Keith & Koep GmbH 
keymile	Keymile GmbH

khadas	Khadas

kinetic Kinetic Technologies

kingnovel	Kingnovel Technology Co., Ltd.

kosagi	Sutajio Ko-Usagi PTE Ltd.

kyo	Kyocera Corporation

lacie	LaCie

arch/arm64/boot/dts/amlogic/Makefile

+5 −3
Original line number Diff line number Diff line 
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

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p200.dtb
@@ -7,15 +8,16 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb

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-nexbox-a95x.dtb

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

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

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

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

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.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-nexbox-a1.dtb

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



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

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

+30 −30
Original line number Diff line number Diff line
@@ -121,19 +121,42 @@ 
	};

};



/* This UART is brought out to the DB9 connector */

&uart_AO {

&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;

	};

};



&ethmac {

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

};



&hdmi_tx {

	status = "okay";

	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;

	pinctrl-names = "default";

};



&hdmi_tx_tmds_port {

	hdmi_tx_tmds_out: endpoint {

		remote-endpoint = <&hdmi_connector_in>;

	};

};



&ir {

	status = "okay";

	pinctrl-0 = <&remote_input_ao_pins>;

	pinctrl-names = "default";

};



&pwm_ef {

	status = "okay";

	pinctrl-0 = <&pwm_e_pins>;

	pinctrl-names = "default";

	clocks = <&clkc CLKID_FCLK_DIV4>;

	clock-names = "clkin0";

};



/* Wireless SDIO Module */

&sd_emmc_a {

	status = "okay";
@@ -154,7 +177,7 @@ 
	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_boot>;



	brcmf: bcrmf@1 {

	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

	};
@@ -198,32 +221,9 @@ 
	vqmmc-supply = <&vddio_boot>;

};



&pwm_ef {

	status = "okay";

	pinctrl-0 = <&pwm_e_pins>;

	pinctrl-names = "default";

	clocks = <&clkc CLKID_FCLK_DIV4>;

	clock-names = "clkin0";

};



&ethmac {

	status = "okay";

};



&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;

	};

};



&hdmi_tx {

/* This UART is brought out to the DB9 connector */

&uart_AO {

	status = "okay";

	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};
 


&hdmi_tx_tmds_port {

	hdmi_tx_tmds_out: endpoint {

		remote-endpoint = <&hdmi_connector_in>;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ 
		};



		scpi_sensors: sensors {

			compatible = "arm,scpi-sensors";

			compatible = "amlogic,meson-gxbb-scpi-sensors", "arm,scpi-sensors";

			#thermal-sensor-cells = <1>;

		};

	};