Commit 69c5f266 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Allwinner H3/H5 changes for 4.21

Our usual pull request with the changes shared between the H3 and H5 SoCs.

The major changes for this release are:
  - Addition of the video engine for the H5
  - H3 Camera support
  - New board: Emlid Neutis N5, Mapleboard MP130

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

:
  arm64: dts: allwinner: h5: Add Video Engine node
  ARM/arm64: dts: allwinner: Move H3/H5 syscon label over to soc-specific nodes
  arm64: dts: allwinner: h5: Add system-control node with SRAM C1
  ARM: dts: sun8i: h3: Fix the system-control register range
  ARM: dts: sun8i: Add the H3/H5 CSI controller
  ARM: dts: sun8i-h3: Add dts for the Mapleboard MP130
  arm64: dts: allwinner: new board - Emlid Neutis N5
  dt-bindings: vendor-prefix: new vendor - Emlid
  ARM: dts: sun8i-h3: add sy8106a to orange pi plus

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5cc60b04 8be5b161

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ edt Emerging Display Technologies 
eeti	eGalax_eMPIA Technology Inc

elan	Elan Microelectronic Corp.

embest	Shenzhen Embest Technology Co., Ltd.

emlid	Emlid, Ltd.

emmicro	EM Microelectronic

emtrion	emtrion GmbH

endless	Endless Mobile, Inc.

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1062,6 +1062,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-bananapi-m2-plus-v1.2.dtb \

	sun8i-h3-beelink-x2.dtb \

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

	sun8i-h3-mapleboard-mp130.dtb \

	sun8i-h3-nanopi-m1.dtb	\

	sun8i-h3-nanopi-m1-plus.dtb \

	sun8i-h3-nanopi-neo.dtb \

arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts

0 → 100644
+153 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2017 Centrum Embedded Systems, Jia-Bin Huang <jb@ces.com.tw>

 * Copyright (C) 2018 Jonathan McDowell <noodles@earth.li>

 */



/dts-v1/;

#include "sun8i-h3.dtsi"

#include "sunxi-common-regulators.dtsi"



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

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



/ {

	model = "MapleBoard MP130";

	compatible = "mapleboard,mp130", "allwinner,sun8i-h3";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	leds {

		compatible = "gpio-leds";



		pwr_led {

			label = "mp130:orange:pwr";

			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};



		status_led {

			label = "mp130:orange:status";

			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;

		};

	};



	r_gpio_keys {

		compatible = "gpio-keys";



		power {

			label = "power";

			linux,code = <KEY_POWER>;

			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; /* PL3 */

		};



		user {

			label = "user";

			linux,code = <BTN_0>;

			gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>;

		};

	};

};



&codec {

	allwinner,audio-routing =

		"Line Out", "LINEOUT",

		"LINEIN", "Line In";

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&ehci2 {

	status = "okay";

};



&ehci3 {

	status = "okay";

};



&emac {

	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&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_HIGH>; /* PF6 */

	cd-inverted;

	status = "okay";

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_8bit_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <8>;

	non-removable;

	cap-mmc-hw-reset;

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&ohci3 {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>;

	status = "disabled";

};



&uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart2_pins>;

	status = "disabled";

};



&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>;

	status = "disabled";

};



&usb_otg {

	dr_mode = "peripheral";

	status = "okay";

};



&usbphy {

	/* USB VBUS is always on */

	status = "okay";

};

arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts

+20 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ 
	};

};



&cpu0 {

	cpu-supply = <&reg_vdd_cpux>;

};



&ehci3 {

	status = "okay";

};
@@ -119,6 +123,22 @@ 
	};

};



&r_i2c {

	status = "okay";



	reg_vdd_cpux: regulator@65 {

		compatible = "silergy,sy8106a";

		reg = <0x65>;

		regulator-name = "vdd-cpux";

		silergy,fixed-microvolt = <1200000>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1400000>;

		regulator-ramp-delay = <200>;

		regulator-boot-on;

		regulator-always-on;

	};

};



&usbphy {

	usb3_vbus-supply = <&reg_usb3_vbus>;

};

arch/arm/boot/dts/sun8i-h3.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ 
	};



	soc {

		system-control@1c00000 {

		syscon: system-control@1c00000 {

			compatible = "allwinner,sun8i-h3-system-control";

			reg = <0x01c00000 0x30>;

			reg = <0x01c00000 0x1000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;

CRA Git | Maintained and supported by SUSTech CRA and CCSE