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

Commit b2d3b787 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt64-for-4.14-2' of... 

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

Pull "Allwinner arm64 device tree changes for 4.14, round 2" from Chen-Yu Tsai:

The usual improvement patches:

  - PMIC, USB and WiFi enabled for Bananapi M64

  - New board added: NanoPi A64

  - New board added: Olimex A64-OLinuXino

* tag 'sunxi-dt64-for-4.14-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: allwinner: a64: Add A64-OLinuXino initial support
  arm64: allwinner: a64: Add initial NanoPi A64 support
  arm64: allwinner: a64: add proper support for the Wi-Fi on BPi M64
  arm64: allwinner: a64: enable AXP803 for Banana Pi M64
  arm64: allwinner: a64: enable USB host controller for BPi M64
parents 6d6776e1 4969efb2

arch/arm64/boot/dts/allwinner/Makefile

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

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-nanopi-a64.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-olinuxino.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-orangepi-win.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-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

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

+136 −8
Original line number Original line Diff line number Diff line
@@ -59,19 +59,22 @@ 
		stdout-path = "serial0:115200n8";

		stdout-path = "serial0:115200n8";

	};

	};





	reg_vcc3v3: vcc3v3 {

	wifi_pwrseq: wifi_pwrseq {

		compatible = "regulator-fixed";

		compatible = "mmc-pwrseq-simple";

		regulator-name = "vcc3v3";

		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

	};

};

};





&ehci1 {

	status = "okay";

};



&emac {

&emac {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii";

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	phy-handle = <&ext_rgmii_phy>;

	phy-supply = <&reg_dc1sw>;

	status = "okay";

	status = "okay";

};

};
@@ -95,7 +98,7 @@ 
&mmc0 {

&mmc0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	vmmc-supply = <&reg_dcdc1>;

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

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

	cd-inverted;

	cd-inverted;

	disable-wp;

	disable-wp;
@@ -106,22 +109,143 @@ 
&mmc1 {

&mmc1 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	vmmc-supply = <&reg_dldo2>;

	vqmmc-supply = <&reg_dldo4>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	bus-width = <4>;

	non-removable;

	non-removable;

	status = "okay";

	status = "okay";



	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&r_pio>;

		interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>; /* PL3 */

		interrupt-names = "host-wake";

	};

};

};





&mmc2 {

&mmc2 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	pinctrl-0 = <&mmc2_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <8>;

	bus-width = <8>;

	non-removable;

	non-removable;

	cap-mmc-hw-reset;

	cap-mmc-hw-reset;

	status = "okay";

	status = "okay";

};

};





&ohci1 {

	status = "okay";

};



&r_rsb {

	status = "okay";



	axp803: pmic@3a3 {

		compatible = "x-powers,axp803";

		reg = <0x3a3>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

	};

};



#include "axp803.dtsi"



&reg_aldo2 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-pl";

};



&reg_aldo3 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-pll-avcc";

};



&reg_dc1sw {

	regulator-name = "vcc-phy";

};



&reg_dcdc1 {

	regulator-always-on;

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-3v3";

};



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1040000>;

	regulator-max-microvolt = <1300000>;

	regulator-name = "vdd-cpux";

};



/* DCDC3 is polyphased with DCDC2 */



&reg_dcdc5 {

	regulator-always-on;

	regulator-min-microvolt = <1500000>;

	regulator-max-microvolt = <1500000>;

	regulator-name = "vcc-dram";

};



&reg_dcdc6 {

	regulator-always-on;

	regulator-min-microvolt = <1100000>;

	regulator-max-microvolt = <1100000>;

	regulator-name = "vdd-sys";

};



&reg_dldo1 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-hdmi-dsi";

};



&reg_dldo2 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-wifi";

};



&reg_dldo4 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-wifi-io";

};



&reg_eldo1 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "cpvdd";

};



&reg_fldo1 {

	regulator-min-microvolt = <1200000>;

	regulator-max-microvolt = <1200000>;

	regulator-name = "vcc-1v2-hsic";

};



/*

 * The A64 chip cannot work without this regulator off, although

 * it seems to be only driving the AR100 core.

 * Maybe we don't still know well about CPUs domain.

 */

&reg_fldo2 {

	regulator-always-on;

	regulator-min-microvolt = <1100000>;

	regulator-max-microvolt = <1100000>;

	regulator-name = "vdd-cpus";

};



&reg_rtc_ldo {

	regulator-name = "vcc-rtc";

};



&uart0 {

&uart0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pins_a>;
@@ -133,3 +257,7 @@ 
	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;

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

	status = "okay";

	status = "okay";

};

};



&usbphy {

	status = "okay";

};

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

0 → 100644
+207 −0
Original line number Original line 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 = "FriendlyARM NanoPi A64";

	compatible = "friendlyarm,nanopi-a64", "allwinner,sun50i-a64";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



/* i2c1 connected with gpio headers like pine64, bananapi */

&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "disabled";

};



&i2c1_pins {

	bias-pull-up;

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

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

	cd-inverted;

	disable-wp;

	bus-width = <4>;

	status = "okay";

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&r_rsb {

	status = "okay";



	axp803: pmic@3a3 {

		compatible = "x-powers,axp803";

		reg = <0x3a3>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

	};

};



#include "axp803.dtsi"



&reg_aldo2 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-pl";

};



&reg_aldo3 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-pll-avcc";

};



&reg_dcdc1 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-3v";

};



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1040000>;

	regulator-max-microvolt = <1300000>;

	regulator-name = "vdd-cpux";

};



/* DCDC3 is polyphased with DCDC2 */



&reg_dcdc5 {

	regulator-always-on;

	regulator-min-microvolt = <1500000>;

	regulator-max-microvolt = <1500000>;

	regulator-name = "vcc-dram";

};



&reg_dcdc6 {

	regulator-always-on;

	regulator-min-microvolt = <1100000>;

	regulator-max-microvolt = <1100000>;

	regulator-name = "vdd-sys";

};



&reg_dldo1 {

	regulator-always-on;

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-hdmi-dsi";

};



&reg_dldo4 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-pg-wifi-io";

};



&reg_eldo1 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "cpvdd";

};



&reg_fldo1 {

	regulator-min-microvolt = <1200000>;

	regulator-max-microvolt = <1200000>;

	regulator-name = "vcc-1v2-hsic";

};



/*

 * The A64 chip cannot work without this regulator off, although

 * it seems to be only driving the AR100 core.

 * Maybe we don't still know well about CPUs domain.

 */

&reg_fldo2 {

	regulator-always-on;

	regulator-min-microvolt = <1100000>;

	regulator-max-microvolt = <1100000>;

	regulator-name = "vdd-cpus";

};



&reg_rtc_ldo {

	regulator-name = "vcc-rtc";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usbphy {

	status = "okay";

};

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

0 → 100644
+199 −0
Original line number Original line 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 = "Olimex A64-Olinuxino";

	compatible = "olimex,a64-olinuxino", "allwinner,sun50i-a64";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

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

	cd-inverted;

	disable-wp;

	bus-width = <4>;

	status = "okay";

};



&r_rsb {

	status = "okay";



	axp803: pmic@3a3 {

		compatible = "x-powers,axp803";

		reg = <0x3a3>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

	};

};



#include "axp803.dtsi"



&reg_aldo1 {

	regulator-always-on;

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-name = "vcc-pe";

};



&reg_aldo2 {

	regulator-always-on;

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-pl";

};



&reg_aldo3 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-pll-avcc";

};



&reg_dcdc1 {

	regulator-always-on;

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-3v3";

};



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1040000>;

	regulator-max-microvolt = <1300000>;

	regulator-name = "vdd-cpux";

};



/* DCDC3 is polyphased with DCDC2 */



&reg_dcdc5 {

	regulator-always-on;

	regulator-min-microvolt = <1500000>;

	regulator-max-microvolt = <1500000>;

	regulator-name = "vcc-ddr3";

};



&reg_dcdc6 {

	regulator-always-on;

	regulator-min-microvolt = <1100000>;

	regulator-max-microvolt = <1100000>;

	regulator-name = "vdd-sys";

};



&reg_dldo1 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-hdmi";

};



&reg_dldo2 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-mipi";

};



&reg_dldo3 {

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-name = "vcc-avdd-csi";

};



&reg_dldo4 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-wifi-io";

};



&reg_eldo1 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "cpvdd";

};



&reg_eldo2 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "vcc-dvdd-csi";

};



&reg_fldo1 {

	regulator-min-microvolt = <1200000>;

	regulator-max-microvolt = <1200000>;

	regulator-name = "vcc-1v2-hsic";

};



/*

 * The A64 chip cannot work without this regulator off, although

 * it seems to be only driving the AR100 core.

 * Maybe we don't still know well about CPUs domain.

 */

&reg_fldo2 {

	regulator-always-on;

	regulator-min-microvolt = <1100000>;

	regulator-max-microvolt = <1100000>;

	regulator-name = "vdd-cpus";

};



&reg_rtc_ldo {

	regulator-name = "vcc-rtc";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};