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

Commit d9d37f70 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

Business as usual on our side, with a mix of new boards and new IPs enabled
on boards:
  - Support for the GPIO found on the AXP PMIC
  - ESP8089 on the relevant boards
  - More boards converted to the reference design and q8 designs
  - New boards: Orange Pi PC Plus, Orange Pi 2, Orange Pi Plus 2E, Orange
    Pi Lite, Olimex A33-Olinuxino, Empire Electronix M712, inet-d978_rev2,
    Nano Pi Neo

* tag 'sunxi-dt-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (31 commits)
  devicetree: Add vendor prefix for FriendlyARM
  ARM: dts: sun8i: Add dts file for the NanoPi NEO SBC
  ARM: dts: sun8i-q8-common: Add support for SDIO wifi controllers
  ARM: dts: sun8i: Add dts file for the Orange Pi Plus2E SBC
  ARM: dts: sun8i: Orange Pi Plus dts is for the Plus and Plus 2
  ARM: dts: sun8i: Add PWM controller node in H3
  ARM: dts: sun8i: Add dts file for inet-d978_rev2 tablets
  ARM: dts: sun9i: Add missing #interrupt-cells to R_PIO pinctrl device node
  ARM: dts: sun8i: Rename reference-design-tablet touchscreen node
  ARM: dts: sun5i: Add dts file for the Empire Electronix M712 tablet
  ARM: dts: sun5i: Convert inet-98v-rev2 dts to use reference-design-tablet.dtsi
  ARM: dts: sun4i: Disable ohci1 on ba10-tv-box
  ARM: dts: sun8i: Add dt node for esp8089 wifi chip on polaroid-mid2809
  ARM: dts: sun8i: Add dt node for esp8089 wifi chip on polaroid-mid2407
  ARM: dts: sun8i: add NAND controller node for A23/A33
  ARM: dts: sun6i: Add new dts file for tablets using the inet-q972 PCB
  ARM: dts: sun6i: Add sun6i-reference-design-tablet.dtsi
  ARM: dts: sun6i: colorfly-e708-q1: Remove unused mma8452_int_e708_q1 node
  ARM: dts: sun9i: Switch to the AC100 RTC clock outputs for osc32k
  ARM: dts: sun9i: cubieboard4: Add device node for AC100
  ...
parents a6023d05 accfb2f1

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ ezchip EZchip Semiconductor 
fcs	Fairchild Semiconductor

firefly	Firefly

focaltech	FocalTech Systems Co.,Ltd

friendlyarm	Guangzhou FriendlyARM Computer Tech Co., Ltd

fsl	Freescale Semiconductor

ge	General Electric Company

geekbuying	GeekBuying

arch/arm/boot/dts/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -731,6 +731,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \ 
	sun5i-a10s-wobo-i5.dtb \

	sun5i-a13-difrnce-dit4350.dtb \

	sun5i-a13-empire-electronix-d709.dtb \

	sun5i-a13-empire-electronix-m712.dtb \

	sun5i-a13-hsg-h702.dtb \

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

	sun5i-a13-olinuxino.dtb \
@@ -747,6 +748,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
	sun6i-a31-mele-a1000g-quad.dtb \

	sun6i-a31s-colorfly-e708-q1.dtb \

	sun6i-a31s-cs908.dtb \

	sun6i-a31s-inet-q972.dtb \

	sun6i-a31s-primo81.dtb \

	sun6i-a31s-sina31s.dtb \

	sun6i-a31s-sinovoip-bpi-m2.dtb \
@@ -786,16 +788,22 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-a23-q8-tablet.dtb \

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

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

	sun8i-a33-inet-d978-rev2.dtb \

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

	sun8i-a33-olinuxino.dtb \

	sun8i-a33-q8-tablet.dtb \

	sun8i-a33-sinlinx-sina33.dtb \

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

	sun8i-a83t-cubietruck-plus.dtb \

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

	sun8i-h3-nanopi-neo.dtb \

	sun8i-h3-orangepi-2.dtb \

	sun8i-h3-orangepi-lite.dtb \

	sun8i-h3-orangepi-one.dtb \

	sun8i-h3-orangepi-pc.dtb \

	sun8i-h3-orangepi-pc-plus.dtb \

	sun8i-h3-orangepi-plus.dtb \

	sun8i-h3-orangepi-plus2e.dtb \

	sun8i-r16-parrot.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

arch/arm/boot/dts/axp209.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ 
	interrupt-controller;

	#interrupt-cells = <1>;



	axp_gpio: gpio {

		compatible = "x-powers,axp209-gpio";

		gpio-controller;

		#gpio-cells = <2>;

	};



	regulators {

		/* Default work frequency for buck regulators */

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

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

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

};



&ohci1 {

	status = "okay";

};



&otg_sram {

	status = "okay";

};

arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dts

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

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

 *

 * 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 "sun5i-a13.dtsi"

#include "sun5i-reference-design-tablet.dtsi"

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	model = "Empire Electronix M712 tablet";

	compatible = "empire-electronix,m712", "allwinner,sun5i-a13";

};