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

Commit 349f9d52 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Merge "Allwinner DT changes for 4.8" from Maxime Ripard:

The usual amount of DT patches, among which:
  - I2S support
  - Support for the AXP809 in the relevant boards (A80 based)
  - New boards: Banapi M1+, Banapi M2+, Allwinner Parrot (R16 EVB),
  - The other patches to enable various controllers on our boards, most
    notably USB OTG

* tag 'sunxi-dt-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (54 commits)
  ARM: dts: sun5i: Enable otg on the auxtex t004
  ARM: sun5i: Allow PLL3 2x fixed factor clock to change PLL3 rate
  ARM: sun7i: Add DAI nodes
  ARM: sun7i: Add mod1 clock nodes
  ARM: dts: sun5i: Add mmc1 / sdio-wifi node to mk802
  ARM: dts: sun5i: Add axp152 pmic node to mk802
  ARM: dts: sun5i: Enable otg on the mk802
  ARM: dts: sun7i: Add BCM53125 switch nodes to the lamobo-r1 board
  ARM: sun8i: Add Parrot Board DTS
  ARM: dts: sun5i: q8-common: Enable USB-based WiFi
  ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  ARM: dts: sun8i-q8-common: Add support for USB wifi controllers
  ARM: dts: sun9i: a80-optimus: Order nodes by alphabetical order
  ARM: dts: sun9i: cubieboard4: Order nodes by alphabetical order
  ARM: dts: sun7i: Add NFC node to Allwinner A20 SoC
  ARM: dts: sun4i: Add NFC node to Allwinner A10 SoC
  ARM: dts: sun6i: Add pmic / regulator nodes to Mele M9 dts
  ARM: dts: sun6i: Add pmic / regulator nodes to Mele A1000G quad dts
  ARM: dts: sun6i: The blue led on the Mele M9 is a power led
  ARM: dts: sun6i: The blue led on the Mele A1000G quad is a power led
  ...
parents 83919ef0 d509e205

arch/arm/boot/dts/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -745,6 +745,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
	sun6i-a31s-yones-toptech-bs1078-v2.dtb

dtb-$(CONFIG_MACH_SUN7I) += \

	sun7i-a20-bananapi.dtb \

	sun7i-a20-bananapi-m1-plus.dtb \

	sun7i-a20-bananapro.dtb \

	sun7i-a20-cubieboard2.dtb \

	sun7i-a20-cubietruck.dtb \
@@ -782,7 +783,9 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-orangepi-2.dtb \

	sun8i-h3-orangepi-one.dtb \

	sun8i-h3-orangepi-pc.dtb \

	sun8i-h3-orangepi-plus.dtb

	sun8i-h3-orangepi-plus.dtb \

	sun8i-h3-sinovoip-bpi-m2-plus.dtb \

	sun8i-r16-parrot.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

	sun9i-a80-cubieboard4.dtb

arch/arm/boot/dts/axp209.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 


		reg_ldo5: ldo5 {

			regulator-name = "ldo5";

			status = "disabled";

		};

	};

arch/arm/boot/dts/axp22x.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -126,10 +126,12 @@ 


		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 {
@@ -139,5 +141,15 @@ 
			regulator-max-microvolt = <3000000>;

			regulator-name = "rtc_ldo";

		};



		reg_drivevbus: drivevbus {

			regulator-name = "drivevbus";

			status = "disabled";

		};

	};



	usb_power_supply: usb_power_supply {

		compatible = "x-powers,axp221-usb-power-supply";

		status = "disabled";

	};

};

arch/arm/boot/dts/axp809.dtsi

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

 */



/*

 * AXP809 Integrated Power Management Chip

 */



&axp809 {

	compatible = "x-powers,axp809";

	interrupt-controller;

	#interrupt-cells = <1>;

};

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

+3 −1
Original line number Diff line number Diff line
@@ -72,8 +72,9 @@ 
		};



		blue {

			label = "a1000:blue:usr";

			label = "a1000:blue:pwr";

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};

	};
@@ -84,6 +85,7 @@ 
		regulator-name = "emac-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		startup-delay-us = <20000>;

		enable-active-high;

		gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>;

	};