sun8i-dev fixes

This commit is contained in:
zador-blood-stained 2017-05-01 21:52:11 +03:00
parent 7138ce5652
commit c257d7989a
2 changed files with 22 additions and 9 deletions

View file

@ -1,8 +1,16 @@
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
index 2216e68d..e78001cd 100644 index 2216e68d..143ebc06 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi --- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi +++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
@@ -88,12 +88,90 @@ @@ -48,6 +48,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
+#include <dt-bindings/thermal/thermal.h>
/ {
aliases {
@@ -88,12 +89,90 @@
gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
}; };
}; };

View file

@ -1,16 +1,22 @@
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
index 22b99b40..2efbfb96 100644 index 22b99b40..cc4e5398 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts --- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
@@ -90,6 +90,84 @@ @@ -47,6 +47,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
+#include <dt-bindings/thermal/thermal.h>
/ {
model = "Xunlong Orange Pi Lite";
@@ -90,6 +91,82 @@
gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
}; };
}; };
+ +
+ wifi_pwrseq: wifi_pwrseq { + wifi_pwrseq: wifi_pwrseq {
+ compatible = "mmc-pwrseq-simple"; + compatible = "mmc-pwrseq-simple";
+ pinctrl-names = "default";
+ pinctrl-0 = <&wifi_pwrseq_pin_orangepi>;
+ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 WIFI_EN */ + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 WIFI_EN */
+ }; + };
+ +
@ -87,7 +93,7 @@ index 22b99b40..2efbfb96 100644
}; };
&ehci1 { &ehci1 {
@@ -120,6 +198,7 @@ @@ -120,6 +197,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>; pinctrl-0 = <&mmc1_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
@ -95,12 +101,11 @@ index 22b99b40..2efbfb96 100644
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
status = "okay"; status = "okay";
@@ -160,13 +239,26 @@ @@ -160,13 +238,25 @@
}; };
}; };
+&reg_usb0_vbus { +&reg_usb0_vbus {
+ pinctrl-0 = <&usb0_vbus_pin_opipc>;
+ gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */ + gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */
+ status = "okay"; + status = "okay";
+}; +};