From 43720134940b1319c541f61b822047ec59a77132 Mon Sep 17 00:00:00 2001
From: Raymond Hackley <raymondhackley@protonmail.com>
Date: Mon, 18 Sep 2023 08:14:59 +0000
Subject: [PATCH] samsung-a6plte: add SM5708 modules to initfs, configure getty
 using deviceinfo_getty variable and add USB ID (MR 4404)

- Add SM5708 modules to initfs for the following devices, to unlock FDE
  with USB OTG keyboards and fix USB networking.
- Configure getty using deviceinfo_getty variable.
- Add USB ID 04e8:6860 to deviceinfo

[ci:skip-build]: already built successfully in CI
---
 device/testing/device-samsung-a6plte/APKBUILD       | 6 +++---
 device/testing/device-samsung-a6plte/deviceinfo     | 8 +++++++-
 device/testing/device-samsung-a6plte/modules-initfs | 2 ++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/device/testing/device-samsung-a6plte/APKBUILD b/device/testing/device-samsung-a6plte/APKBUILD
index 7bf4dd6f9..54ca7cd89 100644
--- a/device/testing/device-samsung-a6plte/APKBUILD
+++ b/device/testing/device-samsung-a6plte/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=device-samsung-a6plte
 pkgdesc="Samsung Galaxy A6+ (2018)"
-pkgver=1.1
+pkgver=1.2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -56,8 +56,8 @@ phosh() {
 
 sha512sums="
 d087fb8b9c1cec66bd6f88680402afed3a642e55014e86a525a8177274cbda768622683108670476cb742cacea7a82a97df94e0469a9126e85d163685aeba421  30-gpu-firmware.files
-0be6ff0e24d1184f316deb27cd3642d9f6dc74ae90ad7c0fcdfc32722471db0a72643bd59aae1b3a5e717f6c710898e44d87192b9268614328235de452ca952e  deviceinfo
-c23c2f882a78e8f3ddc1be9f04bed1977885ff403e4c7211255846208f3053373d5ac413bd9d0d3d5330de045a645c14c4bdb031714f2f6efe64495d6800a96d  modules-initfs
+5cf251bd1e6826235a11648cd761206ba425afb801d6ee9a4529ed519cc79494edfbadac64b81c03785c0a5c70d224c3f997e1921d9a586681834807b680867a  deviceinfo
+5ab0eec4dc3126b73c1b48846fd43375c22734eeef2573a08fee320f7d688eeade4c48396317d8a6f75a5f31f477ba5485800ca8af2e32571cbb3b428a6eb665  modules-initfs
 bea40516cf51b4ad0609cc21ca56c19eb9cb2b1be45cddf486264d9c526469f1abad313a95a4f938ccbd0c023d08884aefe8d850746a97075999de11b4a2ff4c  gpu-nobin.sh
 38409d4ce48db4624539dbfd695d3c6e1596a29fd7c3004a41368b28cba646495d05360420ad728f82c63d6ddeeca71d09944df06ebaca120aedd9cc2b436eb3  phoc.ini
 "
diff --git a/device/testing/device-samsung-a6plte/deviceinfo b/device/testing/device-samsung-a6plte/deviceinfo
index 4aba940ba..c5aa96484 100644
--- a/device/testing/device-samsung-a6plte/deviceinfo
+++ b/device/testing/device-samsung-a6plte/deviceinfo
@@ -19,11 +19,12 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2220"
 deviceinfo_gpu_accelerated="true"
+deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_sparse="true"
-deviceinfo_kernel_cmdline="console=tty0 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
@@ -36,3 +37,8 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_heimdall_partition_kernel="BOOT"
 deviceinfo_flash_fastboot_partition_kernel="boot"
+
+# Samsung Electronics Co., Ltd
+deviceinfo_usb_idVendor="0x04e8"
+# Galaxy (MTP)
+deviceinfo_usb_idProduct="0x6860"
diff --git a/device/testing/device-samsung-a6plte/modules-initfs b/device/testing/device-samsung-a6plte/modules-initfs
index 41f27b10a..bd2b8bc80 100644
--- a/device/testing/device-samsung-a6plte/modules-initfs
+++ b/device/testing/device-samsung-a6plte/modules-initfs
@@ -1,3 +1,5 @@
 msm
 panel-samsung-s6e3fa7-ams604nl01
 s6sy761
+simple-mfd-i2c
+sm5708-charger