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

Commit 8749f9f3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-for-3.20' of... 

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

Merge "Allwinner device tree changes for 3.20" from Maxime Ripard:

A lot of changes to the device tree for the 3.20 merge window, mostly with:
  - More DT license convertions, only two DTS and two DTSI are still uncertain
    and have not been converted yet
  - Use the C-preprocessor includes in the device trees.
  - Add support for the A31s SoC and improve the A80 support
  - Add IR receiver, lradc, PS/2 support
  - Add cpufreq support for all SoCs but the A23 and A80.
  - And a lot of new boards

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

: (64 commits)
  ARM: dts: sun5i: Enable axp209 support on A13-OLinuxIno
  ARM: sunxi: dts: Add A10/A20 PS2 pin muxing options
  ARM: sunxi: dts: Add PS2 nodes to dtsi for A10,A20
  ARM: dts: sun6i: Add resistive touchscreen controller node to dtsi
  ARM: dts: sun4i: Add Hyundau A7HD board
  ARM: dts: sun4i: Add Marsboard A10 board
  ARM: dts: sun9i: Enable mmc2 on A80 Optimus Board
  ARM: dts: sun9i: Add 8 bit mmc pinmux setting for mmc2
  ARM: dts: sun9i: Enable mmc0 on A80 Optimus Board
  ARM: dts: sun9i: Convert a80 optimus board dts to label referencing
  ARM: dts: sun9i: Add mmc controller nodes to the A80 dtsi
  ARM: dts: sun9i: Add mmc config clock nodes
  ARM: dts: sunxi: Add missing mdio label
  ARM: dts: sun5i: Add mk802_a10s board
  ARM: dts: sun4i: Add mk802ii board
  ARM: dts: sun4i: Add mk802 board
  ARM: dts: sun4i: Add dts file for Chuwi V7 CW0825 tablet
  ARM: dts: sun7i: Add dts file for Bananapro board
  ARM: sun6i: Enable ARM arch timers
  ARM: dts: sun6i: Convert hummingbird a31 dts to label references
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7c83955a c121f45e

arch/arm/boot/dts/Makefile

+11 −2
Original line number Diff line number Diff line
@@ -508,13 +508,19 @@ dtb-$(CONFIG_ARCH_STI) += \ 
dtb-$(CONFIG_MACH_SUN4I) += \

	sun4i-a10-a1000.dtb \

	sun4i-a10-ba10-tvbox.dtb \

	sun4i-a10-chuwi-v7-cw0825.dtb \

	sun4i-a10-cubieboard.dtb \

	sun4i-a10-marsboard.dtb \

	sun4i-a10-mini-xplus.dtb \

	sun4i-a10-mk802.dtb \

	sun4i-a10-mk802ii.dtb \

	sun4i-a10-hackberry.dtb \

	sun4i-a10-hyundai-a7hd.dtb \

	sun4i-a10-inet97fv2.dtb \

	sun4i-a10-olinuxino-lime.dtb \

	sun4i-a10-pcduino.dtb

dtb-$(CONFIG_MACH_SUN5I) += \

	sun5i-a10s-mk802.dtb \

	sun5i-a10s-olinuxino-micro.dtb \

	sun5i-a10s-r7-tv-dongle.dtb \

	sun5i-a13-hsg-h702.dtb \
@@ -524,9 +530,11 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
	sun6i-a31-app4-evb1.dtb \

	sun6i-a31-colombus.dtb \

	sun6i-a31-hummingbird.dtb \

	sun6i-a31-m9.dtb

	sun6i-a31-m9.dtb \

	sun6i-a31s-cs908.dtb

dtb-$(CONFIG_MACH_SUN7I) += \

	sun7i-a20-bananapi.dtb \

	sun7i-a20-bananapro.dtb \

	sun7i-a20-cubieboard2.dtb \

	sun7i-a20-cubietruck.dtb \

	sun7i-a20-hummingbird.dtb \
@@ -537,7 +545,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-olinuxino-micro.dtb \

	sun7i-a20-pcduino3.dtb

dtb-$(CONFIG_MACH_SUN8I) += \

	sun8i-a23-ippo-q8h-v5.dtb

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

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

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb

dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \

arch/arm/boot/dts/axp209.dtsi

0 → 100644
+97 −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.

 *

 *     You should have received a copy of the GNU General Public

 *     License along with this file; if not, write to the Free

 *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

 *     MA 02110-1301 USA

 *

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

 */



/*

 * AXP202/209 Integrated Power Management Chip

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

 * http://dl.linux-sunxi.org/AXP/AXP209%20Datasheet%20v1.0_cn.pdf

 */



&axp209 {

	compatible = "x-powers,axp209";

	interrupt-controller;

	#interrupt-cells = <1>;



	regulators {

		/* Default work frequency for buck regulators */

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



		reg_dcdc2: dcdc2 {

			regulator-name = "dcdc2";

		};



		reg_dcdc3: dcdc3 {

			regulator-name = "dcdc3";

		};



		reg_ldo1: ldo1 {

			/* LDO1 is a fixed output regulator */

			regulator-always-on;

			regulator-min-microvolt = <1300000>;

			regulator-max-microvolt = <1300000>;

			regulator-name = "ldo1";

		};



		reg_ldo2: ldo2 {

			regulator-name = "ldo2";

		};



		reg_ldo3: ldo3 {

			regulator-name = "ldo3";

		};



		reg_ldo4: ldo4 {

			regulator-name = "ldo4";

		};



		reg_ldo5: ldo5 {

			regulator-name = "ldo5";

		};

	};

};

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

+13 −10
Original line number Diff line number Diff line
@@ -48,8 +48,11 @@ 
 */



/dts-v1/;

/include/ "sun4i-a10.dtsi"

/include/ "sunxi-common-regulators.dtsi"

#include "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"



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

#include <dt-bindings/pinctrl/sun4i-a10.h>



/ {

	model = "Mele A1000";
@@ -77,7 +80,7 @@ 
			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

			cd-gpios = <&pio 7 1 0>; /* PH1 */

			cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

			cd-inverted;

			status = "okay";

		};
@@ -112,15 +115,15 @@ 
			emac_power_pin_a1000: emac_power_pin@0 {

				allwinner,pins = "PH15";

				allwinner,function = "gpio_out";

				allwinner,drive = <0>;

				allwinner,pull = <0>;

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};



			led_pins_a1000: led_pins@0 {

				allwinner,pins = "PH10", "PH20";

				allwinner,function = "gpio_out";

				allwinner,drive = <0>;

				allwinner,pull = <0>;

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

		};
@@ -159,12 +162,12 @@ 


		red {

			label = "a1000:red:usr";

			gpios = <&pio 7 10 0>;

			gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>;

		};



		blue {

			label = "a1000:blue:usr";

			gpios = <&pio 7 20 0>;

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;

		};

	};
@@ -176,7 +179,7 @@ 
		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		gpio = <&pio 7 15 0>;

		gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>;

	};



	reg_usb1_vbus: usb1-vbus {

arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

+6 −4
Original line number Diff line number Diff line
@@ -46,8 +46,10 @@ 
 */



/dts-v1/;

/include/ "sun4i-a10.dtsi"

/include/ "sunxi-common-regulators.dtsi"

#include "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"



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



/ {

	model = "BA10 tvbox";
@@ -74,7 +76,7 @@ 
			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

			cd-gpios = <&pio 7 1 0>; /* PH1 */

			cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

			cd-inverted;

			status = "okay";

		};
@@ -140,7 +142,7 @@ 
	};



	reg_usb2_vbus: usb2-vbus {

		gpio = <&pio 7 12 0>;

		gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;

		status = "okay";

	};

};

arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts

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

 * Copyright 2015 Hans de Goede <hdegoede@redhat.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.

 *

 *     You should have received a copy of the GNU General Public

 *     License along with this file; if not, write to the Free

 *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

 *     MA 02110-1301 USA

 *

 * 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 "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"

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



/ {

	model = "Chuwi V7 CW0825";

	compatible = "chuwi,v7-cw0825", "allwinner,sun4i-a10";

};



&ehci1 {

	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";



	axp209: pmic@34 {

		compatible = "x-powers,axp209";

		reg = <0x34>;

		interrupts = <0>;



		interrupt-controller;

		#interrupt-cells = <1>;

	};

};



&mmc0 {

	pinctrl-names = "default";

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

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

	cd-inverted;

	status = "okay";

};



&reg_usb2_vbus {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usbphy {

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};