Define separate row-gpios for each side

trentrand · Apr 28, 2024 · ba78bee · ba78bee
1 parent 972c6ed
commit ba78bee
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7.dtsi b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7.dtsi
@@ -27,13 +27,5 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4)                                      RC(
         label = "KSCAN";
 
         diode-direction = "col2row";
-        row-gpios
-            = <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio1 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
-
     };
 };
diff --git a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_left.overlay b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_left.overlay
@@ -1,11 +1,19 @@
 #include "dactyl_manuform_5x7.dtsi"
 
 &kscan0 {
+    row-gpios
+        = <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio0  2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1  7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
+
     col-gpios
-        = <&gpio1 6 GPIO_ACTIVE_HIGH>
-        , <&gpio1 4 GPIO_ACTIVE_HIGH>
+        = <&gpio1  6 GPIO_ACTIVE_HIGH>
+        , <&gpio1  4 GPIO_ACTIVE_HIGH>
         , <&gpio0 11 GPIO_ACTIVE_HIGH>
-        , <&gpio1 0 GPIO_ACTIVE_HIGH>
+        , <&gpio1  0 GPIO_ACTIVE_HIGH>
         , <&gpio0 24 GPIO_ACTIVE_HIGH>
         , <&gpio0 22 GPIO_ACTIVE_HIGH>
         , <&gpio0 20 GPIO_ACTIVE_HIGH>

diff --git a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay
@@ -5,13 +5,21 @@
 };
 
 &kscan0 {
+    row-gpios
+        = <&gpio1  4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1  6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1  1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1  2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1  7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
+
     col-gpios
-        = <&gpio0 20 GPIO_ACTIVE_HIGH>
-        , <&gpio0 22 GPIO_ACTIVE_HIGH>
-        , <&gpio0 24 GPIO_ACTIVE_HIGH>
-        , <&gpio1 0 GPIO_ACTIVE_HIGH>
-        , <&gpio0 11 GPIO_ACTIVE_HIGH>
-        , <&gpio1 4 GPIO_ACTIVE_HIGH>
-        , <&gpio1 6 GPIO_ACTIVE_HIGH>
+        = <&gpio0 29 GPIO_ACTIVE_HIGH>
+        , <&gpio0  2 GPIO_ACTIVE_HIGH>
+        , <&gpio1 15 GPIO_ACTIVE_HIGH>
+        , <&gpio1 13 GPIO_ACTIVE_HIGH>
+        , <&gpio1 11 GPIO_ACTIVE_HIGH>
+        , <&gpio0 10 GPIO_ACTIVE_HIGH>
+        , <&gpio0  9 GPIO_ACTIVE_HIGH>
         ;
 };