Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/mali rp22 #95

Open
wants to merge 6 commits into
base: lineage-18.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -711,11 +711,9 @@ KBUILD_CFLAGS += $(KCFLAGS)

ifeq ($(CONFIG_SENSORS_FINGERPRINT), y)
ifneq ($(CONFIG_SEC_FACTORY), true)
ifneq ($(SEC_BUILD_CONF_USE_FINGERPRINT_TZ), false)
export KBUILD_FP_SENSOR_CFLAGS := -DENABLE_SENSORS_FPRINT_SECURE
endif
endif
endif

# Use --build-id when available.
LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
Expand Down
14 changes: 10 additions & 4 deletions arch/arm/configs/lineage_gts210ltexx_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1817,7 +1817,7 @@ CONFIG_INPUT_EVDEV=y
CONFIG_HALL=y
# CONFIG_CERTIFY_HALL is not set
CONFIG_HALL_ACCESSORY=y
# CONFIG_SENSORS_HALL_IRQ_CTRL is not set
CONFIG_SENSORS_HALL_IRQ_CTRL=y
# CONFIG_INPUT_EXPANDED_ABS is not set

#
Expand Down Expand Up @@ -2763,7 +2763,8 @@ CONFIG_ION=y
CONFIG_ION_EXYNOS=y
CONFIG_ION_EXYNOS_STAT_LOG=y
CONFIG_ION_EXYNOS_OF=y
CONFIG_DDK_VERSION_OS="n"
# use "n" for mali r15 CONFIG_DDK_VERSION_OS="n"
CONFIG_DDK_VERSION_OS="o"

#
# ARM GPU Configuration
Expand All @@ -2772,6 +2773,7 @@ CONFIG_MALI_T7XX=y
# CONFIG_MALI_R5P0 is not set
# CONFIG_MALI_R7P0 is not set
# CONFIG_MALI_R12P0 is not set
# CONFIG_MALI_R15P0 is not set
CONFIG_MALI_R22P0=y
# CONFIG_MALI_GATOR_SUPPORT is not set
CONFIG_MALI_DVFS=y
Expand All @@ -2796,15 +2798,19 @@ CONFIG_MALI_SEC_LEGACY_SUPPORT=y
CONFIG_MALI_MIDGARD=y
# CONFIG_MALI_MIDGARD_DVFS is not set
# CONFIG_MALI_CORESTACK is not set
# CONFIG_MALI_FENCE_DEBUG is not set
CONFIG_MALI_FENCE_DEBUG=y
# CONFIG_MALI_GPU_MMU_AARCH64 is not set
CONFIG_EXYNOS_SOC_NAME="5433"
CONFIG_MALI_SEC_CL_BOOST=y
CONFIG_MALI_SEC_UTILIZATION=y
CONFIG_MALI_PM_QOS=y
# CONFIG_MALI_BTS_OPTIMIZATION is not set
CONFIG_MALI_DEBUG_KERNEL_SYSFS=y
# CONFIG_MALI_EXYNOS_SECURE_RENDERING is not set
CONFIG_MALI_EXYNOS_SECURE_RENDERING=y
# CONFIG_MALI_JOB_DUMPING is not set
# CONFIG_MALI_2MB_ALLOC is not set
# CONFIG_MALI_PWRSOFT_765 is not set
CONFIG_MALI_SEC_JOB_STATUS_CHECK=y
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=y
Expand Down
15 changes: 7 additions & 8 deletions drivers/fingerprint/vfs7xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@

#include <linux/platform_data/spi-s3c64xx.h>
#ifdef ENABLE_SENSORS_FPRINT_SECURE
#include <linux/wakelock.h>
#include <linux/clk.h>
#include <linux/pm_runtime.h>
#include <linux/spi/spidev.h>
Expand Down Expand Up @@ -164,7 +163,7 @@ struct vfsspi_device_data {
#ifdef ENABLE_SENSORS_FPRINT_SECURE
bool enabled_clk;
#ifdef FEATURE_SPI_WAKELOCK
struct wake_lock fp_spi_lock;
struct wakeup_source fp_spi_lock;
#endif
#endif
int sensortype;
Expand Down Expand Up @@ -612,7 +611,7 @@ static int vfsspi_set_clk(struct vfsspi_device_data *vfsspi_device,
__func__);
kfree(spi_info);
#ifdef FEATURE_SPI_WAKELOCK
wake_lock(&vfsspi_device->fp_spi_lock);
__pm_stay_awake(&vfsspi_device->fp_spi_lock);
#endif
vfsspi_device->enabled_clk = true;
} else
Expand Down Expand Up @@ -648,7 +647,7 @@ static int vfsspi_ioctl_disable_spi_clock(

spi_dev_put(spidev);
#ifdef FEATURE_SPI_WAKELOCK
wake_unlock(&vfsspi_device->fp_spi_lock);
__pm_relax(&vfsspi_device->fp_spi_lock);
#endif
vfsspi_device->enabled_clk = false;
}
Expand Down Expand Up @@ -1183,8 +1182,8 @@ static int vfsspi_platformInit(struct vfsspi_device_data *vfsspi_device)

#ifdef ENABLE_SENSORS_FPRINT_SECURE
#ifdef FEATURE_SPI_WAKELOCK
wake_lock_init(&vfsspi_device->fp_spi_lock,
WAKE_LOCK_SUSPEND, "vfsspi_wake_lock");
wakeup_source_init(&vfsspi_device->fp_spi_lock, "vfsspi_wakeup_lock");
pr_info("wakeup_source_init - vfsspi_wake_lock \n");
#endif
#endif

Expand Down Expand Up @@ -1230,7 +1229,7 @@ static void vfsspi_platformUninit(struct vfsspi_device_data *vfsspi_device)
gpio_free(vfsspi_device->ocp_en);
#ifdef ENABLE_SENSORS_FPRINT_SECURE
#ifdef FEATURE_SPI_WAKELOCK
wake_lock_destroy(&vfsspi_device->fp_spi_lock);
wakeup_source_trash(&vfsspi_device->fp_spi_lock);
#endif
#endif
}
Expand Down Expand Up @@ -1924,4 +1923,4 @@ module_init(vfsspi_init);
module_exit(vfsspi_exit);

MODULE_DESCRIPTION("Validity FPS sensor");
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");
3 changes: 0 additions & 3 deletions drivers/input/hall_accessory.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ static void accessory_detect_work(struct work_struct *work)
static void accessory_detect_work(struct work_struct *work)
{
bool first;
#ifdef CONFIG_SENSORS_HALL_IRQ_CTRL
bool second;
#endif
struct hall_drvdata *ddata =
container_of(work, struct hall_drvdata,
accessory_dwork.work);
Expand Down