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

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

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

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

DT patches for the 4.4 merge window, most notably:
  - Enable the OTG controller on more boards
  - Create new DTSI for the q8's design
  - Added RSB support to the A23 and A33 SoCs
  - New boards: Olimex A20 EVB, Yones bs1078v2

Plus the usual random patches enabling and / or enhancing a few things in
particular boards.

* tag 'sunxi-dt-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (59 commits)
  ARM: dts: sun6i: hummingbird: Drop AXP221 DC1SW and DC5LDO supplies
  ARM: dts: sun8i: sinlinx-sina33: Enable Reduced Serial Bus controller
  ARM: dts: sun8i: q8-common: Enable RSB controller for A23/A33 Q8 tablets
  ARM: dts: sun8i: Add Reduced Serial Bus controller device node to A23/A33 dtsi
  ARM: dts: sun4i: Add AXP209 PMU regulators for pcDuino1/2
  ARM: sun7i: dt: Add new Olimex A20 EVB device
  ARM: dts: sun6i: hummingbird: Add aliases for rtc devices
  ARM: dts: sun7i: Add dts file for Wits Pro A20 DKT
  ARM: dts: sun7i: Enable USB DRC on Wexler TAB7200
  ARM: dts: sun7i: Enable USB DRC on the Orange pi
  ARM: dts: sun7i: Enable USB DRC on orangepi-mini
  ARM: dts: axp209: Add usb_power_supply child node to the ax209 node
  ARM: dts: sun8i: Make ippo-q8h-v1.2.dts a symlink to q8-tablet.dts
  ARM: dts: sun8i: Add sun8i-a33-q8-tablet.dts file
  ARM: dts: sun6i: Add support for Yones Toptech bs1078v2 tablets
  ARM: dts: sun4i: Enable USB DRC on the Marsboard A10
  ARM: dts: sun4i: gemei-g9: Add accelerometer (bma250) IRQ
  ARM: dts: sun8i-a33: Add security system crypto engine clock and device nodes
  ARM: dts: sun8i: Add pwm-backlight device for A23/A33 Q8 format tablets
  ARM: sun8i: A23: Add missing msgbox gate
  ...
parents 129c29c4 52095d17

arch/arm/boot/dts/Makefile

+14 −3
Original line number Diff line number Diff line
@@ -584,8 +584,10 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-gemei-g9.dtb \

	sun4i-a10-hackberry.dtb \

	sun4i-a10-hyundai-a7hd.dtb \

	sun4i-a10-inet1.dtb \

	sun4i-a10-inet97fv2.dtb \

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

	sun4i-a10-inet9f-rev03.dtb \

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

	sun4i-a10-jesurun-q5.dtb \

	sun4i-a10-marsboard.dtb \

	sun4i-a10-mini-xplus.dtb \
@@ -594,13 +596,17 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-olinuxino-lime.dtb \

	sun4i-a10-pcduino.dtb

dtb-$(CONFIG_MACH_SUN5I) += \

	sun5i-a10s-auxtek-t003.dtb \

	sun5i-a10s-auxtek-t004.dtb \

	sun5i-a10s-mk802.dtb \

	sun5i-a10s-olinuxino-micro.dtb \

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

	sun5i-a10s-wobo-i5.dtb \

	sun5i-a13-hsg-h702.dtb \

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

	sun5i-a13-olinuxino.dtb \

	sun5i-a13-olinuxino-micro.dtb \

	sun5i-a13-q8-tablet.dtb \

	sun5i-a13-utoo-p66.dtb

dtb-$(CONFIG_MACH_SUN6I) += \

	sun6i-a31-app4-evb1.dtb \
@@ -609,7 +615,8 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
	sun6i-a31-i7.dtb \

	sun6i-a31-m9.dtb \

	sun6i-a31-mele-a1000g-quad.dtb \

	sun6i-a31s-cs908.dtb

	sun6i-a31s-cs908.dtb \

	sun6i-a31s-yones-toptech-bs1078-v2.dtb

dtb-$(CONFIG_MACH_SUN7I) += \

	sun7i-a20-bananapi.dtb \

	sun7i-a20-bananapro.dtb \
@@ -619,6 +626,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-i12-tvbox.dtb \

	sun7i-a20-m3.dtb \

	sun7i-a20-mk808c.dtb \

	sun7i-a20-olimex-som-evb.dtb \

	sun7i-a20-olinuxino-lime.dtb \

	sun7i-a20-olinuxino-lime2.dtb \

	sun7i-a20-olinuxino-micro.dtb \
@@ -626,14 +634,17 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-orangepi-mini.dtb \

	sun7i-a20-pcduino3.dtb \

	sun7i-a20-pcduino3-nano.dtb \

	sun7i-a20-wexler-tab7200.dtb

	sun7i-a20-wexler-tab7200.dtb \

	sun7i-a20-wits-pro-a20-dkt.dtb

dtb-$(CONFIG_MACH_SUN8I) += \

	sun8i-a23-evb.dtb \

	sun8i-a23-gt90h-v4.dtb \

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

	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-q8-tablet.dtb \

	sun8i-a33-sinlinx-sina33.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

arch/arm/boot/dts/axp209.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -89,4 +89,9 @@ 
			regulator-name = "ldo5";

		};

	};



	usb_power_supply: usb_power_supply {

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

		status = "disabled";

	};

};

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

+12 −0
Original line number Diff line number Diff line
@@ -78,6 +78,18 @@ 
	};

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins_a>;

	status = "okay";

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";

};



&lradc {

	vref-supply = <&reg_vcc3v0>;

	status = "okay";

arch/arm/boot/dts/sun4i-a10-gemei-g9.dts

+4 −7
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "sunxi-common-regulators.dtsi"

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

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

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



/ {

	model = "Gemei G9 Tablet";
@@ -64,7 +65,7 @@ 
/*

 * TODO:

 *   2x cameras via CSI

 *   bma250 IRQs

 *   audio

 *   AXP battery management

 *   NAND

 *   OTG
@@ -103,12 +104,8 @@ 
	bma250@18 {

		compatible = "bosch,bma250";

		reg = <0x18>;



		/*

		 * TODO: interrupt pins:

		 * int1 - PH00

		 * int2 - PI10

		 */

		interrupt-parent = <&pio>;

		interrupts = <7 0 IRQ_TYPE_EDGE_RISING>; /* PH00 / EINT0 */

	};

};

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

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

 *

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

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

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

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



/ {

	model = "iNet-1";

	compatible = "inet-tek,inet1", "allwinner,sun4i-a10";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&cpu0 {

	cpu-supply = <&reg_dcdc2>;

};



&ehci0  {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";



	axp209: pmic@34 {

		reg = <0x34>;

		interrupts = <0>;

	};

};



#include "axp209.dtsi"



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins_a>;

	status = "okay";



	/* Accelerometer */

	bma250@18 {

		compatible = "bosch,bma250";

		reg = <0x18>;

		interrupt-parent = <&pio>;

		interrupts = <7 0 IRQ_TYPE_EDGE_RISING>; /* PH0 / EINT0 */

	};

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";

};



&lradc {

	vref-supply = <&reg_ldo2>;

	status = "okay";



	button@200 {

		label = "Volume Up";

		linux,code = <KEY_VOLUMEUP>;

		channel = <0>;

		voltage = <200000>;

	};



	button@1000 {

		label = "Volume Down";

		linux,code = <KEY_VOLUMEDOWN>;

		channel = <0>;

		voltage = <1000000>;

	};



	button@1200 {

		label = "Home";

		linux,code = <KEY_HOMEPAGE>;

		channel = <0>;

		voltage = <1200000>;

	};

};



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

};



&ohci0  {

	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_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1000000>;

	regulator-max-microvolt = <1400000>;

	regulator-name = "vdd-cpu";

};



&reg_dcdc3 {

	regulator-always-on;

	regulator-min-microvolt = <1250000>;

	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_usb0_vbus {

	status = "okay";

};



&reg_usb1_vbus {

	status = "okay";

};



&reg_usb2_vbus {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

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

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE