mirror of
https://github.com/FunKey-Project/FunKey-OS.git
synced 2025-12-12 15:48:51 +01:00
removed merge leftover
This commit is contained in:
parent
55b15c4681
commit
b6e00419cd
@ -1,6 +1,6 @@
|
|||||||
--- /dev/null 2019-05-04 09:53:55.553276856 +0200
|
--- /dev/null 2019-05-04 09:53:55.553276856 +0200
|
||||||
+++ a/arch/arm/boot/dts/sun8i-v3s-funkey.dts 2019-05-04 20:06:53.118696800 +0200
|
+++ a/arch/arm/boot/dts/sun8i-v3s-funkey.dts 2019-05-04 20:06:53.118696800 +0200
|
||||||
@@ -0,0 +1,162 @@
|
@@ -0,0 +1,192 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (C) 2019 Michel Stempin <michel.stempin@wanadoo.fr>
|
+ * Copyright (C) 2019 Michel Stempin <michel.stempin@wanadoo.fr>
|
||||||
+ *
|
+ *
|
||||||
@ -163,7 +163,6 @@
|
|||||||
+ txbuflen = <115200>;
|
+ txbuflen = <115200>;
|
||||||
+ rotate = <0>;
|
+ rotate = <0>;
|
||||||
+ fps = <39>;
|
+ fps = <39>;
|
||||||
>>>>>>> 1e396cd5a62bf81a951592f92e2d89348d35a46a
|
|
||||||
+ buswidth = <8>;
|
+ buswidth = <8>;
|
||||||
+ reset-gpios = <&pio 4 1 GPIO_ACTIVE_LOW>; //PE1
|
+ reset-gpios = <&pio 4 1 GPIO_ACTIVE_LOW>; //PE1
|
||||||
+ dc-gpios = <&pio 2 0 GPIO_ACTIVE_LOW>; //PC0 (MISO)
|
+ dc-gpios = <&pio 2 0 GPIO_ACTIVE_LOW>; //PC0 (MISO)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user