Merge pull request #1001 from karabek/master

H3 Nanopi Air: Update
This commit is contained in:
Igor Pečovnik 2018-06-05 11:07:43 +02:00 committed by GitHub
commit 22c347feaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
index ffe82e9..8c67647 100644
index 1925ae4..4ddd7b8 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
@@ -47,7 +47,7 @@
@ -25,16 +25,7 @@ index ffe82e9..8c67647 100644
leds {
compatible = "gpio-leds";
@@ -80,7 +87,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ pinctrl-0 = <&mmc0_pins>, <&mmc0_cd_pin>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
@@ -88,6 +95,42 @@
@@ -85,6 +92,42 @@
status = "okay";
};
@ -77,7 +68,7 @@ index ffe82e9..8c67647 100644
&ohci0 {
status = "okay";
};
@@ -100,6 +143,13 @@
@@ -97,6 +140,13 @@
status = "okay";
};