Update u-boot patch for Nano M1+2

This commit is contained in:
Igor Pecovnik 2017-04-25 22:12:30 +02:00
parent 147545fabb
commit 41c2c3051e

View file

@ -1,9 +1,23 @@
diff --git a/u-boot/arch/arm/dts/sun50i-h5-orangepi-prime.dts b/u-boot/arch/arm/dts/sun50i-h5-orangepi-prime.dts diff --git a/u-boot/arch/arm/dts/Makefile b/u-boot/arch/arm/dts/Makefile
index 15f2a76..5653153 100644
--- a/u-boot/arch/arm/dts/Makefile
+++ b/u-boot/arch/arm/dts/Makefile
@@ -283,7 +283,8 @@
dtb-$(CONFIG_MACH_SUN50I_H5) += \
sun50i-h5-orangepi-pc2.dtb \
sun50i-h5-orangepi-prime.dtb \
- sun50i-h5-orangepi-zeroplus.dtb
+ sun50i-h5-orangepi-zeroplus.dtb \
+ sun50i-h5-nanopim1plus2.dtb
dtb-$(CONFIG_MACH_SUN50I) += \
sun50i-a64-pine64-plus.dtb \
sun50i-a64-pine64.dtb \
diff --git a/u-boot/arch/arm/dts/sun50i-h5-nanopim1plus2.dts b/u-boot/arch/arm/dts/sun50i-h5-nanopim1plus2.dts
new file mode 100644 new file mode 100644
index 0000000..68f889d index 0000000..68f889d
--- /dev/null --- /dev/null
+++ b/u-boot/arch/arm/dts/sun50i-h5-nanopim1plus2.dts +++ b/u-boot/arch/arm/dts/sun50i-h5-nanopim1plus2.dts
@@ -0,0 +1,152 @@ @@ -0,0 +1,165 @@
+/* +/*
+ * Copyright (c) 2016 ARM Ltd. + * Copyright (c) 2016 ARM Ltd.
+ * + *
@ -54,7 +68,7 @@ index 0000000..68f889d
+ +
+/ { +/ {
+ model = "Nanopi M1+ 2"; + model = "Nanopi M1+ 2";
+ compatible = "orangepiprime", "allwinner,sun50i-h5"; + compatible = "xunlong,orangepi-pc-2", "allwinner,sun50i-h5";
+ +
+ chosen { + chosen {
+ stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8";
@ -103,15 +117,33 @@ index 0000000..68f889d
+ }; + };
+}; +};
+ +
+&gic {
+ compatible = "arm,gic-400";
+};
+
+&mmc0 { +&mmc0 {
+ compatible = "allwinner,sun50i-h5-mmc",
+ "allwinner,sun50i-a64-mmc",
+ "allwinner,sun5i-a13-mmc";
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ vmmc-supply = <&reg_vcc3v3>; + vmmc-supply = <&reg_vcc3v3>;
+ bus-width = <4>;
+ cd-gpios = <&pio 5 6 0>; + cd-gpios = <&pio 5 6 0>;
+ cd-inverted; + cd-inverted;
+ status = "okay"; + status = "okay";
+}; +};
+ +
+&mmc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_8bit_pins>;
+ vmmc-supply = <&reg_vcc3v3>;
+ vqmmc-supply = <&reg_vcc3v3>;
+ bus-width = <8>;
+ non-removable;
+ status = "okay";
+};
+
+&pio { +&pio {
+ usb1_vbus_pin_a: usb1_vbus_pin@0 { + usb1_vbus_pin_a: usb1_vbus_pin@0 {
+ allwinner,pins = "PD6"; + allwinner,pins = "PD6";
@ -120,7 +152,6 @@ index 0000000..68f889d
+ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ }; + };
+}; +};
+
+&uart0 { +&uart0 {
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pins_a>;
@ -128,19 +159,16 @@ index 0000000..68f889d
+}; +};
+ +
+&usbphy { +&usbphy {
+ usb1_vbus-supply = <&reg_usb1_vbus>; + status = "okay";
+ status = "okay";
+}; +};
+ +
+&ohci1 { +&ohci1 {
+ status = "okay"; + status = "okay";
+}; +};
+ +
+&ehci1 { +&ehci1 {
+ status = "okay"; + status = "okay";
+}; +};
+
+
+&emac { +&emac {
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&emac_rgmii_pins>; + pinctrl-0 = <&emac_rgmii_pins>;
@ -150,13 +178,11 @@ index 0000000..68f889d
+ status = "okay"; + status = "okay";
+ +
+ mdio { + mdio {
+ ext_rgmii_phy: ethernet-phy@1 { + ext_rgmii_phy: ethernet-phy@1 {
+ reg = <0>; + reg = <0>;
+ }; + };
+ }; + };
+}; +};
+
+
diff --git a/u-boot/configs/nanopim1plus2_defconfig b/u-boot/configs/nanopim1plus2_defconfig diff --git a/u-boot/configs/nanopim1plus2_defconfig b/u-boot/configs/nanopim1plus2_defconfig
new file mode 100644 new file mode 100644
index 0000000..68f889d index 0000000..68f889d