Commit c35f6dc5 authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman
Browse files

arm64: dts: meson: Add minimal support for Odroid-N2 



This patch adds basic support for :
- Amlogic G12B, which is very similar to G12A
- The HardKernel Odroid-N2 based on the S922X SoC

The Amlogic G12B SoC is very similar with the G12A SoC, sharing
most of the features and architecture, but with these differences :
- The first CPU cluster only has 2xCortex-A53 instead of 4
- G12B has a second cluster of 4xCortex-A73
- Both cluster can achieve 2GHz instead of 1,8GHz for G12A
- CPU Clock architecture is difference, thus needing a different
  compatible to handle this slight difference
- Supports a MIPI CSI input
- Embeds a Mali-G52 instead of a Mali-G31, but integration is the same

Actual support is done in the same way as for the GXM support, including
the G12A dtsi and redefining the CPU clusters.
Unlike GXM, the first cluster is different, thus needing to remove
the last 2 cpu nodes of the first cluster.

Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Tested-by: default avatarAnand Moon <linux.amoon@gmail.com>
[khilman: add vin-supply for vcc_v5 as suggested by Anand Moon]
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 31137840

arch/arm64/boot/dts/amlogic/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 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-odroid-n2.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

arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts

0 → 100644
+290 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2019 BayLibre, SAS

 * Author: Neil Armstrong <narmstrong@baylibre.com>

 */



/dts-v1/;



#include "meson-g12b.dtsi"

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

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



/ {

	compatible = "hardkernel,odroid-n2", "amlogic,g12b";

	model = "Hardkernel ODROID-N2";



	aliases {

		serial0 = &uart_AO;

		ethernet0 = &ethmac;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@0 {

		device_type = "memory";

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

	};



	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;

	};



	leds {

		compatible = "gpio-leds";



		blue {

			label = "n2:blue";

			gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

		};

	};



	tflash_vdd: regulator-tflash_vdd {

		compatible = "regulator-fixed";



		regulator-name = "TFLASH_VDD";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



		gpio = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	tf_io: gpio-regulator-tf_io {

		compatible = "regulator-gpio";



		regulator-name = "TF_IO";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;



		gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;

		gpios-states = <0>;



		states = <3300000 0

			  1800000 1>;

	};



	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;

	};



	main_12v: regulator-main_12v {

		compatible = "regulator-fixed";

		regulator-name = "12V";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

	};



	vcc_5v: regulator-vcc_5v {

		compatible = "regulator-fixed";

		regulator-name = "5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		vin-supply = <&main_12v>;

	};



	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 */

	};



	hub_5v: regulator-hub_5v {

		compatible = "regulator-fixed";

		regulator-name = "HUB_5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&vcc_5v>;



		/* Connected to the Hub CHIPENABLE, LOW sets low power state */

		gpio = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;

		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>;



		/* Connected to the microUSB port power enable */

		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;

	};



	hdmi-connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&hdmi_tx_tmds_out>;

			};

		};

	};

};



&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>;

};



&ext_mdio {

	external_phy: ethernet-phy@0 {

		/* Realtek RTL8211F (0x001cc916) */	

		reg = <0>;

		max-speed = <1000>;

	};

};



&ethmac {

	pinctrl-0 = <&eth_pins>, <&eth_rgmii_pins>;

	pinctrl-names = "default";

	status = "okay";

	phy-mode = "rgmii";

	phy-handle = <&external_phy>;

	amlogic,tx-delay-ns = <2>;

};



&gpio {

	/*

	 * WARNING: The USB Hub on the Odroid-N2 needs a reset signal

	 * to be turned high in order to be detected by the USB Controller

	 * This signal should be handled by a USB specific power sequence

	 * in order to reset the Hub when USB bus is powered down.

	 */

	usb-hub {

		gpio-hog;

		gpios = <GPIOH_4 GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "usb-hub-reset";

	};

};



&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>;

	};

};



&ir {

	status = "okay";

	pinctrl-0 = <&remote_input_ao_pins>;

	pinctrl-names = "default";

};



/* SD card */

&sd_emmc_b {

	status = "okay";

	pinctrl-0 = <&sdcard_c_pins>;

	pinctrl-1 = <&sdcard_clk_gate_c_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <4>;

	cap-sd-highspeed;

	max-frequency = <50000000>;

	disable-wp;



	cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;

	vmmc-supply = <&tflash_vdd>;

	vqmmc-supply = <&tf_io>;



};



/* eMMC */

&sd_emmc_c {

	status = "okay";

	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;

	pinctrl-1 = <&emmc_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <8>;

	cap-mmc-highspeed;

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;

	max-frequency = <200000000>;

	disable-wp;



	mmc-pwrseq = <&emmc_pwrseq>;

	vmmc-supply = <&vcc_3v3>;

	vqmmc-supply = <&flash_1v8>;

};



&uart_AO {

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&usb {

	status = "okay";

	vbus-supply = <&usb_pwr_en>;

};



&usb2_phy0 {

	phy-supply = <&vcc_5v>;

};



&usb2_phy1 {

	/* Enable the hub which is connected to this port */

	phy-supply = <&hub_5v>;

};

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

0 → 100644
+82 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2019 BayLibre, SAS

 * Author: Neil Armstrong <narmstrong@baylibre.com>

 */



#include "meson-g12a.dtsi"



/ {

	compatible = "amlogic,g12b";



	cpus {

		cpu-map {

			cluster0 {

				core0 {

					cpu = <&cpu0>;

				};



				core1 {

					cpu = <&cpu1>;

				};

			};



			cluster1 {

				core0 {

					cpu = <&cpu100>;

				};



				core1 {

					cpu = <&cpu101>;

				};



				core2 {

					cpu = <&cpu102>;

				};



				core3 {

					cpu = <&cpu103>;

				};

			};

		};



		/delete-node/ cpu@2;

		/delete-node/ cpu@3;



		cpu100: cpu@100 {

			device_type = "cpu";

			compatible = "arm,cortex-a73";

			reg = <0x0 0x100>;

			enable-method = "psci";

			next-level-cache = <&l2>;

		};



		cpu101: cpu@101 {

			device_type = "cpu";

			compatible = "arm,cortex-a73";

			reg = <0x0 0x101>;

			enable-method = "psci";

			next-level-cache = <&l2>;

		};



		cpu102: cpu@102 {

			device_type = "cpu";

			compatible = "arm,cortex-a73";

			reg = <0x0 0x102>;

			enable-method = "psci";

			next-level-cache = <&l2>;

		};



		cpu103: cpu@103 {

			device_type = "cpu";

			compatible = "arm,cortex-a73";

			reg = <0x0 0x103>;

			enable-method = "psci";

			next-level-cache = <&l2>;

		};

	};

};



&clkc {

	compatible = "amlogic,g12b-clkc";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE