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

Commit 2bad7f86 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Allwinner DT changes for 4.11" from Maxime Ripard:

The usual chunk of DT changes, most notably:
  - Support for the H2+ and the V3s
  - CPUFreq support for the A33
  - SPDIF support for the A31 and H3
  - New boards: Beelink X2, Lichee Pi One, Lichee Pi Zero,
    Orange Pi Zero

* tag 'sunxi-dt-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (42 commits)
  ARM: dts: sun8i-h3: Add SPDIF to the Beelink X2
  ARM: dts: sun8i-h3: Add the SPDIF block to the H3
  ARM: dts: sun8i-h3: Add SPDIF TX pin to the H3
  ARM: dts: sun8i-h3: Add dts for the Beelink X2 STB
  ARM: sun8i: sina33: Enable display
  ARM: sun8i: a23/a33: Add the oscillators accuracy
  ARM: sun8i: a23/a33: Enable the real LOSC and use it
  ARM: dts: sunxi: add support for Lichee Pi Zero board
  ARM: dts: sunxi: add dtsi file for V3s SoC
  ARM: dts: sun6i: sina31s: Enable USB OTG controller in peripheral mode
  ARM: dts: sun8i: reference-design: use AXP223 DTSI
  ARM: dts: sun8i: parrot: use AXP223 DTSI
  ARM: dts: sun8i: sina33: use AXP223 DTSI
  ARM: dts: sun8i: a33-olinuxino: use AXP223 DTSI
  ARM: dts: add DTSI for AXP223
  dt-bindings: power: axp20x-usb: add axp223 compatible
  ARM: dts: sun7i: Add wifi dt node on Banana Pro
  ARM: dts: sun6i: Add SPDIF to the Mele I7
  devicetree: bindings: Add vendor prefix for Shenzhen Xunlong Software
  ARM: dts: sun8i-h3: orange-pi-pc: Enable audio codec
  ...
parents fd896f5a ef09e0f5

Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ AXP20x USB power supply 
Required Properties:

-compatible: One of: "x-powers,axp202-usb-power-supply"

                     "x-powers,axp221-usb-power-supply"

                     "x-powers,axp223-usb-power-supply"



The AXP223 PMIC shares most of its behaviour with the AXP221 but has slight

variations such as the former being able to set the VBUS power supply max

current to 100mA, unlike the latter.



This node is a subnode of the axp20x PMIC.

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ lantiq Lantiq Semiconductor 
lego	LEGO Systems A/S

lenovo	Lenovo Group Ltd.

lg	LG Corporation

licheepi	Lichee Pi

linux	Linux-specific binding

lltc	Linear Technology Corporation

lsi	LSI Corp. (LSI Logic)
@@ -331,6 +332,7 @@ x-powers X-Powers 
xes	Extreme Engineering Solutions (X-ES)

xillybus	Xillybus Ltd.

xlnx	Xilinx

xunlong	Shenzhen Xunlong Software CO.,Limited

zarlink	Zarlink Semiconductor

zii	Zodiac Inflight Innovations

zte	ZTE Corp.

arch/arm/boot/dts/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -798,6 +798,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \ 
	sun5i-a13-empire-electronix-m712.dtb \

	sun5i-a13-hsg-h702.dtb \

	sun5i-a13-inet-98v-rev2.dtb \

	sun5i-a13-licheepi-one.dtb \

	sun5i-a13-olinuxino.dtb \

	sun5i-a13-olinuxino-micro.dtb \

	sun5i-a13-q8-tablet.dtb \
@@ -861,7 +862,9 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-a33-sinlinx-sina33.dtb \

	sun8i-a83t-allwinner-h8homlet-v2.dtb \

	sun8i-a83t-cubietruck-plus.dtb \

	sun8i-h2-plus-orangepi-zero.dtb \

	sun8i-h3-bananapi-m2-plus.dtb \

	sun8i-h3-beelink-x2.dtb \

	sun8i-h3-nanopi-neo.dtb \

	sun8i-h3-orangepi-2.dtb \

	sun8i-h3-orangepi-lite.dtb \
@@ -870,7 +873,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-orangepi-pc-plus.dtb \

	sun8i-h3-orangepi-plus.dtb \

	sun8i-h3-orangepi-plus2e.dtb \

	sun8i-r16-parrot.dtb

	sun8i-r16-parrot.dtb \

	sun8i-v3s-licheepi-zero.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

	sun9i-a80-cubieboard4.dtb

arch/arm/boot/dts/axp223.dtsi

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

 * Copyright 2016 Free Electrons

 *

 * Quentin Schulz <quentin.schulz@free-electrons.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.

 */



/*

 * AXP223 Integrated Power Management Chip

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

 * http://dl.linux-sunxi.org/AXP/AXP223-en.pdf

 *

 * The AXP223 shares most of its logic with the AXP221 but it has some

 * differences, for the VBUS driver for example.

 */



#include "axp22x.dtsi"



&usb_power_supply {

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

};

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

+31 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ 
	status = "okay";

};



&cpu0 {

	cpu-supply = <&reg_dcdc2>;

};



&ehci0 {

	status = "okay";

};
@@ -196,6 +200,33 @@ 
	};

};



#include "axp209.dtsi"



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1000000>;

	regulator-max-microvolt = <1400000>;

	regulator-name = "vdd-cpu";

};



&reg_dcdc3 {

	regulator-always-on;

	regulator-min-microvolt = <1000000>;

	regulator-max-microvolt = <1250000>;

	regulator-name = "vdd-int-dll";

};



&reg_ldo1 {

	regulator-name = "vdd-rtc";

};



&reg_ldo2 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "avcc";

};



&reg_usb1_vbus {

	status = "okay";

};