Merge pull request #1200 from brooksytech/ogu

OGU controller & battery fix

packages/emulators/standalone/dolphin-sa/package.mk

@@ -8,7 +8,7 @@ PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games f
 PKG_TOOLCHAIN="cmake"
 
 case ${DEVICE} in
-  RK3588|handheld)
+  RK3588|handheld|OGU)
     PKG_SITE="https://github.com/dolphin-emu/dolphin"
     PKG_URL="${PKG_SITE}.git"
     PKG_VERSION="4d164fcb77487b0cb732e0423961fd042c3e7e3b"

packages/emulators/standalone/melonds-sa/config/OGU/melonDS.ini

@@ -0,0 +1,147 @@
+Key_A=-1
+Key_B=-1
+Key_Select=-1
+Key_Start=-1
+Key_Right=-1
+Key_Left=-1
+Key_Up=-1
+Key_Down=-1
+Key_R=-1
+Key_L=-1
+Key_X=-1
+Key_Y=-1
+Joy_A=1
+Joy_B=0
+Joy_Select=6
+Joy_Start=7
+Joy_Right=65794
+Joy_Left=1114376
+Joy_Up=17891585
+Joy_Down=16843012
+Joy_R=86114303
+Joy_L=35782655
+Joy_X=3
+Joy_Y=2
+HKKey_Lid=-1
+HKKey_Mic=-1
+HKKey_Pause=-1
+HKKey_Reset=-1
+HKKey_FastForward=-1
+HKKey_FastForwardToggle=-1
+HKKey_FullscreenToggle=-1
+HKKey_SwapScreens=-1
+HKKey_SolarSensorDecrease=-1
+HKKey_SolarSensorIncrease=-1
+HKKey_FrameStep=-1
+HKKey_SaveState=-1
+HKKey_LoadState=-1
+HKJoy_Lid=-1
+HKJoy_Mic=10
+HKJoy_Pause=-1
+HKJoy_Reset=-1
+HKJoy_FastForward=-1
+HKJoy_FastForwardToggle=-1
+HKJoy_FullscreenToggle=-1
+HKJoy_SwapScreens=9
+HKJoy_SolarSensorDecrease=-1
+HKJoy_SolarSensorIncrease=-1
+HKJoy_FrameStep=-1
+HKJoy_SaveState=5
+HKJoy_LoadState=4
+JoystickID=0
+WindowWidth=1920
+WindowHeight=1080
+WindowMax=0
+ScreenRotation=0
+ScreenGap=0
+ScreenLayout=2
+ScreenSwap=0
+ScreenSizing=3
+IntegerScaling=0
+ScreenAspectTop=0
+ScreenAspectBot=0
+ScreenFilter=1
+ScreenUseGL=0
+ScreenVSync=0
+ScreenVSyncInterval=1
+3DRenderer=0
+Threaded3D=1
+GL_ScaleFactor=1
+GL_BetterPolygons=0
+LimitFPS=1
+AudioSync=0
+ShowOSD=1
+ConsoleType=0
+DirectBoot=1
+JIT_Enable=0
+JIT_MaxBlockSize=32
+JIT_BranchOptimisations=1
+JIT_LiteralOptimisations=1
+JIT_FastMemory=1
+ExternalBIOSEnable=0
+BIOS9Path=
+BIOS7Path=
+FirmwarePath=
+DSiBIOS9Path=
+DSiBIOS7Path=
+DSiFirmwarePath=
+DSiNANDPath=
+DLDIEnable=0
+DLDISDPath=dldi.bin
+DLDISize=0
+DLDIReadOnly=0
+DLDIFolderSync=0
+DLDIFolderPath=
+DSiSDEnable=0
+DSiSDPath=dsisd.bin
+DSiSDSize=0
+DSiSDReadOnly=0
+DSiSDFolderSync=0
+DSiSDFolderPath=
+FirmwareOverrideSettings=0
+FirmwareUsername=melonDS
+FirmwareLanguage=1
+FirmwareBirthdayMonth=1
+FirmwareBirthdayDay=1
+FirmwareFavouriteColour=0
+FirmwareMessage=
+FirmwareMAC=
+MPAudioMode=1
+MPRecvTimeout=25
+LANDevice=
+DirectLAN=0
+SavStaRelocSRAM=0
+AudioInterp=0
+AudioBitrate=0
+AudioVolume=256
+MicInputType=0
+MicWavPath=
+LastROMFolder=
+RecentROM_0=
+RecentROM_1=
+RecentROM_2=
+RecentROM_3=
+RecentROM_4=
+RecentROM_5=
+RecentROM_6=
+RecentROM_7=
+RecentROM_8=
+RecentROM_9=
+SaveFilePath=/storage/roms/nds
+SavestatePath=/storage/roms/savestates/nds
+CheatFilePath=
+EnableCheats=0
+MouseHide=0
+MouseHideSeconds=5
+PauseLostFocus=0
+DSBatteryLevelOkay=1
+DSiBatteryLevel=15
+DSiBatteryCharging=1
+Camera0_InputType=0
+Camera0_ImagePath=
+Camera0_CamDeviceName=
+Camera0_XFlip=0
+Camera1_InputType=0
+Camera1_ImagePath=
+Camera1_CamDeviceName=
+Camera1_XFlip=0

projects/Amlogic/devices/OGU/linux/linux.aarch64.conf

@@ -2408,6 +2408,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_INPUT=y
 CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=y
 # CONFIG_INPUT_SPARSEKMAP is not set
 # CONFIG_INPUT_MATRIXKMAP is not set
 
@@ -2500,6 +2501,8 @@ CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
 # CONFIG_JOYSTICK_QWIIC is not set
 # CONFIG_JOYSTICK_FSIA6B is not set
 # CONFIG_JOYSTICK_SENSEHAT is not set
+#CONFIG_JOYSTICK_ODROID_GOU=y
+CONFIG_JOYSTICK_ODROID_GOU=y
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y

projects/Amlogic/packages/linux/package.mk

@@ -9,7 +9,7 @@ PKG_NAME="linux"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/JustEnoughLinuxOS"
 PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
-PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils util-linux binutils ncurses openssl:host ${KERNEL_EXTRA_DEPENDS_TARGET}"
+PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils util-linux binutils ncurses openssl:host initramfs ${KERNEL_EXTRA_DEPENDS_TARGET}"
 PKG_DEPENDS_INIT="toolchain"
 PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory busybox)"
 PKG_LONGDESC="This package builds the kernel for Rockchip devices"

projects/Amlogic/packages/linux/patches/OGU/001-ogu-battery-label.patch

@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
+
+diff --git a/drivers/power/supply/rk818_charger.c b/drivers/power/supply/rk818_charger.c
+index cdef0dcd1f8c..e5081332aa4a 100644
+--- a/drivers/power/supply/rk818_charger.c
++++ b/drivers/power/supply/rk818_charger.c
+@@ -275,7 +275,7 @@ static enum power_supply_property rk818_usb_power_props[] = {
+ };
+ 
+ static const struct power_supply_desc rk818_usb_desc = {
+-	.name			= "rk818-usb",
++	.name			= "rk818-usb-charger",
+ 	.type			= POWER_SUPPLY_TYPE_USB,
+ 	.properties		= rk818_usb_power_props,
+ 	.num_properties		= ARRAY_SIZE(rk818_usb_power_props),
+@@ -610,7 +610,7 @@ static enum power_supply_property rk818_charger_props[] = {
+  * but not me, not now. :)
+  */
+ static const struct power_supply_desc rk818_charger_desc = {
+-	.name			= "rk818-battery",
++	.name			= "battery",
+ 	.type			= POWER_SUPPLY_TYPE_BATTERY,
+ 	.properties		= rk818_charger_props,
+ 	.num_properties		= ARRAY_SIZE(rk818_charger_props),