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

Commit 09a56651 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Amlogic 64-bit DT updates for v4.10, round 2" from Kevin Hilman:

- new SoC support: S912/GXM series (8x A53)
- new boards: Nexbox A1 (S912), Nexbox A95X (S905X)
- resets for 2nd USB PHY
- update SCPI compatible for pre-v1.0 devices

* tag 'amlogic-dt64-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson-gxbb: add SCPI pre-1.0 compatible
  ARM64: dts: meson-gxl: Add support for Nexbox A95X
  ARM64: dts: meson-gxm: Add support for the Nexbox A1
  ARM64: dts: Add support for Meson GXM
  ARM64: dts: meson-gxbb: add the USB reset also to the second USB PHY
parents ec5260f2 c681ca42

Documentation/devicetree/bindings/arm/amlogic.txt

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ Boards with the Amlogic Meson GXL S905D SoC shall have the following properties: 
  Required root node property:

    compatible: "amlogic,s905d", "amlogic,meson-gxl";



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:

  - "geniatech,atv1200" (Meson6)

  - "minix,neo-x8" (Meson8)
@@ -39,3 +43,7 @@ Board compatible values: 
  - "amlogic,p212" (Meson gxl s905x)

  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

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

  - "nexbox,a1" (Meson gxm s912)

arch/arm64/boot/dts/amlogic/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.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-nexbox-a95x.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q201.dtb

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



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

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

+3 −1
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



#include "meson-gxl-s905d.dtsi"

/* Common DTSI for same Amlogic Q200/Q201 and P230/P231 boards using either

 * the pin-compatible S912 (GXM) or S905D (GXL) SoCs.

 */



/ {

	aliases {

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

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
	compatible = "amlogic,meson-gxbb";



	scpi {

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

		compatible = "amlogic,meson-gxbb-scpi", "arm,scpi-pre-1.0";

		mboxes = <&mailbox 1 &mailbox 2>;

		shmem = <&cpu_scp_lpri &cpu_scp_hpri>;
@@ -87,6 +87,7 @@ 
			compatible = "amlogic,meson-gxbb-usb2-phy";

			#phy-cells = <0>;

			reg = <0x0 0xc0000020 0x0 0x20>;

			resets = <&reset RESET_USB_OTG>;

			clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1>;

			clock-names = "usb_general", "usb";

			status = "disabled";

arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts

0 → 100644
+205 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016 Andreas Färber

 * Copyright (c) 2016 BayLibre, Inc.

 * Author: Neil Armstrong <narmstrong@kernel.org>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/dts-v1/;



#include "meson-gxl-s905x.dtsi"



/ {

	compatible = "nexbox,a95x", "amlogic,s905x", "amlogic,meson-gxl";

	model = "NEXBOX A95X (S905X)";



	aliases {

		serial0 = &uart_AO;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x80000000>;

	};



	vddio_card: gpio-regulator {

		compatible = "regulator-gpio";



		regulator-name = "VDDIO_CARD";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;



		gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;

		gpios-states = <1>;



		/* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */

		states = <1800000 0

			  3300000 1>;

	};



	vddio_boot: regulator-vddio_boot {

		compatible = "regulator-fixed";

		regulator-name = "VDDIO_BOOT";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	vddao_3v3: regulator-vddao_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDDAO_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	vcc_3v3: regulator-vcc_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VCC_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;

	};



	wifi32k: wifi32k {

		compatible = "pwm-clock";

		#clock-cells = <0>;

		clock-frequency = <32768>;

		pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */

	};



	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;

		clocks = <&wifi32k>;

		clock-names = "ext_clock";

	};

};



&uart_AO {

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&ethmac {

	status = "okay";

	phy-mode = "rmii";

	phy-handle = <&internal_phy>;

};



&ir {

	status = "okay";

	pinctrl-0 = <&remote_input_ao_pins>;

	pinctrl-names = "default";

};



/* Wireless SDIO Module */

&sd_emmc_a {

	status = "okay";

	pinctrl-0 = <&sdio_pins>;

	pinctrl-names = "default";

	#address-cells = <1>;

	#size-cells = <0>;



	bus-width = <4>;

	cap-sd-highspeed;

	max-frequency = <100000000>;



	non-removable;

	disable-wp;



	mmc-pwrseq = <&sdio_pwrseq>;



	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_boot>;

};



/* SD card */

&sd_emmc_b {

	status = "okay";

	pinctrl-0 = <&sdcard_pins>;

	pinctrl-names = "default";



	bus-width = <4>;

	cap-sd-highspeed;

	max-frequency = <100000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;

	cd-inverted;



	vmmc-supply = <&vddao_3v3>;

	vqmmc-supply = <&vddio_card>;

};



/* eMMC */

&sd_emmc_c {

	status = "okay";

	pinctrl-0 = <&emmc_pins>;

	pinctrl-names = "default";



	bus-width = <8>;

	cap-sd-highspeed;

	cap-mmc-highspeed;

	max-frequency = <200000000>;

	non-removable;

	disable-wp;

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;



	mmc-pwrseq = <&emmc_pwrseq>;

	vmmc-supply = <&vcc_3v3>;

	vqmmc-supply = <&vddio_boot>;

};



&pwm_ef {

	status = "okay";

	pinctrl-0 = <&pwm_e_pins>;

	pinctrl-names = "default";

	clocks = <&clkc CLKID_FCLK_DIV4>;

	clock-names = "clkin0";

};