JetHome: Update JetHub family

Signed-off-by: Viacheslav Bocharov <[email protected]>

config/boards/jethubj200.conf

@@ -0,0 +1,10 @@
+# Amlogic S905X3 quad core 4GB RAM SoC eMMC GBE USB2 SPI-NOR
+BOARD_NAME="JetHub D2"
+BOARDFAMILY="jethub"
+BOARD_MAINTAINER="adeepn"
+BOOTCONFIG="jethub_j200_defconfig"
+KERNEL_TARGET="current,edge"
+MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
+FULL_DESKTOP="yes"
+SERIALCON="ttyAML0"
+#BOOT_LOGO="desktop"

config/sources/families/jethub.conf

@@ -31,8 +31,8 @@ elif [[ "$BOARD" == "jethubj200" ]]; then
 	ASOUND_STATE="${ASOUND_STATE:-"asound.state.meson64"}"
 	CPUMIN=667000
 	CPUMAX=2100000
-	BOOTBRANCH="tag:v2024.01"
-	BOOTPATCHDIR="v2024.01"
+	BOOTBRANCH="tag:v2024.07"
+	BOOTPATCHDIR="v2024.07"
 fi
 
 ########

packages/bsp/jethub/jethub-init

@@ -63,9 +63,9 @@ unexport_sysfs()
 {
     for i in /sys/class/gpio/gpio* ; do
         if ! echo "$i" | grep -q chip ; then
-	        ii=$(echo "${i##*/}"| tr -d -c 0-9)
-	        echo "$ii" > /sys/class/gpio/unexport
-	fi
+                ii=$(echo "${i##*/}"| tr -d -c 0-9)
+                echo "$ii" > /sys/class/gpio/unexport
+        fi
     done
 }
 

packages/bsp/jethub/jethub_get_cmdline_arg.h

@@ -3,6 +3,7 @@
 #include <fstream>
 #include <vector>
 #include <tuple>
+#include <cstdint>
 
 std::string loadFileAsLine(const std::string& path) {
   std::string result;

packages/bsp/jethub/jethubj200/libjethubconfig.sh

@@ -1,17 +1,28 @@
 #!/bin/bash
 # shellcheck disable=SC2034
 
-#TODO: empty now
-
-GPIOCHIPNUMBER=0
-
 GPIO_DIRECTION_OUTPUT=0
 GPIO_DIRECTION_INPUT=1
 
 GPIO_ACTIVE_LOW=0
 GPIO_ACTIVE_HIGH=1
 
 GPIOS=(
+  # Discrete inputs: 1, 2, 3
+  "2  8 ${GPIO_DIRECTION_INPUT} ${GPIO_ACTIVE_HIGH}"
+  "2  9 ${GPIO_DIRECTION_INPUT} ${GPIO_ACTIVE_HIGH}"
+  "2 10 ${GPIO_DIRECTION_INPUT} ${GPIO_ACTIVE_HIGH}"
+  # Relays: 1, 2
+  "2  0 ${GPIO_DIRECTION_OUTPUT} ${GPIO_ACTIVE_HIGH}"
+  "2  1 ${GPIO_DIRECTION_OUTPUT} ${GPIO_ACTIVE_HIGH}"
+  # UXM1 module: RESET, BOOT
+  "2  4 ${GPIO_DIRECTION_OUTPUT} ${GPIO_ACTIVE_HIGH}"
+  "2  5 ${GPIO_DIRECTION_OUTPUT} ${GPIO_ACTIVE_HIGH}"
+  # UXM2 module: RESET, BOOT
+  "2  6 ${GPIO_DIRECTION_OUTPUT} ${GPIO_ACTIVE_HIGH}"
+  "2  7 ${GPIO_DIRECTION_OUTPUT} ${GPIO_ACTIVE_HIGH}"
+  # Button
+  "1 10 ${GPIO_DIRECTION_INPUT} ${GPIO_ACTIVE_LOW}"
 )
 
 
@@ -20,5 +31,28 @@ LEDS=(
 )
 
 
-
-ADDITIONALFUNC=""
+reset_uxm1() {
+    echo "${0}: Reset UXM1 module ..."
+    gpio_set 2 5 1 ${GPIO_ACTIVE_HIGH}
+    gpio_set 2 6 1 ${GPIO_ACTIVE_HIGH}
+    sleep 1
+    gpio_set 2 6 0 ${GPIO_ACTIVE_HIGH}
+}
+
+reset_uxm2() {
+    echo "${0}: Reset UXM2 module ..."
+    gpio_set 2 7 1 ${GPIO_ACTIVE_HIGH}
+    gpio_set 2 6 1 ${GPIO_ACTIVE_HIGH}
+    sleep 1
+    gpio_set 2 6 0 ${GPIO_ACTIVE_HIGH}
+}
+
+config_1wire() {
+    echo "${0}: Configure 1-Wire ..."
+    if ! modprobe ds2482; then
+        echo "${0}: *** Error: Failed to load DS2482 kernel module"
+        exit 1
+    fi
+}
+
+ADDITIONALFUNC="reset_uxm1 reset_uxm2 config_1wire"

patch/kernel/archive/meson64-6.6/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch

@@ -41,13 +41,13 @@ index c2d22b00c1cd..6a5664d908d5 100644
 +&i2c_AO {
 +	/* EEPROM on base board */
 +	eeprompd: eeprom@56 {
-+                compatible = "atmel,24c64";
-+                reg = <0x56>;
-+                pagesize = <0x20>;
++		compatible = "atmel,24c64";
++		reg = <0x56>;
++		pagesize = <0x20>;
 +		label = "eeprompd";
 +		address-width = <0x10>;
-+                vcc-supply = <&vddao_3v3>;
-+        };
++		vcc-supply = <&vddao_3v3>;
++	};
 +};
 -- 
 2.34.1