summaryrefslogtreecommitdiff
path: root/arch/arm/dts/sun5i-a10s-wobo-i5.dts
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2016-08-18 20:51:12 +0200
committerHans de Goede <hdegoede@redhat.com>2016-08-26 16:58:36 +0200
commit860fbdd41f010348757926ca8f9c65dd00616d1e (patch)
treeeb92453773199d5077ced5b2fa53f3c79769ba67 /arch/arm/dts/sun5i-a10s-wobo-i5.dts
parenta1243f78519f91ec4da7dd70daccfdfae9100cd0 (diff)
sunxi: Sync dts files with upstream kernel
Sync dts files with the current (Aug 18th 2016) state of Maxime's linux/sunxi/for-next repo. Note this commit also updates configs/MSI_Primo81_defconfig, adding: "# CONFIG_REQUIRE_SERIAL_CONSOLE is not set", this is necessary because the tablet does not have a reachable uart so the dts sync drops its serial0 alias. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/dts/sun5i-a10s-wobo-i5.dts')
-rw-r--r--arch/arm/dts/sun5i-a10s-wobo-i5.dts10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/dts/sun5i-a10s-wobo-i5.dts
index 9fea918f94..b5de75f4c7 100644
--- a/arch/arm/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/dts/sun5i-a10s-wobo-i5.dts
@@ -79,6 +79,7 @@
regulator-name = "emac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
+ startup-delay-us = <20000>;
enable-active-high;
gpio = <&pio 0 2 GPIO_ACTIVE_HIGH>;
};
@@ -195,7 +196,14 @@
regulator-always-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vcc-wifi";
+ regulator-name = "vcc-wifi1";
+};
+
+&reg_ldo4 {
+ regulator-always-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc-wifi2";
};
&reg_usb1_vbus {