Skip to content

Commit

Permalink
Merge branch 'QK-eleven' into upstreamed-common
Browse files Browse the repository at this point in the history
  • Loading branch information
@Official-Ayrton990
Official-Ayrton990 committed Jul 19, 2021
2 parents 58638db + 4dbccec commit 1b95bce
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 394 deletions.
36 changes: 18 additions & 18 deletions arch/arm64/boot/dts/vendor/qcom/kona.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,105 +373,105 @@
#size-cells = <2>;
ranges;

hyp_mem: hyp_region@80000000 {
hyp_mem: hyp_region {
no-map;
reg = <0x0 0x80000000 0x0 0x600000>;
};

xbl_aop_mem: xbl_aop_region@80700000 {
xbl_aop_mem: xbl_aop_region {
no-map;
reg = <0x0 0x80700000 0x0 0x160000>;
};

cmd_db: reserved-memory@80860000 {
cmd_db: reserved-memory {
reg = <0x0 0x80860000 0x0 0x20000>;
compatible = "qcom,cmd-db";
no-map;
};

smem_mem: smem_region@80900000 {
smem_mem: smem_region {
no-map;
reg = <0x0 0x80900000 0x0 0x200000>;
};

removed_mem: removed_region@80b00000 {
removed_mem: removed_region {
no-map;
reg = <0x0 0x80b00000 0x0 0x5300000>;
};

pil_camera_mem: pil_camera_region@86200000 {
pil_camera_mem: pil_camera_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x86200000 0x0 0x500000>;
};

pil_wlan_fw_mem: pil_wlan_fw_region@86700000 {
pil_wlan_fw_mem: pil_wlan_fw_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x86700000 0x0 0x100000>;
};

pil_ipa_fw_mem: pil_ipa_fw_region@86800000 {
pil_ipa_fw_mem: pil_ipa_fw_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x86800000 0x0 0x10000>;
};

pil_ipa_gsi_mem: pil_ipa_gsi_region@86810000 {
pil_ipa_gsi_mem: pil_ipa_gsi_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x86810000 0x0 0xa000>;
};

pil_gpu_mem: pil_gpu_region@8681a000 {
pil_gpu_mem: pil_gpu_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x8681a000 0x0 0x2000>;
};

pil_npu_mem: pil_npu_region@86900000 {
pil_npu_mem: pil_npu_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x86900000 0x0 0x500000>;
};

pil_video_mem: pil_video_region@86e00000 {
pil_video_mem: pil_video_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x86e00000 0x0 0x500000>;
};

pil_cvp_mem: pil_cvp_region@87300000 {
pil_cvp_mem: pil_cvp_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x87300000 0x0 0x500000>;
};

pil_cdsp_mem: pil_cdsp_region@87800000 {
pil_cdsp_mem: pil_cdsp_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x87800000 0x0 0x1400000>;
};

pil_slpi_mem: pil_slpi_region@88c00000 {
pil_slpi_mem: pil_slpi_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x88c00000 0x0 0x2f00000>;
};

pil_adsp_mem: pil_adsp_region@8bb00000 {
pil_adsp_mem: pil_adsp_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x8bb00000 0x0 0x2500000>;
};

pil_spss_mem: pil_spss_region@8e000000 {
pil_spss_mem: pil_spss_region {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x8e000000 0x0 0x100000>;
};

cdsp_secure_heap: cdsp_secure_heap@8e100000 {
cdsp_secure_heap: cdsp_secure_heap {
compatible = "removed-dma-pool";
no-map;
reg = <0x0 0x8e100000 0x0 0x4600000>;
Expand Down
12 changes: 0 additions & 12 deletions drivers/gpu/drm/drm_bridge.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,15 +270,9 @@ void drm_bridge_post_disable(struct drm_bridge *bridge)
if (!bridge)
return;

if (bridge->is_dsi_drm_bridge)
mutex_lock(&bridge->lock);

if (bridge->funcs->post_disable)
bridge->funcs->post_disable(bridge);

if (bridge->is_dsi_drm_bridge)
mutex_unlock(&bridge->lock);

drm_bridge_post_disable(bridge->next);
}
EXPORT_SYMBOL(drm_bridge_post_disable);
Expand Down Expand Up @@ -327,14 +321,8 @@ void drm_bridge_pre_enable(struct drm_bridge *bridge)

drm_bridge_pre_enable(bridge->next);

if (bridge->is_dsi_drm_bridge)
mutex_lock(&bridge->lock);

if (bridge->funcs->pre_enable)
bridge->funcs->pre_enable(bridge);

if (bridge->is_dsi_drm_bridge)
mutex_unlock(&bridge->lock);
}
EXPORT_SYMBOL(drm_bridge_pre_enable);

Expand Down
15 changes: 0 additions & 15 deletions drivers/input/fingerprint/fpc_tee/fpc1020_tee.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include <linux/pm_wakeup.h>
#include <linux/fb.h>
#include <linux/pinctrl/qcom-pinctrl.h>
#include <drm/drm_bridge.h>

#define FPC_GPIO_NO_DEFAULT -1
#define FPC_GPIO_NO_DEFINED -2
Expand Down Expand Up @@ -743,19 +742,6 @@ static ssize_t irq_ack(struct device *dev,

static DEVICE_ATTR(irq, S_IRUSR | S_IWUSR, irq_get, irq_ack);

static ssize_t fingerdown_wait_set(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct fpc1020_data *fpc1020 = dev_get_drvdata(dev);

dev_dbg(fpc1020->dev, "%s\n", __func__);

return count;
}

static DEVICE_ATTR(fingerdown_wait, S_IWUSR, NULL, fingerdown_wait_set);

static ssize_t vendor_update(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
Expand Down Expand Up @@ -806,7 +792,6 @@ static struct attribute *attributes[] = {
&dev_attr_power_cfg.attr,
&dev_attr_irq.attr,
&dev_attr_vendor.attr,
&dev_attr_fingerdown_wait.attr,
NULL
};

Expand Down
106 changes: 0 additions & 106 deletions drivers/input/fingerprint/goodix/gf_spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,10 @@
#include <linux/regulator/consumer.h>
#include <linux/of_gpio.h>
#include <linux/timer.h>
#include <linux/notifier.h>
#include <linux/fb.h>
#include <linux/pm_qos.h>
#include <linux/cpufreq.h>
#include <linux/pm_wakeup.h>
#include <drm/drm_bridge.h>
#ifndef GOODIX_DRM_INTERFACE_WA
#include <drm/drm_notifier_mi.h>
#endif

#include "gf_spi.h"

Expand Down Expand Up @@ -535,14 +530,6 @@ static long gf_compat_ioctl(struct file *filp, unsigned int cmd,
}
#endif /*CONFIG_COMPAT*/

#ifndef GOODIX_DRM_INTERFACE_WA
static void notification_work(struct work_struct *work)
{
pr_debug("%s unblank\n", __func__);
dsi_bridge_interface_enable(FP_UNLOCK_REJECTION_TIMEOUT);
}
#endif

static irqreturn_t gf_irq(int irq, void *handle)
{
struct gf_dev *gf_dev = &gf;
Expand All @@ -554,17 +541,6 @@ static irqreturn_t gf_irq(int irq, void *handle)
__pm_wakeup_event(fp_wakelock, WAKELOCK_HOLD_TIME);
sendnlmsg(temp);

if ((gf_dev->wait_finger_down == true) && (gf_dev->device_available == 1) &&
(gf_dev->fb_black == 1)) {
key_input = KEY_RIGHT;
input_report_key(gf_dev->input, key_input, 1);
input_sync(gf_dev->input);
input_report_key(gf_dev->input, key_input, 0);
input_sync(gf_dev->input);
gf_dev->wait_finger_down = false;
schedule_work(&gf_dev->work);
}

#elif defined (GF_FASYNC)
struct gf_dev *gf_dev = &gf;

Expand Down Expand Up @@ -749,76 +725,6 @@ static const struct file_operations gf_fops = {
#endif
};


#ifndef GOODIX_DRM_INTERFACE_WA
static int goodix_fb_state_chg_callback(struct notifier_block *nb,
unsigned long val, void *data)
{
struct gf_dev *gf_dev;
struct fb_event *evdata = data;
unsigned int blank;
char temp[4] = { 0x0 };

if (val != MI_DRM_EVENT_BLANK) {
return 0;
}

pr_debug("[info] %s go to the goodix_fb_state_chg_callback value = %d\n",
__func__, (int)val);
gf_dev = container_of(nb, struct gf_dev, notifier);

if (evdata && evdata->data && val == MI_DRM_EVENT_BLANK && gf_dev) {
blank = *(int *)(evdata->data);

switch (blank) {
case MI_DRM_BLANK_POWERDOWN:
if (gf_dev->device_available == 1) {
gf_dev->fb_black = 1;
gf_dev->wait_finger_down = true;
#if defined(GF_NETLINK_ENABLE)
temp[0] = GF_NET_EVENT_FB_BLACK;
sendnlmsg(temp);
#elif defined (GF_FASYNC)

if (gf_dev->async) {
kill_fasync(&gf_dev->async, SIGIO, POLL_IN);
}

#endif
}
break;

case MI_DRM_BLANK_UNBLANK:
if (gf_dev->device_available == 1) {
gf_dev->fb_black = 0;
#if defined(GF_NETLINK_ENABLE)
temp[0] = GF_NET_EVENT_FB_UNBLACK;
sendnlmsg(temp);
#elif defined (GF_FASYNC)

if (gf_dev->async) {
kill_fasync(&gf_dev->async, SIGIO, POLL_IN);
}

#endif
}

break;

default:
pr_debug("%s defalut\n", __func__);
break;
}
}

return NOTIFY_OK;
}

static struct notifier_block goodix_noti_block = {
.notifier_call = goodix_fb_state_chg_callback,
};
#endif

static struct class *gf_class;
#if defined(USE_SPI_BUS)
static int gf_probe(struct spi_device *spi)
Expand All @@ -841,11 +747,6 @@ static int gf_probe(struct platform_device *pdev)
gf_dev->reset_gpio = -EINVAL;
gf_dev->pwr_gpio = -EINVAL;
gf_dev->device_available = 0;
gf_dev->fb_black = 0;
gf_dev->wait_finger_down = false;
#ifndef GOODIX_DRM_INTERFACE_WA
INIT_WORK(&gf_dev->work, notification_work);
#endif

if (gf_parse_dts(gf_dev)) {
goto error_hw;
Expand Down Expand Up @@ -915,10 +816,6 @@ static int gf_probe(struct platform_device *pdev)
}

spi_clock_set(gf_dev, 1000000);
#endif
#ifndef GOODIX_DRM_INTERFACE_WA
gf_dev->notifier = goodix_noti_block;
mi_drm_register_client(&gf_dev->notifier);
#endif
gf_dev->irq = gf_irq_num(gf_dev);
fp_wakelock = wakeup_source_register(&gf_dev->spi->dev, "fp_wakelock");
Expand Down Expand Up @@ -982,9 +879,6 @@ static int gf_remove(struct platform_device *pdev)
gf_cleanup(gf_dev);
}

#ifndef GOODIX_DRM_INTERFACE_WA
mi_drm_unregister_client(&gf_dev->notifier);
#endif
mutex_unlock(&device_list_lock);
return 0;
}
Expand Down
Loading

0 comments on commit 1b95bce

Please sign in to comment.