mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 05:39:54 -04:00
GKI kernel build upgrade
GKI kernel build may error since spi_set_cs_timing is not in google whitelist upgrade as kernel verion Change-Id: I1ea0b1e23c15fd218ff0a2aee5f584f2cbf0dcc4 Reviewed-on: https://gerrit.mot.com/2060952 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Ningkai Zhuang <zhuangnk1@lenovo.com> Reviewed-by: Tao Sun <suntao2@motorola.com> Submit-Approved: Jira Key
This commit is contained in:
parent
6b3cd4b54c
commit
7c5df55ab7
1 changed files with 15 additions and 1 deletions
|
|
@ -34,6 +34,7 @@
|
|||
// #define WITH_SPI_CLK_MNGT 1
|
||||
|
||||
#include "linux/st21nfc.h"
|
||||
#include "linux/spi/spi-msm-geni.h"
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -1022,16 +1023,19 @@ static void st54spi_st21nfc_cb(int dir, void *data)
|
|||
|
||||
/* Change CS_TIME for ST54 */
|
||||
|
||||
/*
|
||||
static struct spi_delay st54spi_delay = {
|
||||
.unit = SPI_DELAY_UNIT_USECS,
|
||||
.value = 10,
|
||||
};
|
||||
*/
|
||||
|
||||
static int st54spi_probe(struct spi_device *spi)
|
||||
{
|
||||
struct st54spi_data *st54spi;
|
||||
int status, ret;
|
||||
unsigned long minor;
|
||||
struct spi_geni_qcom_ctrl_data *spi_param = NULL;
|
||||
|
||||
/*
|
||||
* st54spi should never be referenced in DT without a specific
|
||||
|
|
@ -1090,7 +1094,17 @@ static int st54spi_probe(struct spi_device *spi)
|
|||
// this method exists since kernel 5.3
|
||||
// it uses u8 parameter in kernel 5.4 (clk count) and spi_delay parameter in kernel 5.5 (clk_count fobidden)
|
||||
// target 10us delay ==> use CLK=4MHz and value 31 (even if u8 data, some platforms limit to 0-31)
|
||||
spi_set_cs_timing(spi, &st54spi_delay, NULL, NULL);
|
||||
|
||||
// spi_set_cs_timing(spi, &st54spi_delay, NULL, NULL);
|
||||
|
||||
spi_param = devm_kzalloc(&spi->dev, sizeof(spi_param), GFP_KERNEL);
|
||||
if (spi_param == NULL) {
|
||||
status = -ENOMEM;
|
||||
} else {
|
||||
/* Initialize the driver data */
|
||||
spi_param->spi_cs_clk_delay = 90;
|
||||
spi->controller_data = spi_param;
|
||||
}
|
||||
|
||||
if (status == 0)
|
||||
spi_set_drvdata(spi, st54spi);
|
||||
|
|
|
|||
Loading…
Reference in a new issue