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

Commit 9bbf3390 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Allwinner arm64 DT changes for 4.14" from Chen-Yu Tsai:

The usual improvement patches:

  - R_INTC interrupt controller enabled for the A64 SoC

  - AXP803 PMIC added and enabled on the Pine64 and SoPine boards

* tag 'sunxi-dt64-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: allwinner: a64: add AXP803 PMIC support to SoPine and the baseboard
  arm64: allwinner: a64: enable AXP803 regulators for Pine64
  arm64: allwinner: a64: add DTSI file for AXP803 PMIC
  arm64: allwinner: a64: add AXP803 node to Pine64 device tree
  arm64: allwinner: a64: add NMI (R_INTC) controller on A64
parents 4fda1e73 78c3cbc8

arch/arm64/boot/dts/allwinner/axp803.dtsi

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

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

 *

 * 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.

 */



/*

 * AXP803 Integrated Power Management Chip

 * http://files.pine64.org/doc/datasheet/pine64/AXP803_Datasheet_V1.0.pdf

 */



&axp803 {

	interrupt-controller;

	#interrupt-cells = <1>;



	regulators {

		/* Default work frequency for buck regulators */

		x-powers,dcdc-freq = <3000>;



		reg_aldo1: aldo1 {

			regulator-name = "aldo1";

		};



		reg_aldo2: aldo2 {

			regulator-name = "aldo2";

		};



		reg_aldo3: aldo3 {

			regulator-name = "aldo3";

		};



		reg_dc1sw: dc1sw {

			regulator-name = "dc1sw";

		};



		reg_dcdc1: dcdc1 {

			regulator-name = "dcdc1";

		};



		reg_dcdc2: dcdc2 {

			regulator-name = "dcdc2";

		};



		reg_dcdc3: dcdc3 {

			regulator-name = "dcdc3";

		};



		reg_dcdc4: dcdc4 {

			regulator-name = "dcdc4";

		};



		reg_dcdc5: dcdc5 {

			regulator-name = "dcdc5";

		};



		reg_dcdc6: dcdc6 {

			regulator-name = "dcdc6";

		};



		reg_dldo1: dldo1 {

			regulator-name = "dldo1";

		};



		reg_dldo2: dldo2 {

			regulator-name = "dldo2";

		};



		reg_dldo3: dldo3 {

			regulator-name = "dldo3";

		};



		reg_dldo4: dldo4 {

			regulator-name = "dldo4";

		};



		reg_eldo1: eldo1 {

			regulator-name = "eldo1";

		};



		reg_eldo2: eldo2 {

			regulator-name = "eldo2";

		};



		reg_eldo3: eldo3 {

			regulator-name = "eldo3";

		};



		reg_fldo1: fldo1 {

			regulator-name = "fldo1";

		};



		reg_fldo2: fldo2 {

			regulator-name = "fldo2";

		};



		reg_ldo_io0: ldo-io0 {

			regulator-name = "ldo-io0";

			status = "disabled";

		};



		reg_ldo_io1: ldo-io1 {

			regulator-name = "ldo-io1";

			status = "disabled";

		};



		reg_rtc_ldo: rtc-ldo {

			/* RTC_LDO is a fixed, always-on regulator */

			regulator-always-on;

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3000000>;

			regulator-name = "rtc-ldo";

		};

	};

};

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

+113 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ 
	pinctrl-0 = <&rmii_pins>;

	pinctrl-0 = <&rmii_pins>;

	phy-mode = "rmii";

	phy-mode = "rmii";

	phy-handle = <&ext_rmii_phy1>;

	phy-handle = <&ext_rmii_phy1>;

	phy-supply = <&reg_dc1sw>;

	status = "okay";

	status = "okay";





};

};
@@ -123,6 +124,118 @@ 
	status = "okay";

	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 */



/*

 * The DRAM chips used by Pine64 boards are DDR3L-compatible, so they can

 * work at 1.35V with less power consumption.

 * As AXP803 DCDC5 cannot reach 1.35V accurately, use 1.36V instead.

 */

&reg_dcdc5 {

	regulator-always-on;

	regulator-min-microvolt = <1360000>;

	regulator-max-microvolt = <1360000>;

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

};



&reg_dldo2 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-mipi";

};



&reg_dldo4 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-wifi";

};



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

};



/* On Exp and Euler connectors */

/* On Exp and Euler connectors */

&uart0 {

&uart0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts

+23 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,7 @@ 
	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";

};

};
@@ -110,6 +111,28 @@ 
	status = "okay";

	status = "okay";

};

};





&reg_dc1sw {

	regulator-name = "vcc-phy";

};



&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_dldo4 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-wifi";

};



&uart0 {

&uart0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pins_a>;

arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi

+86 −0
Original line number Original line Diff line number Diff line
@@ -63,3 +63,89 @@ 
	bus-width = <4>;

	bus-width = <4>;

	status = "okay";

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

	regulator-max-microvolt = <1200000>;

	regulator-name = "vcc-dram";

};



&reg_dcdc6 {

	regulator-always-on;

	regulator-min-microvolt = <1100000>;

	regulator-max-microvolt = <1100000>;

	regulator-name = "vdd-sys";

};



&reg_eldo1 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "vdd-1v8-lpddr";

};



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

};

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -487,6 +487,15 @@ 
				     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

				     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

		};

		};





		r_intc: interrupt-controller@1f00c00 {

			compatible = "allwinner,sun50i-a64-r-intc",

				     "allwinner,sun6i-a31-r-intc";

			interrupt-controller;

			#interrupt-cells = <2>;

			reg = <0x01f00c00 0x400>;

			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

		};



		r_ccu: clock@1f01400 {

		r_ccu: clock@1f01400 {

			compatible = "allwinner,sun50i-a64-r-ccu";

			compatible = "allwinner,sun50i-a64-r-ccu";

			reg = <0x01f01400 0x100>;

			reg = <0x01f01400 0x100>;