Commit 7ca08a90 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-for-4.5-2' of... 

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

Allwinner DT patches, round 2

Mostly some audio codec patches to enable it on more boards, and a bunch
devices activation (Ethernet, touchscreen, backlights). One more board has
been added too.

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

:
  ARM: dts: sun5i: Add dts file for the Empire Electronix D709 tablet
  ARM: dts: sun7i: Enable gmac on Wits Pro A20 DKT
  ARM: dt: sun7i: Enable audio codec on MK808C
  ARM: sunxi: dt: enable audio codec on mk802
  ARM: dts: sun7i: Add PA gpio pin to Wexler TAB7200 tablet
  ARM: dts: sun7i: Add backlight node to Wexler TAB7200 tablet
  ARM: dts: sun7i: Enable touchscreen on Wexler TAB7200 tablet
  ARM: dts: sun7i: Enable PWM controller on Wexler TAB7200 tablet
  ARM: dts: sun4i: gemei-g9: Enable PA GPIO pin configuration
  ARM: dts: sun4i: Enable onboard codec used on the pov protab2-ips9 tablet
  ARM: dts: sun5i: Enable onboard codec used on the UTOO P66 tablet

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 250481d3 12ec9384

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -638,6 +638,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \ 
	sun5i-a10s-olinuxino-micro.dtb \

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

	sun5i-a10s-wobo-i5.dtb \

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

	sun5i-a13-hsg-h702.dtb \

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

	sun5i-a13-olinuxino.dtb \

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

+13 −1
Original line number Diff line number Diff line
@@ -65,13 +65,16 @@ 
/*

 * TODO:

 *   2x cameras via CSI

 *   audio input

 *   AXP battery management

 *   NAND

 *   OTG

 *   Touchscreen - gt801_2plus1 @ i2c adapter 2 @ 0x48

 */

&codec {

	/* PH15 controls power to external amplifier (ft2012q) */

	pinctrl-names = "default";

	pinctrl-0 = <&codec_pa_pin>;

	allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>;

	status = "okay";

};
@@ -151,6 +154,15 @@ 
	status = "okay";

};



&pio {

	codec_pa_pin: codec_pa_pin@0 {

		allwinner,pins = "PH15";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1000000>;

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

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ 
	};

};



&codec {

	status = "okay";

};



&ehci0 {

	status = "okay";

};

arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts

+14 −0
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ 
	};

};



&codec {

	pinctrl-names = "default";

	pinctrl-0 = <&codec_pa_pin>;

	allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */

	status = "okay";

};



&cpu0 {

	cpu-supply = <&reg_dcdc2>;

};
@@ -163,6 +170,13 @@ 
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	codec_pa_pin: codec_pa_pin@0 {

		allwinner,pins = "PH15";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	touchscreen_pins: touchscreen_pins@0 {

		allwinner,pins = "PA5", "PB13";

		allwinner,function = "gpio_out";

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

0 → 100644
+241 −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 "sun5i-a13.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>

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



/ {

	model = "Empire Electronix D709 tablet";

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



	aliases {

		serial0 = &uart1;

	};



	backlight: backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;

		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;

		default-brightness-level = <8>;

		/* TODO: backlight uses axp gpio1 as enable pin */

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&cpu0 {

	cpu-supply = <&reg_dcdc2>;

};



&ehci0 {

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



	pcf8563: rtc@51 {

		compatible = "nxp,pcf8563";

		reg = <0x51>;

	};

};



&lradc {

	vref-supply = <&reg_ldo2>;

	status = "okay";



	button@200 {

		label = "Volume Up";

		linux,code = <KEY_VOLUMEUP>;

		channel = <0>;

		voltage = <200000>;

	};



	button@400 {

		label = "Volume Down";

		linux,code = <KEY_VOLUMEDOWN>;

		channel = <0>;

		voltage = <400000>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_inet98fv2>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */

	cd-inverted;

	status = "okay";

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <8>;

	non-removable;

	status = "okay";



	mmccard: mmccard@0 {

		reg = <0>;

		compatible = "mmc-card";

		broken-hpi;

	};

};



&otg_sram {

	status = "okay";

};



&pio {

	mmc0_cd_pin_inet98fv2: mmc0_cd_pin@0 {

		allwinner,pins = "PG0";

		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 = "PG1";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;

	};



	usb0_id_detect_pin: usb0_id_detect_pin@0 {

		allwinner,pins = "PG2";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

	};

};



&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_pins>;

	status = "okay";

};



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

};



&reg_ldo1 {

	regulator-name = "vdd-rtc";

};



&reg_ldo2 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "avcc";

};



&reg_ldo3 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-wifi";

};



&reg_usb0_vbus {

	gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins_b>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usb0_vbus_pin_a {

	allwinner,pins = "PG12";

};



&usbphy {

	pinctrl-names = "default";

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

	usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */

	usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb1_vbus-supply = <&reg_ldo3>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE