Commit 8bdc2e56 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-h3-h5-for-4.20' of... 

Merge tag 'sunxi-h3-h5-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner H3 and H5 DT additions for 4.20

This is our usual H3/H5 pull request

The most notable changes are:
  - the video decoding / encoding unit is finally enabled on the H3
  - Mali support for the H5
  - New boards: BananaPi M2+ v1.2, Orange Pi Zero Plus 2 H3 support

* tag 'sunxi-h3-h5-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  ARM: dts: sunxi: h3-h5: Add Bananapi M2+ v1.2 device trees
  ARM: dts: sun8i-h3: Add Video Engine and reserved memory nodes
  arm64: dts: allwinner: h5: Add device tree for Bananapi M2 Plus H5
  ARM: dts: sun8i: h3: Split out non-SoC-specific parts of Bananapi M2 Plus
  ARM: dts: sun8i: h3: bpi-m2-plus: Fix address for external RGMII Ethernet PHY
  ARM: dts: sun8i: h3-h5: ir register size should be the whole memory block
  arm64: dts: allwinner: h5: Add device node for Mali-450 GPU
  ARM: dts: sun8i: Add initial Orangepi Zero Plus 2 H3 support
  nvmem: sunxi-sid: add support for H5's SID controller

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 83d52cd0 6eeb4180

Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
  "allwinner,sun8i-a83t-sid"

  "allwinner,sun8i-h3-sid"

  "allwinner,sun50i-a64-sid"

  "allwinner,sun50i-h5-sid"



- reg: Should contain registers location and length

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1035,6 +1035,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h2-plus-orangepi-r1.dtb \

	sun8i-h2-plus-orangepi-zero.dtb \

	sun8i-h3-bananapi-m2-plus.dtb \

	sun8i-h3-bananapi-m2-plus-v1.2.dtb \

	sun8i-h3-beelink-x2.dtb \

	sun8i-h3-libretech-all-h3-cc.dtb \

	sun8i-h3-nanopi-m1.dtb	\
@@ -1048,6 +1049,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-orangepi-pc-plus.dtb \

	sun8i-h3-orangepi-plus.dtb \

	sun8i-h3-orangepi-plus2e.dtb \

	sun8i-h3-orangepi-zero-plus2.dtb \

	sun8i-r16-bananapi-m2m.dtb \

	sun8i-r16-nintendo-nes-classic.dtb \

	sun8i-r16-nintendo-super-nes-classic.dtb \

arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus-v1.2.dts

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

/*

 * Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org>

 */



/dts-v1/;

#include "sun8i-h3.dtsi"

#include "sunxi-bananapi-m2-plus-v1.2.dtsi"



/ {

	model = "Banana Pi BPI-M2-Plus v1.2 H3";

	compatible = "bananapi,bpi-m2-plus-v1.2", "allwinner,sun8i-h3";

};

arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts

+2 −188
Original line number Diff line number Diff line
@@ -42,195 +42,9 @@ 


/dts-v1/;

#include "sun8i-h3.dtsi"

#include "sunxi-common-regulators.dtsi"



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

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

#include "sunxi-bananapi-m2-plus.dtsi"



/ {

	model = "Banana Pi BPI-M2-Plus";

	model = "Banana Pi BPI-M2-Plus H3";

	compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_con_in: endpoint {

				remote-endpoint = <&hdmi_out_con>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";



		pwr_led {

			label = "bananapi-m2-plus:red:pwr";

			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */

			default-state = "on";

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";



		sw4 {

			label = "power";

			linux,code = <BTN_0>;

			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;

		};

	};



	reg_gmac_3v3: gmac-3v3 {

		      compatible = "regulator-fixed";

		      regulator-name = "gmac-3v3";

		      regulator-min-microvolt = <3300000>;

		      regulator-max-microvolt = <3300000>;

		      startup-delay-us = <100000>;

		      enable-active-high;

		      gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */

	};

};



&de {

	status = "okay";

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&ehci2 {

	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_rgmii_pins>;

	phy-supply = <&reg_gmac_3v3>;

	phy-handle = <&ext_rgmii_phy>;

	phy-mode = "rgmii";



	status = "okay";

};



&external_mdio {

	ext_rgmii_phy: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <0>;

	};

};



&hdmi {

	status = "okay";

};



&hdmi_out {

	hdmi_out_con: endpoint {

		remote-endpoint = <&hdmi_con_in>;

	};

};



&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

	status = "okay";

};



&mmc0 {

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */

	status = "okay";

};



&mmc1 {

	vmmc-supply = <&reg_vcc3v3>;

	vqmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";



	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&pio>;

		interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */

		interrupt-names = "host-wake";

	};

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_8bit_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	vqmmc-supply = <&reg_vcc3v3>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&reg_usb0_vbus {

	gpio = <&pio 3 11 GPIO_ACTIVE_HIGH>; /* PD11 */

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usbphy {

	usb0_id_det-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	/* USB host VBUS is on as long as VCC-IO is on */

	status = "okay";

};

arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts

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

 * Copyright (C) 2017 Jagan Teki <jteki@openedev.com>

 * Copyright (C) 2018 Diego Rondini <diego.rondini@kynetics.com>

 *

 * 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 file 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 file 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 "sun8i-h3.dtsi"



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



/ {

	model = "OrangePi Zero Plus2 H3";

	compatible = "xunlong,orangepi-zero-plus2-h3", "allwinner,sun8i-h3";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	connector {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_con_in: endpoint {

				remote-endpoint = <&hdmi_out_con>;

			};

		};

	};



	reg_vcc3v3: vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */

		post-power-on-delay-ms = <200>;

	};

};



&de {

	status = "okay";

};



&hdmi {

	status = "okay";

};



&hdmi_out {

	hdmi_out_con: endpoint {

		remote-endpoint = <&hdmi_con_in>;

	};

};



&mmc0 {

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;

	status = "okay";

};



&mmc1 {

	vmmc-supply = <&reg_vcc3v3>;

	vqmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";



	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&r_pio>;

		interrupts = <0 7 IRQ_TYPE_LEVEL_LOW>;	/* PL7 */

		interrupt-names = "host-wake";

	};

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_8bit_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <8>;

	non-removable;

	cap-mmc-hw-reset;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE