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

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

Merge tag 'sunxi-dt-for-4.4-2' of... 

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

Allwinner DT changes for 4.4, round 2

More DT patches for 4.4, mostly with new boards coming in (CHIP, BananaPi
M2, pcduino2), further consolidation for the q8-based designs and a bunch
of random patches enhancing support for existing boards

* tag 'sunxi-dt-for-4.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

: (27 commits)
  ARM: dts: sun6i: Add a dts file for the Sinovoip BPI-M2 board
  ARM: dts: sun6i: Add mmc2_pins_a pinmux setting to sun6i-a31.dtsi
  ARM: dts: sunxi: Fix interrupt-cells for [r]pio on A23/A31/A33/A80
  ARM: dts: sun8i: Add NMI interrupt controller node
  ARM: dts: sun6i: hummingbird: Enable AXP221 DC5LDO regulator as "vdd-cpus"
  ARM: dts: sun6i: hummingbird: Use axp22x.dtsi for AXP221 regulators
  ARM: dts: sun6i: hummingbird: Fix VDD-CPU and VDD-GPU regulator names
  ARM: dts: sun7i: Add regulator configuration for pcDuino v3 Nano
  ARM: dts: sun6i: Turn on gmac on Colombus
  ARM: dts: sun8i: Make et-q8-v1.6.dts a symlink to q8-tablet.dts
  ARM: dts: sun8i: Make ippo-q8h-v*.dts a symlink to q8-tablet.dts
  ARM: dts: sun8i: Add sun8i-a23-q8-tablet.dts file
  ARM: dts: sun5i: Add backlight node to sun5i-q8-common.dtsi
  ARM: dts: sunxi: Enable PWM controller on Q8 format tablets
  ARM: dts: sun5i: Add PWM channel 0 pinmux setting for A13/A10s
  ARM: dts: sun5i: Add PWM controller node for A13 / A10s
  ARM: sun5i: Add C.H.I.P DTS
  ARM: dts: sunxi: Add dtsi for AXP22x PMIC
  ARM: dts: sun7i: Correct USB regulators on pcDuino v3 Nano
  ARM: sun5i: dt: Add UART3 CTS and RTS pins
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2995f0a1 c2aa5651

arch/arm/boot/dts/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -597,7 +597,8 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-mk802.dtb \

	sun4i-a10-mk802ii.dtb \

	sun4i-a10-olinuxino-lime.dtb \

	sun4i-a10-pcduino.dtb

	sun4i-a10-pcduino.dtb \

	sun4i-a10-pcduino2.dtb

dtb-$(CONFIG_MACH_SUN5I) += \

	sun5i-a10s-auxtek-t003.dtb \

	sun5i-a10s-auxtek-t004.dtb \
@@ -610,7 +611,8 @@ dtb-$(CONFIG_MACH_SUN5I) += \ 
	sun5i-a13-olinuxino.dtb \

	sun5i-a13-olinuxino-micro.dtb \

	sun5i-a13-q8-tablet.dtb \

	sun5i-a13-utoo-p66.dtb

	sun5i-a13-utoo-p66.dtb \

	sun5i-r8-chip.dtb

dtb-$(CONFIG_MACH_SUN6I) += \

	sun6i-a31-app4-evb1.dtb \

	sun6i-a31-colombus.dtb \
@@ -619,6 +621,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
	sun6i-a31-m9.dtb \

	sun6i-a31-mele-a1000g-quad.dtb \

	sun6i-a31s-cs908.dtb \

	sun6i-a31s-sinovoip-bpi-m2.dtb \

	sun6i-a31s-yones-toptech-bs1078-v2.dtb

dtb-$(CONFIG_MACH_SUN7I) += \

	sun7i-a20-bananapi.dtb \
@@ -644,6 +647,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-a23-gt90h-v4.dtb \

	sun8i-a23-ippo-q8h-v5.dtb \

	sun8i-a23-ippo-q8h-v1.2.dtb \

	sun8i-a23-q8-tablet.dtb \

	sun8i-a33-et-q8-v1.6.dtb \

	sun8i-a33-ga10h-v1.1.dtb \

	sun8i-a33-ippo-q8h-v1.2.dtb \

arch/arm/boot/dts/axp22x.dtsi

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

 * Copyright 2015 Chen-Yu Tsai

 *

 * Chen-Yu Tsai <wens@csie.org>

 *

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

 */



/*

 * AXP221/221s/223 Integrated Power Management Chip

 * http://www.x-powers.com/product/AXP22X.php

 * http://dl.linux-sunxi.org/AXP/AXP221%20Datasheet%20V1.2%2020130326%20.pdf

 */



&axp22x {

	interrupt-controller;

	#interrupt-cells = <1>;



	regulators {

		/* Default work frequency for buck regulators */

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



		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_dc1sw: dc1sw {

			regulator-name = "dc1sw";

		};



		reg_dc5ldo: dc5ldo {

			regulator-name = "dc5ldo";

		};



		reg_aldo1: aldo1 {

			regulator-name = "aldo1";

		};



		reg_aldo2: aldo2 {

			regulator-name = "aldo2";

		};



		reg_aldo3: aldo3 {

			regulator-name = "aldo3";

		};



		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_ldo_io0: ldo_io0 {

			regulator-name = "ldo_io0";

		};



		reg_ldo_io1: ldo_io1 {

			regulator-name = "ldo_io1";

		};



		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/arm/boot/dts/sun4i-a10-pcduino.dts

+20 −9
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ 
	status = "okay";

};



&otg_sram {

	status = "okay";

};



&pio {

	led_pins_pcduino: led_pins@0 {

		allwinner,pins = "PH15", "PH16";
@@ -178,14 +182,13 @@ 
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&reg_usb1_vbus {

	status = "okay";

	usb0_id_detect_pin: usb0_id_detect_pin@0 {

		allwinner,pins = "PH4";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

	};



&reg_usb2_vbus {

	status = "okay";

};



#include "axp209.dtsi"
@@ -221,8 +224,16 @@ 
	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usbphy {

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>;

	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb1_vbus-supply = <&reg_vcc5v0>; /* USB1 VBUS is always on */

	usb2_vbus-supply = <&reg_vcc5v0>; /* USB2 VBUS is always on */

	status = "okay";

};

arch/arm/boot/dts/sun4i-a10-pcduino2.dts

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

 * Copyright 2015 Siarhei Siamashka <siarhei.siamashka@gmail.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 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.

 */



/*

 * The LinkSprite pcDuino2 board is almost identical to the older

 * LinkSprite pcDuino1 board. The only software visible difference

 * is that the pcDuino2 board got a USB VBUS voltage regulator, which

 * is controlled by the PD2 pin (pulled-up by default). Also one of

 * the USB host ports has been replaced with a USB WIFI chip.

 */



#include "sun4i-a10-pcduino.dts"



/ {

	model = "LinkSprite pcDuino2";

	compatible = "linksprite,a10-pcduino2", "allwinner,sun4i-a10";

};



&pio {

	usb2_vbus_pin_pcduino2: usb2_vbus_pin@0 {

		allwinner,pins = "PD2";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&reg_usb2_vbus {

	pinctrl-names = "default";

	pinctrl-0 = <&usb2_vbus_pin_pcduino2>;

	gpio = <&pio 3 2 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



&usbphy {

	usb1_vbus-supply = <&reg_vcc3v3>; /* USB WIFI is always on */

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};

arch/arm/boot/dts/sun5i-a10s.dtsi

+8 −7
Original line number Diff line number Diff line
@@ -165,6 +165,14 @@ 
			#size-cells = <0>;

		};



		pwm: pwm@01c20e00 {

			compatible = "allwinner,sun5i-a10s-pwm";

			reg = <0x01c20e00 0xc>;

			clocks = <&osc24M>;

			#pwm-cells = <3>;

			status = "disabled";

		};



		uart0: serial@01c28000 {

			compatible = "snps,dw-apb-uart";

			reg = <0x01c28000 0x400>;
@@ -204,13 +212,6 @@ 
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	uart3_pins_a: uart3@0 {

		allwinner,pins = "PG9", "PG10";

		allwinner,function = "uart3";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	emac_pins_a: emac0@0 {

		allwinner,pins = "PA0", "PA1", "PA2",

				"PA3", "PA4", "PA5", "PA6",