Merge pull request #14 from madmachineio/modify_srceen

Modify screen to Atom
madmachineio · Jul 11, 2020 · c9eba73 · c9eba73
2 parents d1e3379 + 868329d
commit c9eba73
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/boards/arm/mm_swiftio/mm_swiftio.dts b/boards/arm/mm_swiftio/mm_swiftio.dts
@@ -52,12 +52,12 @@
 		compatible = "lcd,rgb-interface";
 		width = <800>;
 		height = <480>;
-		hsw = <1>;
-		hfp = <22>;
-		hbp = <46>;
-		vsw = <1>;
-		vfp = <22>;
-		vbp = <23>;
+		hsw = <48>;
+		hfp = <40>;
+		hbp = <88>;
+		vsw = <3>;
+		vfp = <13>;
+		vbp = <32>;
 		frame-per-sec = <60>;
 
 		port {

diff --git a/drivers/kscan/kscan_gt9x.c b/drivers/kscan/kscan_gt9x.c
@@ -441,8 +441,12 @@ static int gt9x_init(struct device *dev)
         return -EINVAL;
     }
 
-    if (version[0] != '9' || version[1] != '1' || version[2] != '7' || version[3] != 'S') {
-        LOG_ERR("GT917S Version no match");
+    if (version[0] == '9' && version[1] == '1' && version[2] == '7' && version[3] == 'S') {
+        LOG_INF("Current Device GT917S");
+    } else if (version[0] == '9' && version[1] == '1' && version[2] == '4' && version[3] == '7') {
+        LOG_INF("Current Device GT9147");
+    } else {
+        LOG_ERR("No support %c%c%c%c", version[0], version[1], version[2], version[3]);
         return -EINVAL;
     }