Reinhard Russinger 1 год назад
Родитель
Сommit
2dc14f8063

+ 20 - 22
board/GfA/Display001/DTS_4.4/Display002_784_rs485.dts

@@ -218,28 +218,7 @@
     pinctrl-0 = <&i2c2_pins>;
     status = "okay";
     clock-frequency = <400000>;
-/*
-        polytouch: edt-ft5x06@38 {
-                        compatible = "edt,edt-ft5406", "edt,edt-ft5x06";
-                        reg = <0x38>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&edt_ft5x06_pins>;
-                        interrupt-parent = <&gpio2>;
-                        interrupts = <1 8>;
-                        reset-gpios = <&gpio3 21 1>;
-			max_x = <800>;
-			max_y = <480>;
-                };
 
-        maxtouch: atmel_mxt_ts@4a {
-                        compatible = "atmel,maxtouch";
-			reg = <0x4a>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&edt_ft5x06_pins>;
-                        interrupt-parent = <&gpio2>;
-                        interrupts = <1 8>;
-                };
-*/
 	mcp7940x: rtc@6f {
 		compatible = "microchip,mcp7940x";
 		reg = <0x6f>;
@@ -250,8 +229,27 @@
             reg = <0x48>;
             #address-cells = <1>;
             #size-cells = <0>;
+	    channel@4 {
+		reg = <4>;
+		ti,gain = <2>;
+		ti,datarate = <0>;
+		};
+	    channel@5 {
+		reg = <5>;
+		ti,gain = <2>;
+		ti,datarate = <0>;
+		};
+	    channel@6 {
+		reg = <6>;
+		ti,gain = <2>;
+		ti,datarate = <0>;
+		};
+	    channel@7 {
+		reg = <7>;
+		ti,gain = <2>;
+		ti,datarate = <0>;
+		};
 	    };
-
 };
 
 

+ 22 - 0
patches/0120-add-update-display-784-adc.patch

@@ -0,0 +1,22 @@
+diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
+index 19bece2..00abca8 100644
+--- a/UpdateRootfs.sh.in
++++ b/UpdateRootfs.sh.in
+@@ -406,7 +406,7 @@ fi
+ fi
+ 
+ if [ "$XRES" == "416" -a "$YRES" == "1280" ]; then
+-if [ "$BASEBOARD" == "DISPLAY002_784" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_784"  -o "$BASEBOARD" == "DISPLAY002_784_ADC"]; then
+   echo "4.7 x 7.5 Inch long Display 2"
+   sh /root/Display2To_784inch_rs485.sh
+   DONE=1
+@@ -985,7 +985,7 @@ fi
+ fi
+   
+ if [ "\$XRES" == "416" -a "\$YRES" == "1280" ]; then
+-if [ "\$BASEBOARD" == "DISPLAY002_784" ]; then
++if [ "\$BASEBOARD" == "DISPLAY002_784" -o  "\$BASEBOARD" == "DISPLAY002_784_ADC" ]; then
+   echo "15 Inch Display 2"
+   cp \$EMMC_BOOTPATH/Display002_784_rs485.dtb \$EMMC_BOOTPATH/Display001.dtb
+   DONE=1