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

Commit 08d13c70 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt64-for-4.13' of... 

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

Allwinner arm64 DT changes for 4.13

Our usual arm64 changes. The most notable things are the EMAC support and
USB support enhancements. There's also support for the SoPine SoM, and the
OrangePi Win.

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

:
  arm64: allwinner: a64: Add initial Orangepi Win/WinPlus support
  arm64: allwinner: a64: add device tree for SoPine with baseboard
  arm64: allwinner: bananapi-m64: Enable dwmac-sun8i
  arm64: allwinner: pine64-plus: Enable dwmac-sun8i
  arm64: allwinner: pine64: Enable dwmac-sun8i
  arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver
  arm64: allwinner: sun50i-a64: Add dt node for the syscon control module
  arm64: allwinner: a64: add DTSI file for SoPine SoM
  arm64: allwinner: a64: Convert CCU raw number references to macros
  arm64: dts: allwinner: pine64: Prepare optional UART nodes with pinctrl
  arm64: allwinner: a64: enable RSB on A64
  arm64: dts: allwinner: pine64: Add remaining UART aliases
  arm64: dts: allwinner: a64: Add UART2 pin nodes
  arm64: allwinner: a64: enable EHCI0/OHCI0 for Pine64
  arm64: allwinner: a64: add EHCI0/OHCI0 nodes to A64 DTSI

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0fd5e852 bdecc9cb

arch/arm64/boot/dts/allwinner/Makefile

+2 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb

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-sopine-baseboard.dtb

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



always		:= $(dtb-y)

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+15 −0
Original line number Diff line number Diff line
@@ -67,6 +67,14 @@ 
	};

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	status = "okay";

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;
@@ -77,6 +85,13 @@ 
	bias-pull-up;

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

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

		reg = <1>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts

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

 * Copyright (C) 2017 Jagan Teki <jteki@openedev.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 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 "sun50i-a64.dtsi"



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



/ {

	model = "OrangePi Win/Win Plus";

	compatible = "xunlong,orangepi-win", "allwinner,sun50i-a64";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	reg_vcc3v3: vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

};



&ehci1 {

	status = "okay";

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

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

	cd-inverted;

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usbphy {

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts

+16 −1
Original line number Diff line number Diff line
@@ -46,5 +46,20 @@ 
	model = "Pine64+";

	compatible = "pine64,pine64-plus", "allwinner,sun50i-a64";



	/* TODO: Camera, Ethernet PHY, touchscreen, etc. */

	/* TODO: Camera, touchscreen, etc. */

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	status = "okay";

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

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

		reg = <1>;

	};

};

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts

+57 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ 


	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

		serial3 = &uart3;

		serial4 = &uart4;

	};



	chosen {
@@ -66,10 +70,23 @@ 
	};

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rmii_pins>;

	phy-mode = "rmii";

	phy-handle = <&ext_rmii_phy1>;

	status = "okay";



};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;
@@ -80,6 +97,13 @@ 
	bias-pull-up;

};



&mdio {

	ext_rmii_phy1: ethernet-phy@1 {

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

		reg = <1>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;
@@ -91,16 +115,49 @@ 
	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



/* On Exp and Euler connectors */

&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



/* On Wifi/BT connector, with RTS/CTS */

&uart1 {

	pinctrl-names = "default";

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

	status = "disabled";

};



/* On Pi-2 connector */

&uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart2_pins>;

	status = "disabled";

};



/* On Euler connector */

&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>;

	status = "disabled";

};



/* On Euler connector, RTS/CTS optional */

&uart4 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart4_pins>;

	status = "disabled";

};



&usb_otg {

	dr_mode = "host";

	status = "okay";