Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b60ca671 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable QPIC display on sdxprairie"

parents 86c57e20 fa67cd3d

arch/arm/configs/vendor/sdxprairie_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -274,6 +274,9 @@ CONFIG_REGULATOR_GPIO=y 
CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y

CONFIG_FB=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDP_NONE=y

CONFIG_FB_MSM_QPIC_PANEL_DETECT=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y
@@ -338,6 +341,9 @@ CONFIG_MMC_CLKGATE=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

drivers/video/fbdev/msm/mdss_qpic.c

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -28,7 +28,6 @@ 
#include <linux/uaccess.h>

#include <linux/bootmem.h>

#include <linux/dma-mapping.h>

#include <linux/clk/msm-clk.h>



#include <linux/msm-sps.h>

#include <linux/msm-bus.h>
@@ -305,7 +304,7 @@ int qpic_init_sps(struct platform_device *pdev, 
	sps_config->source = SPS_DEV_HANDLE_MEM;

	sps_config->destination = bam_handle;

	sps_config->mode = SPS_MODE_DEST;

	sps_config->dest_pipe_index = 6;

	sps_config->dest_pipe_index = 8;



	sps_config->options = SPS_O_AUTO_ENABLE | SPS_O_EOT;

	sps_config->lock_group = 0;

drivers/video/fbdev/msm/mdss_qpic_panel.c

+1 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -15,7 +15,6 @@ 
#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/gpio.h>

#include <linux/qpnp/pin.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/leds.h>

drivers/video/fbdev/msm/qpic_panel_ili_qvga.c

+6 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -217,6 +217,11 @@ static int mdss_qpic_pinctrl_set_state(struct qpic_panel_io_desc *qpic_panel_io, 
	if (IS_ERR_OR_NULL(qpic_panel_io->pin_res.pinctrl))

		return PTR_ERR(qpic_panel_io->pin_res.pinctrl);



	if (active)

		gpio_direction_output(qpic_panel_io->bl_gpio, 1);

	else

		gpio_direction_output(qpic_panel_io->bl_gpio, 0);



	pin_state = active ? qpic_panel_io->pin_res.gpio_state_active

		: qpic_panel_io->pin_res.gpio_state_suspend;

	if (!IS_ERR_OR_NULL(pin_state)) {