Commit 1e673237 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

arm64: dts: Amlogic updates for v5.2, round 2
- add display/gfx support for G12a boards
- enable USB for g12a boards

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

: (26 commits)
  arm64: dts: meson-g12a-u200: Add support for Video Display
  arm64: dts: meson-g12a-sei510: Add support for Video Display
  arm64: dts: meson-g12a-x96-max: Add support for Video Display
  arm64: dts: meson-g12a: Add AO-CEC nodes
  arm64: dts: meson-g12a: Add VPU and HDMI related nodes
  arm64: dts: meson-g12a-x96-max: Enable USB
  arm64: dts: meson-g12a-u200: Enable USB
  arm64: dts: meson-g12a-sei510: Enable USB
  arm64: dts: meson-g12a-sei510: Add ADC Key and BT support
  arm64: dts: meson-g12a-u200: add regulators
  arm64: dts: meson: g12a: Add mali-g31 gpu node
  arm64: dts: meson: g12a: Add G12A USB nodes
  arm64: dts: meson: g12a: Add SAR ADC node
  dt-bindings: power: amlogic, meson-gx-pwrc: Add G12A compatible
  arm64: dts: meson-gxm: Add Mali-T820 node
  dt-bindings: gpu: mali-midgard: Add resets property
  dt-bindings: clock: meson8b: export the video decoder clocks
  dt-bindings: clock: meson8b: export the VPU clock
  dt-bindings: clock: g12a-aoclk: expose CLKID_AO_CTS_OSCIN
  dt-bindings: clock: meson8b: drop the "ABP" clock definition
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 31c5d501 659f2563

Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt

+14 −0
Original line number Diff line number Diff line
@@ -37,6 +37,20 @@ Optional properties: 
- operating-points-v2 : Refer to Documentation/devicetree/bindings/opp/opp.txt

  for details.



- resets : Phandle of the GPU reset line.



Vendor-specific bindings

------------------------



The Mali GPU is integrated very differently from one SoC to

another. In order to accomodate those differences, you have the option

to specify one more vendor-specific compatible, among:



- "amlogic,meson-gxm-mali"

  Required properties:

  - resets : Should contain phandles of :

    + GPU reset line

    + GPU APB glue reset line



Example for a Mali-T760:

Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ Device Tree Bindings: 
---------------------



Required properties:

- compatible: should be "amlogic,meson-gx-pwrc-vpu" for the Meson GX SoCs

- compatible: should be one of the following :

	- "amlogic,meson-gx-pwrc-vpu" for the Meson GX SoCs

	- "amlogic,meson-g12a-pwrc-vpu" for the Meson G12A SoCs

- #power-domain-cells: should be 0

- amlogic,hhi-sysctrl: phandle to the HHI sysctrl node

- resets: phandles to the reset lines needed for this power demain sequence

arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts

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


#include "meson-g12a.dtsi"

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

#include <dt-bindings/input/input.h>

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



/ {
@@ -17,6 +18,19 @@ 
		serial0 = &uart_AO;

	};



	adc_keys {

		compatible = "adc-keys";

		io-channels = <&saradc 0>;

		io-channel-names = "buttons";

		keyup-threshold-microvolt = <1800000>;



		button-onoff {

			label = "On/Off";

			linux,code = <KEY_POWER>;

			press-threshold-microvolt = <1700000>;

		};

	};



	ao_5v: regulator-ao_5v {

		compatible = "regulator-fixed";

		regulator-name = "AO_5V";
@@ -30,6 +44,16 @@ 
		stdout-path = "serial0:115200n8";

	};



	cvbs-connector {

		compatible = "composite-video-connector";



		port {

			cvbs_connector_in: endpoint {

				remote-endpoint = <&cvbs_vdac_out>;

			};

		};

	};



	dc_in: regulator-dc_in {

		compatible = "regulator-fixed";

		regulator-name = "DC_IN";
@@ -47,6 +71,17 @@ 
		regulator-always-on;

	};



	hdmi-connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&hdmi_tx_tmds_out>;

			};

		};

	};



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x40000000>;
@@ -87,7 +122,55 @@ 
		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};

};



&cec_AO {

	pinctrl-0 = <&cec_ao_a_h_pins>;

	pinctrl-names = "default";

	status = "disabled";

	hdmi-phandle = <&hdmi_tx>;

};



&cecb_AO {

	pinctrl-0 = <&cec_ao_b_h_pins>;

	pinctrl-names = "default";

	status = "okay";

	hdmi-phandle = <&hdmi_tx>;

};



&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;

	};

};



&saradc {

	status = "okay";

	vref-supply = <&vddio_ao1v8>;

};



&uart_A {

	status = "okay";

	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;

	pinctrl-names = "default";

	uart-has-rtscts;



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;

	};

};



&hdmi_tx {

	status = "okay";

	pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;

	pinctrl-names = "default";

};



&hdmi_tx_tmds_port {

	hdmi_tx_tmds_out: endpoint {

		remote-endpoint = <&hdmi_connector_in>;

	};

};



&uart_AO {
@@ -95,3 +178,8 @@ 
	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&usb {

	status = "okay";

	dr_mode = "host";

};

arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts

+145 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
/dts-v1/;



#include "meson-g12a.dtsi"

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

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



/ {

	compatible = "amlogic,u200", "amlogic,g12a";
@@ -21,6 +23,137 @@ 
		device_type = "memory";

		reg = <0x0 0x0 0x0 0x40000000>;

	};



	cvbs-connector {

		compatible = "composite-video-connector";



		port {

			cvbs_connector_in: endpoint {

				remote-endpoint = <&cvbs_vdac_out>;

			};

		};

	};



	flash_1v8: regulator-flash_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "FLASH_1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vcc_3v3>;

		regulator-always-on;

	};



	hdmi-connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&hdmi_tx_tmds_out>;

			};

		};

	};



	main_12v: regulator-main_12v {

		compatible = "regulator-fixed";

		regulator-name = "12V";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

	};



	vcc_1v8: regulator-vcc_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "VCC_1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vcc_3v3>;

		regulator-always-on;

	};



	vcc_3v3: regulator-vcc_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VCC_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

		/* FIXME: actually controlled by VDDCPU_B_EN */

	};



	vcc_5v: regulator-vcc_5v {

		compatible = "regulator-fixed";

		regulator-name = "VCC_5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&main_12v>;



		gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;

		enable-active-high;

	};



	usb_pwr_en: regulator-usb_pwr_en {

		compatible = "regulator-fixed";

		regulator-name = "USB_PWR_EN";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&vcc_5v>;



		gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vddao_1v8: regulator-vddao_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "VDDAO_1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};



	vddao_3v3: regulator-vddao_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDDAO_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&main_12v>;

		regulator-always-on;

	};



};



&cec_AO {

	pinctrl-0 = <&cec_ao_a_h_pins>;

	pinctrl-names = "default";

	status = "disabled";

	hdmi-phandle = <&hdmi_tx>;

};



&cecb_AO {

	pinctrl-0 = <&cec_ao_b_h_pins>;

	pinctrl-names = "default";

	status = "okay";

	hdmi-phandle = <&hdmi_tx>;

};



&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;

	};

};



&hdmi_tx {

	status = "okay";

	pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;

	pinctrl-names = "default";

	hdmi-supply = <&vcc_5v>;

};



&hdmi_tx_tmds_port {

	hdmi_tx_tmds_out: endpoint {

		remote-endpoint = <&hdmi_connector_in>;

	};

};



&uart_AO {
@@ -29,3 +162,15 @@ 
	pinctrl-names = "default";

};



&usb {

	status = "okay";

	vbus-supply = <&usb_pwr_en>;

};



&usb2_phy0 {

	phy-supply = <&vcc_5v>;

};



&usb2_phy1 {

	phy-supply = <&vcc_5v>;

};

arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts

+59 −0
Original line number Diff line number Diff line
@@ -24,6 +24,27 @@ 
		reg = <0x0 0x0 0x0 0x40000000>;

	};



	cvbs-connector {

		compatible = "composite-video-connector";



		port {

			cvbs_connector_in: endpoint {

				remote-endpoint = <&cvbs_vdac_out>;

			};

		};

	};



	hdmi-connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&hdmi_tx_tmds_out>;

			};

		};

	};



	flash_1v8: regulator-flash_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "FLASH_1V8";
@@ -90,6 +111,39 @@ 
	};

};



&cec_AO {

	pinctrl-0 = <&cec_ao_a_h_pins>;

	pinctrl-names = "default";

	status = "disabled";

	hdmi-phandle = <&hdmi_tx>;

};



&cecb_AO {

	pinctrl-0 = <&cec_ao_b_h_pins>;

	pinctrl-names = "default";

	status = "okay";

	hdmi-phandle = <&hdmi_tx>;

};



&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;

	};

};



&hdmi_tx {

	status = "okay";

	pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;

	pinctrl-names = "default";

	hdmi-supply = <&vcc_5v>;

};



&hdmi_tx_tmds_port {

	hdmi_tx_tmds_out: endpoint {

		remote-endpoint = <&hdmi_connector_in>;

	};

};



&uart_A {

	status = "okay";

	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
@@ -107,3 +161,8 @@ 
	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&usb {

	status = "okay";

	dr_mode = "host";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE