diff --git a/patch/u-boot/u-boot-sun50i-dev/add-nanopim1plus2.patch b/patch/u-boot/u-boot-sun50i-dev/badd-nanopim1plus2.patch similarity index 80% rename from patch/u-boot/u-boot-sun50i-dev/add-nanopim1plus2.patch rename to patch/u-boot/u-boot-sun50i-dev/badd-nanopim1plus2.patch index 5ed230233..d9707521c 100644 --- a/patch/u-boot/u-boot-sun50i-dev/add-nanopim1plus2.patch +++ b/patch/u-boot/u-boot-sun50i-dev/badd-nanopim1plus2.patch @@ -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 index 0000000..68f889d --- /dev/null +++ b/u-boot/arch/arm/dts/sun50i-h5-nanopim1plus2.dts -@@ -0,0 +1,152 @@ +@@ -0,0 +1,165 @@ +/* + * Copyright (c) 2016 ARM Ltd. + * @@ -54,7 +68,7 @@ index 0000000..68f889d + +/ { + model = "Nanopi M1+ 2"; -+ compatible = "orangepiprime", "allwinner,sun50i-h5"; ++ compatible = "xunlong,orangepi-pc-2", "allwinner,sun50i-h5"; + + chosen { + stdout-path = "serial0:115200n8"; @@ -103,15 +117,33 @@ index 0000000..68f889d + }; +}; + ++&gic { ++ compatible = "arm,gic-400"; ++}; ++ +&mmc0 { ++ compatible = "allwinner,sun50i-h5-mmc", ++ "allwinner,sun50i-a64-mmc", ++ "allwinner,sun5i-a13-mmc"; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; + vmmc-supply = <®_vcc3v3>; ++ bus-width = <4>; + cd-gpios = <&pio 5 6 0>; + cd-inverted; + status = "okay"; +}; + ++&mmc2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc2_8bit_pins>; ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc3v3>; ++ bus-width = <8>; ++ non-removable; ++ status = "okay"; ++}; ++ +&pio { + usb1_vbus_pin_a: usb1_vbus_pin@0 { + allwinner,pins = "PD6"; @@ -120,7 +152,6 @@ index 0000000..68f889d + allwinner,pull = ; + }; +}; -+ +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; @@ -128,19 +159,16 @@ index 0000000..68f889d +}; + +&usbphy { -+ usb1_vbus-supply = <®_usb1_vbus>; -+ status = "okay"; ++ status = "okay"; +}; + +&ohci1 { -+ status = "okay"; ++ status = "okay"; +}; + +&ehci1 { -+ status = "okay"; ++ status = "okay"; +}; -+ -+ +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; @@ -150,13 +178,11 @@ index 0000000..68f889d + status = "okay"; + + mdio { -+ ext_rgmii_phy: ethernet-phy@1 { -+ reg = <0>; -+ }; ++ ext_rgmii_phy: ethernet-phy@1 { ++ reg = <0>; ++ }; + }; +}; -+ -+ diff --git a/u-boot/configs/nanopim1plus2_defconfig b/u-boot/configs/nanopim1plus2_defconfig new file mode 100644 index 0000000..68f889d