From cdb3b42bdbe87f9d0fa88ab94e396c02b1697f11 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Sun, 7 May 2017 13:55:48 -0400 Subject: [PATCH] remove unresolved patches since now resolved --- .../unresolved/add-sun50i-a64-overlays.patch | 375 ------------------ .../unresolved/add-sun50i-h5-overlays.patch | 375 ------------------ .../unresolved/add_nanopim1plus2_dts.patch | 165 -------- .../unresolved/add_orangepiwin_dts.patch | 153 ------- 4 files changed, 1068 deletions(-) delete mode 100644 patch/kernel/sun50i-dev/unresolved/add-sun50i-a64-overlays.patch delete mode 100644 patch/kernel/sun50i-dev/unresolved/add-sun50i-h5-overlays.patch delete mode 100644 patch/kernel/sun50i-dev/unresolved/add_nanopim1plus2_dts.patch delete mode 100644 patch/kernel/sun50i-dev/unresolved/add_orangepiwin_dts.patch diff --git a/patch/kernel/sun50i-dev/unresolved/add-sun50i-a64-overlays.patch b/patch/kernel/sun50i-dev/unresolved/add-sun50i-a64-overlays.patch deleted file mode 100644 index 675016781..000000000 --- a/patch/kernel/sun50i-dev/unresolved/add-sun50i-a64-overlays.patch +++ /dev/null @@ -1,375 +0,0 @@ -diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile -index 244e8b7..afcc1c0 100644 ---- a/arch/arm64/boot/dts/allwinner/Makefile -+++ b/arch/arm64/boot/dts/allwinner/Makefile -@@ -3,5 +3,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb - dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb - - always := $(dtb-y) --subdir-y := $(dts-dirs) -+subdir-y := $(dts-dirs) overlays - clean-files := *.dtb -+ -+dts-dirs += overlays -diff --git a/arch/arm64/boot/dts/allwinner/overlays/Makefile b/arch/arm64/boot/dts/allwinner/overlays/Makefile -new file mode 100644 -index 0000000..bb7c8ad ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/Makefile -@@ -0,0 +1,26 @@ -+ifeq ($(CONFIG_OF_CONFIGFS),y) -+ -+dtbo-$(CONFIG_ARCH_SUNXI) += \ -+ sun50i-a64-i2c0.dtbo \ -+ sun50i-a64-i2c1.dtbo \ -+ sun50i-a64-i2c2.dtbo \ -+ sun50i-a64-spi0-jedec-nor.dtbo \ -+ sun50i-a64-spi0-spidev.dtbo \ -+ sun50i-a64-spi1-jedec-nor.dtbo \ -+ sun50i-a64-spi1-spidev.dtbo \ -+ sun50i-a64-uart1.dtbo \ -+ sun50i-a64-uart2.dtbo \ -+ sun50i-a64-uart3.dtbo -+ -+#scr-$(CONFIG_ARCH_SUNXI) += sun50i-a64-fixup.scr -+ -+#dtbotxt-$(CONFIG_ARCH_SUNXI) += README.sun50i-a64-overlays -+ -+targets += $(dtbo-y) -+#$(scr-y) $(dtbotxt-y) -+ -+endif -+ -+always := $(dtbo-y) -+# $(scr-y) $(dtbotxt-y) -+clean-files := *.dtbo *.scr -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-i2c0.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-i2c0.dts -new file mode 100644 -index 0000000..5377cc6 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-i2c0.dts -@@ -0,0 +1,20 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ i2c0 = "/soc/i2c@01c2ac00"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&i2c0>; -+ __overlay__ { -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-i2c1.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-i2c1.dts -new file mode 100644 -index 0000000..36291c5 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-i2c1.dts -@@ -0,0 +1,20 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ i2c1 = "/soc/i2c@01c2b000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&i2c1>; -+ __overlay__ { -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-i2c2.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-i2c2.dts -new file mode 100644 -index 0000000..0e1de08 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-i2c2.dts -@@ -0,0 +1,20 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ i2c2 = "/soc/i2c@01c2b400"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&i2c2>; -+ __overlay__ { -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi0-jedec-nor.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi0-jedec-nor.dts -new file mode 100644 -index 0000000..5fea00c ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi0-jedec-nor.dts -@@ -0,0 +1,45 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ spi0 = "/soc/spi@01c68000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&spi0>; -+ __overlay__ { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spiflash@0 { -+ compatible = "jedec,spi-nor"; -+ status = "okay"; -+ reg = <0>; -+ spi-max-frequency = <1000000>; -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@0 { -+ label = "uboot"; -+ reg = <0x0 0x100000>; -+ }; -+ partition@100000 { -+ label = "env"; -+ reg = <0x100000 0x100000>; -+ }; -+ partition@200000 { -+ label = "data"; -+ reg = <0x200000 0x200000>; -+ }; -+ }; -+ }; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi1-jedec-nor.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi1-jedec-nor.dts -new file mode 100644 -index 0000000..5fea00c ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi1-jedec-nor.dts -@@ -0,0 +1,45 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ spi1 = "/soc/spi@01c69000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&spi1>; -+ __overlay__ { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spiflash@0 { -+ compatible = "jedec,spi-nor"; -+ status = "okay"; -+ reg = <0>; -+ spi-max-frequency = <1000000>; -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@0 { -+ label = "uboot"; -+ reg = <0x0 0x100000>; -+ }; -+ partition@100000 { -+ label = "env"; -+ reg = <0x100000 0x100000>; -+ }; -+ partition@200000 { -+ label = "data"; -+ reg = <0x200000 0x200000>; -+ }; -+ }; -+ }; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi0-spidev.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi0-spidev.dts -new file mode 100644 -index 0000000..8eacf1b ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi0-spidev.dts -@@ -0,0 +1,27 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ spi0 = "/soc/spi@01c68000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&spi0>; -+ __overlay__ { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spidev@0 { -+ compatible = "spidev"; -+ reg = <0>; -+ spi-max-frequency = <1000000>; -+ }; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi1-spidev.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi1-spidev.dts -new file mode 100644 -index 0000000..8eacf1b ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-spi1-spidev.dts -@@ -0,0 +1,27 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ spi1 = "/soc/spi@01c69000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&spi1>; -+ __overlay__ { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spidev@0 { -+ compatible = "spidev"; -+ reg = <0>; -+ spi-max-frequency = <1000000>; -+ }; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-uart1.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-uart1.dts -new file mode 100644 -index 0000000..902e3e5 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-uart1.dts -@@ -0,0 +1,22 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ serial1 = "/soc/serial@01c28400"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&uart1>; -+ __overlay__ { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart1_pins>; -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-uart2.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-uart2.dts -new file mode 100644 -index 0000000..8a91069 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-uart2.dts -@@ -0,0 +1,22 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ serial2 = "/soc/serial@01c28800"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&uart2>; -+ __overlay__ { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart2_pins>; -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-uart3.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-uart3.dts -new file mode 100644 -index 0000000..3f729d4 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-a64-uart3.dts -@@ -0,0 +1,22 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-a64"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ serial3 = "/soc/serial@01c28c00"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&uart3>; -+ __overlay__ { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart3_pins>; -+ status = "okay"; -+ }; -+ }; -+}; diff --git a/patch/kernel/sun50i-dev/unresolved/add-sun50i-h5-overlays.patch b/patch/kernel/sun50i-dev/unresolved/add-sun50i-h5-overlays.patch deleted file mode 100644 index 215d3e6f1..000000000 --- a/patch/kernel/sun50i-dev/unresolved/add-sun50i-h5-overlays.patch +++ /dev/null @@ -1,375 +0,0 @@ -diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile -index 244e8b7..afcc1c0 100644 ---- a/arch/arm64/boot/dts/allwinner/Makefile -+++ b/arch/arm64/boot/dts/allwinner/Makefile -@@ -3,5 +3,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-pine64-plus.dtb sun50i-h5-pine64.dtb - dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb - - always := $(dtb-y) --subdir-y := $(dts-dirs) -+subdir-y := $(dts-dirs) overlays - clean-files := *.dtb -+ -+dts-dirs += overlays -diff --git a/arch/arm64/boot/dts/allwinner/overlays/Makefile b/arch/arm64/boot/dts/allwinner/overlays/Makefile -new file mode 100644 -index 0000000..bb7c8ad ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/Makefile -@@ -0,0 +1,26 @@ -+ifeq ($(CONFIG_OF_CONFIGFS),y) -+ -+dtbo-$(CONFIG_ARCH_SUNXI) += \ -+ sun50i-h5-i2c0.dtbo \ -+ sun50i-h5-i2c1.dtbo \ -+ sun50i-h5-i2c2.dtbo \ -+ sun50i-h5-spi0-jedec-nor.dtbo \ -+ sun50i-h5-spi0-spidev.dtbo \ -+ sun50i-h5-spi1-jedec-nor.dtbo \ -+ sun50i-h5-spi1-spidev.dtbo \ -+ sun50i-h5-uart1.dtbo \ -+ sun50i-h5-uart2.dtbo \ -+ sun50i-h5-uart3.dtbo -+ -+#scr-$(CONFIG_ARCH_SUNXI) += sun50i-h5-fixup.scr -+ -+#dtbotxt-$(CONFIG_ARCH_SUNXI) += README.sun50i-h5-overlays -+ -+targets += $(dtbo-y) -+#$(scr-y) $(dtbotxt-y) -+ -+endif -+ -+always := $(dtbo-y) -+# $(scr-y) $(dtbotxt-y) -+clean-files := *.dtbo *.scr -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-i2c0.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-i2c0.dts -new file mode 100644 -index 0000000..5377cc6 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-i2c0.dts -@@ -0,0 +1,20 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ i2c0 = "/soc/i2c@01c2ac00"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&i2c0>; -+ __overlay__ { -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-i2c1.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-i2c1.dts -new file mode 100644 -index 0000000..36291c5 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-i2c1.dts -@@ -0,0 +1,20 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ i2c1 = "/soc/i2c@01c2b000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&i2c1>; -+ __overlay__ { -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-i2c2.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-i2c2.dts -new file mode 100644 -index 0000000..0e1de08 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-i2c2.dts -@@ -0,0 +1,20 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ i2c2 = "/soc/i2c@01c2b400"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&i2c2>; -+ __overlay__ { -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi0-jedec-nor.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi0-jedec-nor.dts -new file mode 100644 -index 0000000..5fea00c ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi0-jedec-nor.dts -@@ -0,0 +1,45 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ spi0 = "/soc/spi@01c68000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&spi0>; -+ __overlay__ { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spiflash@0 { -+ compatible = "jedec,spi-nor"; -+ status = "okay"; -+ reg = <0>; -+ spi-max-frequency = <1000000>; -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@0 { -+ label = "uboot"; -+ reg = <0x0 0x100000>; -+ }; -+ partition@100000 { -+ label = "env"; -+ reg = <0x100000 0x100000>; -+ }; -+ partition@200000 { -+ label = "data"; -+ reg = <0x200000 0x200000>; -+ }; -+ }; -+ }; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi1-jedec-nor.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi1-jedec-nor.dts -new file mode 100644 -index 0000000..5fea00c ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi1-jedec-nor.dts -@@ -0,0 +1,45 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ spi1 = "/soc/spi@01c69000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&spi1>; -+ __overlay__ { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spiflash@0 { -+ compatible = "jedec,spi-nor"; -+ status = "okay"; -+ reg = <0>; -+ spi-max-frequency = <1000000>; -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@0 { -+ label = "uboot"; -+ reg = <0x0 0x100000>; -+ }; -+ partition@100000 { -+ label = "env"; -+ reg = <0x100000 0x100000>; -+ }; -+ partition@200000 { -+ label = "data"; -+ reg = <0x200000 0x200000>; -+ }; -+ }; -+ }; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi0-spidev.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi0-spidev.dts -new file mode 100644 -index 0000000..8eacf1b ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi0-spidev.dts -@@ -0,0 +1,27 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ spi0 = "/soc/spi@01c68000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&spi0>; -+ __overlay__ { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spidev@0 { -+ compatible = "spidev"; -+ reg = <0>; -+ spi-max-frequency = <1000000>; -+ }; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi1-spidev.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi1-spidev.dts -new file mode 100644 -index 0000000..8eacf1b ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-spi1-spidev.dts -@@ -0,0 +1,27 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ spi1 = "/soc/spi@01c69000"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&spi1>; -+ __overlay__ { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spidev@0 { -+ compatible = "spidev"; -+ reg = <0>; -+ spi-max-frequency = <1000000>; -+ }; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-uart1.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-uart1.dts -new file mode 100644 -index 0000000..902e3e5 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-uart1.dts -@@ -0,0 +1,22 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ serial1 = "/soc/serial@01c28400"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&uart1>; -+ __overlay__ { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart1_pins>; -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-uart2.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-uart2.dts -new file mode 100644 -index 0000000..8a91069 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-uart2.dts -@@ -0,0 +1,22 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ serial2 = "/soc/serial@01c28800"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&uart2>; -+ __overlay__ { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart2_pins>; -+ status = "okay"; -+ }; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-uart3.dts b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-uart3.dts -new file mode 100644 -index 0000000..3f729d4 ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlays/sun50i-h5-uart3.dts -@@ -0,0 +1,22 @@ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "allwinner,sun50i-h5"; -+ -+ fragment@0 { -+ target-path = "/aliases"; -+ __overlay__ { -+ serial3 = "/soc/serial@01c28c00"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&uart3>; -+ __overlay__ { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart3_pins>; -+ status = "okay"; -+ }; -+ }; -+}; diff --git a/patch/kernel/sun50i-dev/unresolved/add_nanopim1plus2_dts.patch b/patch/kernel/sun50i-dev/unresolved/add_nanopim1plus2_dts.patch deleted file mode 100644 index 7b346e8df..000000000 --- a/patch/kernel/sun50i-dev/unresolved/add_nanopim1plus2_dts.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile ---- a/arch/arm64/boot/dts/allwinner/Makefile -+++ b/arch/arm64/boot/dts/allwinner/Makefile -@@ -1,5 +1,6 @@ - dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb - dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb -+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopim1plus2.dtb - - always := $(dtb-y) - subdir-y := $(dts-dirs) -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopim1plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopim1plus2.dts -new file mode 100644 -index 0000000..4fc6ffd ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopim1plus2.dts -@@ -0,0 +1,149 @@ -+/* -+ * Copyright (c) 2016 ARM Ltd. -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include -+#include -+#include "sun50i-h5-orangepi-pc2.dts" -+ -+/ { -+ model = "NanoPi M1 Plus2"; -+ compatible = "nanopim1plus2", "allwinner,sun50i-h5"; -+ -+ aliases { -+ spi0 = &spi0; -+ spi1 = &spi1; -+ }; -+ -+ reg_gmac_3v3: gmac-3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "gmac-3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ startup-delay-us = <100000>; -+ enable-active-high; -+ gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ wifi_pwrseq: wifi_pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&wifi_en_pin>; -+ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */ -+ }; -+ -+ reg_usb1_vbus: usb1-vbus { -+ compatible = "regulator-fixed"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&usb1_vbus_pin_a>; -+ regulator-name = "usb1-vbus"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-boot-on; -+ enable-active-high; -+ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; -+ status = "okay"; -+ }; -+ -+ /* TODO: Camera, touchscreen, etc. */ -+}; -+ -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&emac_rgmii_pins>; -+ phy-supply = <®_gmac_3v3>; -+ phy-mode = "rgmii"; -+}; -+ -+&mmc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins_a>; -+ vmmc-supply = <®_vcc3v3>; -+ vqmmc-supply = <®_vcc3v3>; -+ mmc-pwrseq = <&wifi_pwrseq>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+ -+ brcmf: brcmf@1 { -+ reg = <1>; -+ compatible = "brcm,bcm4329-fmac"; -+ interrupt-parent = <&pio>; -+ interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ -+ interrupt-names = "host-wake"; -+ }; -+}; -+ -+&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"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = ; -+ allwinner,pull = ; -+ }; -+ -+ wifi_en_pin: wifi_en_pin@0 { -+ allwinner,pins = "PL7"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = ; -+ allwinner,pull = ; -+ }; -+}; -+ -+&spi0 { -+ /delete-node/ spi-flash@0; -+}; -+ -+&usbphy { -+ usb1_vbus-supply = <®_usb1_vbus>; -+ status = "okay"; -+}; -+ diff --git a/patch/kernel/sun50i-dev/unresolved/add_orangepiwin_dts.patch b/patch/kernel/sun50i-dev/unresolved/add_orangepiwin_dts.patch deleted file mode 100644 index fc9028e7a..000000000 --- a/patch/kernel/sun50i-dev/unresolved/add_orangepiwin_dts.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile -index 244e8b7..65dfa1b 100644 ---- a/arch/arm64/boot/dts/allwinner/Makefile -+++ b/arch/arm64/boot/dts/allwinner/Makefile -@@ -1,4 +1,5 @@ - dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb -+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-orangepiwin.dtb - dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb - dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepiwin.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepiwin.dts -new file mode 100644 -index 0000000..4fc6ffd ---- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepiwin.dts -@@ -0,0 +1,137 @@ -+/* -+ * Copyright (c) 2016 ARM Ltd. -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include -+#include -+#include "sun50i-a64-pine64.dts" -+ -+/ { -+ model = "OrangePiWin"; -+ compatible = "orangepiwin", "allwinner,sun50i-a64"; -+ -+ reg_gmac_3v3: gmac-3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "gmac-3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ startup-delay-us = <100000>; -+ enable-active-high; -+ gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ wifi_pwrseq: wifi_pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&wifi_en_pin>; -+ reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */ -+ }; -+ -+ reg_usb1_vbus: usb1-vbus { -+ compatible = "regulator-fixed"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&usb1_vbus_pin_a>; -+ regulator-name = "usb1-vbus"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-boot-on; -+ enable-active-high; -+ gpio = <&pio 3 7 GPIO_ACTIVE_HIGH>; -+ status = "okay"; -+ }; -+ -+ /* TODO: Camera, touchscreen, etc. */ -+}; -+ -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&emac_rgmii_pins>; -+ phy-supply = <®_gmac_3v3>; -+ phy-mode = "rgmii"; -+}; -+ -+&mmc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins>; -+ vmmc-supply = <®_vcc3v3>; -+ vqmmc-supply = <®_vcc3v3>; -+ mmc-pwrseq = <&wifi_pwrseq>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+ -+ brcmf: brcmf@1 { -+ reg = <1>; -+ compatible = "brcm,bcm4329-fmac"; -+ interrupt-parent = <&r_pio>; -+ interrupts = <0 7 IRQ_TYPE_LEVEL_LOW>; /* PL7 / EINT7 */ -+ interrupt-names = "host-wake"; -+ }; -+}; -+ -+&pio { -+ usb1_vbus_pin_a: usb1_vbus_pin@0 { -+ allwinner,pins = "PD7"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = ; -+ allwinner,pull = ; -+ }; -+}; -+ -+&r_pio { -+ wifi_en_pin: wifi_en_pin@0 { -+ allwinner,pins = "PL8"; -+ allwinner,function = "gpio_out"; -+ allwinner,drive = ; -+ allwinner,pull = ; -+ }; -+}; -+ -+&usb_otg { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usbphy { -+ usb1_vbus-supply = <®_usb1_vbus>; -+ status = "okay"; -+}; -+