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

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

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

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

Allwinner Device Tree changes for 4.3

A bunch of device tree patches that:
  - Enable the OTG controller on some boards
  - Various additions to the existing boards
  - New boards: A33 Ippo Q8H, Iteaduino Plus,

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

: (35 commits)
  ARM: dts: sun7i: Change cubietruck wifi enable pin to use mmc-pwrseq
  ARM: dts: sun5i: hsg-h702: Enable USB OTG controller
  ARM: dts: sun5i: hsg-h702: Enable side volume buttons with LRADC
  ARM: dts: sun8i: Enable USB DRC on Ippo Q8H-A33 tablet
  ARM: dts: sun5i: Enable USB DRC on A13 OLinuxIno
  ARM: dts: sun5i: Enable USB DRC on A10s OLinuxIno Micro
  ARM: dts: sun4i: Enable USB DRC on A10 OLinuxIno Lime
  ARM: sunxi: dt: Convert users to the PIO interrupts binding
  ARM: dts: sun4i: Add Iteaduino Plus A10
  ARM: dts: A10s-OLinuxIno: Add a node for axp152 pmic
  ARM: dts: axp152: Add a dtsi file for the axp152 pmic
  ARM: dts: sun6i: Enable otg controller on the cs908
  ARM: dts: sun4i: Enable otg controller on the mini-x
  ARM: dts: sun4i: Enable otg controller on the ba10-tvbox
  ARM: dts: sunxi: Add regulator-boot-on to usb host port regulator nodes
  devicetree: Add msi to the vendor-prefix list
  ARM: sun8i: dts: Add Ippo-q8h v1.2 with A33
  ARM: dts: sun8i: sina33: Enable USB hosts
  ARM: dts: sun8i: Enable USB host on GA10H-A33 tablets
  ARM: dts: sun8i: Enable USB DRC on GA10H-A33 tablets
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 027b4a6d 60018d02

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ mitsubishi Mitsubishi Electric Corporation 
mosaixtech	Mosaix Technologies, Inc.

moxa	Moxa

mpl	MPL AG

msi	Micro-Star International Co. Ltd.

mti	Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)

mundoreader	Mundo Reader S.L.

murata	Murata Manufacturing Co., Ltd.

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -573,6 +573,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-hackberry.dtb \

	sun4i-a10-hyundai-a7hd.dtb \

	sun4i-a10-inet97fv2.dtb \

	sun4i-a10-itead-iteaduino-plus.dts \

	sun4i-a10-jesurun-q5.dtb \

	sun4i-a10-marsboard.dtb \

	sun4i-a10-mini-xplus.dtb \
@@ -620,6 +621,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-a23-ippo-q8h-v1.2.dtb \

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

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

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

	sun8i-a33-sinlinx-sina33.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

arch/arm/boot/dts/axp152.dtsi

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

 */



&axp152 {

	compatible = "x-powers,axp152";

	interrupt-controller;

	#interrupt-cells = <1>;

};

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

+15 −0
Original line number Diff line number Diff line
@@ -125,12 +125,21 @@ 
	status = "okay";

};



&otg_sram {

	status = "okay";

};



&pio {

	usb2_vbus_pin_a: usb2_vbus_pin@0 {

		allwinner,pins = "PH12";

	};

};



&reg_usb0_vbus {

	regulator-boot-on;

	status = "okay";

};



&reg_usb1_vbus {

	status = "okay";

};
@@ -146,7 +155,13 @@ 
	status = "okay";

};



&usb_otg {

	dr_mode = "host";

	status = "okay";

};



&usbphy {

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

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

+34 −0
Original line number Diff line number Diff line
@@ -114,6 +114,30 @@ 
	status = "okay";

};



&otg_sram {

	status = "okay";

};



&pio {

	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>;

	};



	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {

		allwinner,pins = "PH5";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;

	};

};



&reg_usb0_vbus {

	status = "okay";

};



&reg_usb2_vbus {

	status = "okay";

};
@@ -124,7 +148,17 @@ 
	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

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

	usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};