78d28f8083
1, format all patches from https://github.com/megous/linux `git format-patch 79bf89b88a87f2ebf147f76d8c40183283b49b51...2a7cb228d29c3882c1414c10a44c5f3f59bfa44d` and copy them to sunxi-next with prefix `0000-` 2, remove unnecessary patches, due to they are revert of upstream patches:4d867e2bd64e674a3000b8e05fe47e8bb8175edda2888276ee3, remove fail to apply and no use:960ddd63a84, remove WireGuard patch:1cd13b836c5, remove meaningless patch:f26e36379a6, remove merged or included by megous/linux patches: 0112-mfd-axp20x-Add-supported-cells-for-AXP803.patch board-bpi-m3-make-ethernet-working.patch board-pine-h6-pine-h6-0025-phy-sun4i-usb-add-support-for-missing-USB-PHY-index.patch 7, remove stable release update patches. ignored. 8, rebase sunxi-next/sunxi64-next to upstream linux-4.19.y test result: all patches applied, no error. orangepipc/orangpioneplus build OK. Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
From 75347dd025a7da146944c69c724dbd6d24e10100 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megous@megous.com>
|
|
Date: Fri, 18 Aug 2017 13:56:06 +0200
|
|
Subject: [PATCH 80/82] Add support for my private Sapomat device
|
|
|
|
---
|
|
arch/arm/boot/dts/Makefile | 1 +
|
|
.../boot/dts/sun8i-h3-orangepi-pc-sapomat.dts | 34 +++++++++++++++++++
|
|
2 files changed, 35 insertions(+)
|
|
create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-pc-sapomat.dts
|
|
|
|
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
|
index b5bd3de87c33..c3720b0ffbe1 100644
|
|
--- a/arch/arm/boot/dts/Makefile
|
|
+++ b/arch/arm/boot/dts/Makefile
|
|
@@ -1043,6 +1043,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
|
|
sun8i-h3-orangepi-lite.dtb \
|
|
sun8i-h3-orangepi-one.dtb \
|
|
sun8i-h3-orangepi-pc.dtb \
|
|
+ sun8i-h3-orangepi-pc-sapomat.dtb \
|
|
sun8i-h3-orangepi-pc-plus.dtb \
|
|
sun8i-h3-orangepi-plus.dtb \
|
|
sun8i-h3-orangepi-plus2e.dtb \
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-sapomat.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-sapomat.dts
|
|
new file mode 100644
|
|
index 000000000000..55c82d5fb63f
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-sapomat.dts
|
|
@@ -0,0 +1,34 @@
|
|
+#include <dt-bindings/gpio/gpio.h>
|
|
+#include <dt-bindings/input/input.h>
|
|
+#include "sun8i-h3-orangepi-pc.dts"
|
|
+
|
|
+/ {
|
|
+ model = "Xunlong Orange Pi PC Sapomat";
|
|
+
|
|
+ sapomat_gpio_keys {
|
|
+ compatible = "gpio-keys-polled";
|
|
+ poll-interval = <50>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sapomat_btn_pins>;
|
|
+
|
|
+ red_btn {
|
|
+ label = "Red Button";
|
|
+ linux,code = <BTN_4>;
|
|
+ gpios = <&pio 2 4 GPIO_ACTIVE_LOW>; /* PC4 */
|
|
+ };
|
|
+
|
|
+ green_btn {
|
|
+ label = "Green Button";
|
|
+ linux,code = <BTN_5>;
|
|
+ gpios = <&pio 2 7 GPIO_ACTIVE_LOW>; /* PC7 */
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
+&pio {
|
|
+ sapomat_btn_pins: btn_pins@0 {
|
|
+ pins = "PC4", "PC7";
|
|
+ function = "gpio_in";
|
|
+ bias-pull-up;
|
|
+ };
|
|
+};
|
|
--
|
|
2.20.1
|
|
|