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

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

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

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

Merge "Allwinner DT additions for 4.7" from Maxime Ripard:

The usual bunch of changes, mostly:
  * Addition of the SPDIF support
  * Addition of the pre-requisites for the display support
  * New boards: Difrence DIT4350, colorfly e708 q1, Dserve DSRV9703C,
                Polaroid MID2809PXE4, Orange Pi PC, Orange Pi 2

* tag 'sunxi-dt-for-4.7' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (38 commits)
  ARM: dts: sun7i: Enable S/PDIF on the Cubietruck
  ARM: sun5i: Add DRAM gates
  ARM: sun5i: Add TV encoder gate to the DTSI
  ARM: sun5i: dt: Add pll3 and pll7 clocks
  ARM: dts: sun8i: Add dts file for the Orange Pi One SBC
  ARM: sun7i: dt: Enable dram gate 5 (tve0 clock) for simplefb TV output
  ARM: sun4i: dt: Enable dram gate 5 (tve0 clock) for simplefb TV output
  ARM: dts: sun5i-a13-olinuxino-micro: enable USB DRC
  ARM: dts: sun8i: Base Orange Pi Plus dts on the Orange Pi 2 dts
  ARM: dts: sun8i: Orangepi plus gpio keys fixes and improvements
  ARM: dts: sun8i: Add dts for Orange Pi 2 SBC
  ARM: dts: sun8i: Add Orange Pi PC support
  ARM: dts: sun8i: Fix pio nodes Orangepi Plus dts
  ARM: dts: sun7i: Add SPDIF to the Itead Ibox
  ARM: dts: sun4i: Add SPDIF to the Mele A1000
  ARM: dts: sun7i: Add the SPDIF block to the A20
  ARM: dts: sun4i: Add the SPDIF block to the A10
  ARM: dts: sun7i: Add the SPDIF clk to the A20
  ARM: dts: sun4i: Add the SPDIF clk to the A10
  ARM: dts: sun7i: Add SPDIF TX pin to the A20
  ...
parents 10bd9eb7 b52e345d

arch/arm/boot/dts/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-ba10-tvbox.dtb \

	sun4i-a10-chuwi-v7-cw0825.dtb \

	sun4i-a10-cubieboard.dtb \

	sun4i-a10-dserve-dsrv9703c.dtb \

	sun4i-a10-gemei-g9.dtb \

	sun4i-a10-hackberry.dtb \

	sun4i-a10-hyundai-a7hd.dtb \
@@ -700,6 +701,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \ 
	sun5i-a10s-olinuxino-micro.dtb \

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

	sun5i-a10s-wobo-i5.dtb \

	sun5i-a13-difrnce-dit4350.dtb \

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

	sun5i-a13-hsg-h702.dtb \

	sun5i-a13-inet-98v-rev2.dtb \
@@ -715,6 +717,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
	sun6i-a31-i7.dtb \

	sun6i-a31-m9.dtb \

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

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

	sun6i-a31s-cs908.dtb \

	sun6i-a31s-primo81.dtb \

	sun6i-a31s-sina31s.dtb \
@@ -747,6 +750,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-a23-gt90h-v4.dtb \

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

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

	sun8i-a23-polaroid-mid2809pxe04.dtb \

	sun8i-a23-q8-tablet.dtb \

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

	sun8i-a33-ga10h-v1.1.dtb \
@@ -755,6 +759,9 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-a33-sinlinx-sina33.dtb \

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

	sun8i-a83t-cubietruck-plus.dtb \

	sun8i-h3-orangepi-2.dtb \

	sun8i-h3-orangepi-one.dtb \

	sun8i-h3-orangepi-pc.dtb \

	sun8i-h3-orangepi-plus.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

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

+24 −0
Original line number Diff line number Diff line
@@ -87,6 +87,24 @@ 
		enable-active-high;

		gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "On-board SPDIF";



		simple-audio-card,cpu {

			sound-dai = <&spdif>;

		};



		simple-audio-card,codec {

			sound-dai = <&spdif_out>;

		};

	};



	spdif_out: spdif-out {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

	};

};



&ahci {
@@ -188,6 +206,12 @@ 
	status = "okay";

};



&spdif {

	pinctrl-names = "default";

	pinctrl-0 = <&spdif_tx_pins_a>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts

0 → 100644
+281 −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 "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>

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



/ {

	model = "Dserve DSRV9703C";

	compatible = "dserve,dsrv9703c", "allwinner,sun4i-a10";



	aliases {

		serial0 = &uart0;

	};



	backlight: backlight {

		compatible = "pwm-backlight";

		pinctrl-names = "default";

		pinctrl-0 = <&bl_en_pin_dsrv9703c>;

		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;

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

		default-brightness-level = <8>;

		enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	haptics {

		compatible = "regulator-haptic";

		haptic-supply = <&reg_motor>;

		min-microvolt = <3000000>;

		max-microvolt = <3000000>;

	};



	reg_motor: reg_motor {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&motor_pins>;

		regulator-name = "vcc-motor";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		enable-active-high;

		gpio = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */

	};

};



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

};



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

	/* pull-ups and devices require AXP209 LDO3 */

	status = "failed";

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";



	ft5406ee8: touchscreen@38 {

		compatible = "edt,edt-ft5406";

		reg = <0x38>;

		interrupt-parent = <&pio>;

		interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>;

		pinctrl-names = "default";

		pinctrl-0 = <&touchscreen_pins>;

		reset-gpios = <&pio 1 13 GPIO_ACTIVE_LOW>;

		touchscreen-size-x = <1024>;

		touchscreen-size-y = <768>;

	};

};



&lradc {

	vref-supply = <&reg_ldo2>;

	status = "okay";



	button@400 {

		label = "Volume Down";

		linux,code = <KEY_VOLUMEDOWN>;

		channel = <0>;

		voltage = <400000>;

	};



	button@800 {

		label = "Volume Up";

		linux,code = <KEY_VOLUMEUP>;

		channel = <0>;

		voltage = <800000>;

	};

};



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

};



&otg_sram {

	status = "okay";

};



&pio {

	bl_en_pin_dsrv9703c: bl_en_pin@0 {

		allwinner,pins = "PH7";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

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

	};



	motor_pins: motor_pins@0 {

		allwinner,pins = "PB3";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	touchscreen_pins: touchscreen_pins@0 {

		allwinner,pins = "PB13";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



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

	};

};



&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_pins_a>;

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

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};

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

+32 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";

			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,

				 <&ahb_gates 44>, <&ahb_gates 46>,

				 <&dram_gates 25>, <&dram_gates 26>;

				 <&dram_gates 5>, <&dram_gates 25>, <&dram_gates 26>;

			status = "disabled";

		};

	};
@@ -477,6 +477,17 @@ 
			clock-output-names = "ir1";

		};



		spdif_clk: clk@01c200c0 {

			#clock-cells = <0>;

			compatible = "allwinner,sun4i-a10-mod1-clk";

			reg = <0x01c200c0 0x4>;

			clocks = <&pll2 SUN4I_A10_PLL2_8X>,

				 <&pll2 SUN4I_A10_PLL2_4X>,

				 <&pll2 SUN4I_A10_PLL2_2X>,

				 <&pll2 SUN4I_A10_PLL2_1X>;

			clock-output-names = "spdif";

		};



		usb_clk: clk@01c200cc {

			#clock-cells = <1>;

			#reset-cells = <1>;
@@ -1006,6 +1017,13 @@ 
				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};



			spdif_tx_pins_a: spdif@0 {

				allwinner,pins = "PB13";

				allwinner,function = "spdif";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

			};

		};



		timer@01c20c00 {
@@ -1034,6 +1052,19 @@ 
			status = "disabled";

		};



		spdif: spdif@01c21000 {

			#sound-dai-cells = <0>;

			compatible = "allwinner,sun4i-a10-spdif";

			reg = <0x01c21000 0x400>;

			interrupts = <13>;

			clocks = <&apb0_gates 1>, <&spdif_clk>;

			clock-names = "apb", "spdif";

			dmas = <&dma SUN4I_DMA_NORMAL 2>,

			       <&dma SUN4I_DMA_NORMAL 2>;

			dma-names = "rx", "tx";

			status = "disabled";

		};



		ir0: ir@01c21800 {

			compatible = "allwinner,sun4i-a10-ir";

			clocks = <&apb0_gates 6>, <&ir0_clk>;

arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dts

0 → 100644
+226 −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 "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 = "Difrnce DIT4350";

	compatible = "difrnce,dit4350", "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_d709>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

	cd-inverted;

	status = "okay";

};



&otg_sram {

	status = "okay";

};



&pio {

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

};