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

Commit b69cfb5a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-h5-for-4.13' of... 

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

Allwinner H5 DT changes for 4.13

Just like the H3, this is mostly about enabling the EMAC on the H5, and
also has a new board, the Orange Pi Zero Plus 2

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

:
  arm64: allwinner: h5: Add initial Orangepi Zero Plus 2 support
  arm64: allwinner: h5: enable dwmac-sun8i for Nano Pi NEO2
  arm64: allwinner: h5: enable dwmac-sun8i for Orange Pi Prime
  arm64: allwinner: h5: sort the device nodes in / part for some boards
  arm64: allwinner: h5: add support for NanoPi NEO2 board
  arm64: allwinner: h5: add support for Orange Pi Prime board
  arm64: allwinner: orangepi-pc2: Enable dwmac-sun8i
  arm: sun8i: sunxi-h3-h5: add dwmac-sun8i ethernet driver
  arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module
  ARM: sunxi: h3-h5: Convert R_CCU raw numbers to macros

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 08d13c70 ea43d9b8

arch/arm/boot/dts/sunxi-h3-h5.dtsi

+45 −3
Original line number Original line Diff line number Diff line
@@ -41,8 +41,10 @@ 
 */

 */





#include <dt-bindings/clock/sun8i-h3-ccu.h>

#include <dt-bindings/clock/sun8i-h3-ccu.h>

#include <dt-bindings/clock/sun8i-r-ccu.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/reset/sun8i-h3-ccu.h>

#include <dt-bindings/reset/sun8i-h3-ccu.h>

#include <dt-bindings/reset/sun8i-r-ccu.h>





/ {

/ {

	interrupt-parent = <&gic>;

	interrupt-parent = <&gic>;
@@ -83,6 +85,12 @@ 
		#size-cells = <1>;

		#size-cells = <1>;

		ranges;

		ranges;





		syscon: syscon@1c00000 {

			compatible = "allwinner,sun8i-h3-system-controller",

				"syscon";

			reg = <0x01c00000 0x1000>;

		};



		dma: dma-controller@01c02000 {

		dma: dma-controller@01c02000 {

			compatible = "allwinner,sun8i-h3-dma";

			compatible = "allwinner,sun8i-h3-dma";

			reg = <0x01c02000 0x1000>;

			reg = <0x01c02000 0x1000>;
@@ -279,6 +287,14 @@ 
			interrupt-controller;

			interrupt-controller;

			#interrupt-cells = <3>;

			#interrupt-cells = <3>;





			emac_rgmii_pins: emac0 {

				pins = "PD0", "PD1", "PD2", "PD3", "PD4",

				       "PD5", "PD7", "PD8", "PD9", "PD10",

				       "PD12", "PD13", "PD15", "PD16", "PD17";

				function = "emac";

				drive-strength = <40>;

			};



			i2c0_pins: i2c0 {

			i2c0_pins: i2c0 {

				pins = "PA11", "PA12";

				pins = "PA11", "PA12";

				function = "i2c0";

				function = "i2c0";
@@ -375,6 +391,32 @@ 
			clocks = <&osc24M>;

			clocks = <&osc24M>;

		};

		};





		emac: ethernet@1c30000 {

			compatible = "allwinner,sun8i-h3-emac";

			syscon = <&syscon>;

			reg = <0x01c30000 0x104>;

			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			resets = <&ccu RST_BUS_EMAC>;

			reset-names = "stmmaceth";

			clocks = <&ccu CLK_BUS_EMAC>;

			clock-names = "stmmaceth";

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";



			mdio: mdio {

				#address-cells = <1>;

				#size-cells = <0>;

				int_mii_phy: ethernet-phy@1 {

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

					reg = <1>;

					clocks = <&ccu CLK_BUS_EPHY>;

					resets = <&ccu RST_BUS_EPHY>;

				};

			};

		};



		spi0: spi@01c68000 {

		spi0: spi@01c68000 {

			compatible = "allwinner,sun8i-h3-spi";

			compatible = "allwinner,sun8i-h3-spi";

			reg = <0x01c68000 0x1000>;

			reg = <0x01c68000 0x1000>;
@@ -573,9 +615,9 @@ 




		ir: ir@01f02000 {

		ir: ir@01f02000 {

			compatible = "allwinner,sun5i-a13-ir";

			compatible = "allwinner,sun5i-a13-ir";

			clocks = <&r_ccu 4>, <&r_ccu 11>;

			clocks = <&r_ccu CLK_APB0_IR>, <&r_ccu CLK_IR>;

			clock-names = "apb", "ir";

			clock-names = "apb", "ir";

			resets = <&r_ccu 0>;

			resets = <&r_ccu RST_APB0_IR>;

			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

			reg = <0x01f02000 0x40>;

			reg = <0x01f02000 0x40>;

			status = "disabled";

			status = "disabled";
@@ -585,7 +627,7 @@ 
			compatible = "allwinner,sun8i-h3-r-pinctrl";

			compatible = "allwinner,sun8i-h3-r-pinctrl";

			reg = <0x01f02c00 0x400>;

			reg = <0x01f02c00 0x400>;

			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&r_ccu 3>, <&osc24M>, <&osc32k>;

			clocks = <&r_ccu CLK_APB0_PIO>, <&osc24M>, <&osc32k>;

			clock-names = "apb", "hosc", "losc";

			clock-names = "apb", "hosc", "losc";

			gpio-controller;

			gpio-controller;

			#gpio-cells = <3>;

			#gpio-cells = <3>;

arch/arm64/boot/dts/allwinner/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,9 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-orangepi-win.dtb 
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb





always		:= $(dtb-y)

always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts

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

 * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io>

 *

 * 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 "sun50i-h5.dtsi"



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



/ {

	model = "FriendlyARM NanoPi NEO 2";

	compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	leds {

		compatible = "gpio-leds";



		pwr {

			label = "nanopi:green:pwr";

			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};



		status {

			label = "nanopi:blue:status";

			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;

		};

	};



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

	};



	reg_vcc3v3: vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	reg_usb0_vbus: usb0-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb0-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

		gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */

		status = "okay";

	};

};



&ehci0 {

	status = "okay";

};



&ehci3 {

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

};



&mdio {

	ext_rgmii_phy: ethernet-phy@7 {

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

		reg = <7>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci3 {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usbphy {

	/* USB Type-A port's VBUS is always on */

	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts

+27 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ 
	};

	};





	aliases {

	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial0 = &uart0;

	};

	};
@@ -91,6 +92,16 @@ 
		};

		};

	};

	};





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

	};



	reg_usb0_vbus: usb0-vbus {

	reg_usb0_vbus: usb0-vbus {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		regulator-name = "usb0-vbus";

		regulator-name = "usb0-vbus";
@@ -126,12 +137,28 @@ 
	status = "okay";

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

};



&ir {

&ir {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

	pinctrl-0 = <&ir_pins_a>;

	status = "okay";

	status = "okay";

};

};





&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

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

		reg = <1>;

	};

};



&mmc0 {

&mmc0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts

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

 * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.xyz>

 *

 * Based on sun50i-h5-orangepi-pc2.dts, which is:

 *   Copyright (C) 2016 ARM Ltd.

 *

 * 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 "sun50i-h5.dtsi"



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

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



/ {

	model = "Xunlong Orange Pi Prime";

	compatible = "xunlong,orangepi-prime", "allwinner,sun50i-h5";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	leds {

		compatible = "gpio-leds";



		pwr {

			label = "orangepi:green:pwr";

			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};



		status {

			label = "orangepi:red:status";

			gpios = <&pio 0 20 GPIO_ACTIVE_HIGH>;

		};

	};



	r-gpio-keys {

		compatible = "gpio-keys";



		sw4 {

			label = "sw4";

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

	};



	reg_vcc3v3: vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	reg_usb0_vbus: usb0-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb0-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

		gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */

		status = "okay";

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&pio 2 14 GPIO_ACTIVE_LOW>; /* PC14 */

	};

};



&codec {

	allwinner,audio-routing =

		"Line Out", "LINEOUT",

		"MIC1", "Mic",

		"Mic",  "MBIAS";

	status = "okay";

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&ehci2 {

	status = "okay";

};



&ehci3 {

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

};



&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

	status = "okay";

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

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

		reg = <1>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

	status = "okay";

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";

};



&ohci0 {

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

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usbphy {

	/* USB Type-A ports' VBUS is always on */

	usb0_id_det-gpios = <&pio 0 21 GPIO_ACTIVE_HIGH>; /* PA21 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	status = "okay";

};