asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "defconfig: kona: Enable SPMI PMIC arbiter debug bus driver"

Browse source
This commit is contained in:
qctecmdr 2019-05-06 15:54:15 -07:00 committed by Gerrit - the friendly Code Review server
commit 54f3590aa0
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm64/configs/vendor/kona-perf_defconfig vendored
View file

@ -348,6 +348,7 @@ CONFIG_SPI=y
CONFIG_SPI_QCOM_GENI=y
CONFIG_SPI_SPIDEV=y
CONFIG_SPMI=y
CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
CONFIG_PINCTRL_KONA=y
CONFIG_GPIO_SYSFS=y

1
arch/arm64/configs/vendor/kona_defconfig vendored
View file

@ -359,6 +359,7 @@ CONFIG_SPI=y
CONFIG_SPI_QCOM_GENI=y
CONFIG_SPI_SPIDEV=y
CONFIG_SPMI=y
CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
CONFIG_PINCTRL_KONA=y
CONFIG_GPIO_SYSFS=y

27
drivers/spmi/spmi-pmic-arb-debug.c
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. */
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/io.h>
@ -59,6 +60,7 @@ enum pmic_arb_cmd_op_code {
struct spmi_pmic_arb_debug {
void __iomem *addr;
raw_spinlock_t lock;
struct clk *clock;
};
static inline void pmic_arb_debug_write(struct spmi_pmic_arb_debug *pa,
@ -171,6 +173,12 @@ static int pmic_arb_debug_read_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid,
else
return -EINVAL;
rc = clk_prepare_enable(pa->clock);
if (rc) {
pr_err("%s: failed to enable core clock, rc=%d\n",
__func__, rc);
return rc;
}
raw_spin_lock_irqsave(&pa->lock, flags);
rc = pmic_arb_debug_issue_command(ctrl, opc, sid, addr, len);
@ -182,6 +190,7 @@ static int pmic_arb_debug_read_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid,
buf[i] = pmic_arb_debug_read(pa, PMIC_ARB_DEBUG_RDATA(i));
done:
raw_spin_unlock_irqrestore(&pa->lock, flags);
clk_disable_unprepare(pa->clock);
return rc;
}
@ -211,6 +220,12 @@ static int pmic_arb_debug_write_cmd(struct spmi_controller *ctrl, u8 opc,
else
return -EINVAL;
rc = clk_prepare_enable(pa->clock);
if (rc) {
pr_err("%s: failed to enable core clock, rc=%d\n",
__func__, rc);
return rc;
}
raw_spin_lock_irqsave(&pa->lock, flags);
/* Write data to FIFO */
@ -220,6 +235,7 @@ static int pmic_arb_debug_write_cmd(struct spmi_controller *ctrl, u8 opc,
rc = pmic_arb_debug_issue_command(ctrl, opc, sid, addr, len);
raw_spin_unlock_irqrestore(&pa->lock, flags);
clk_disable_unprepare(pa->clock);
return rc;
}
@ -283,6 +299,17 @@ static int spmi_pmic_arb_debug_probe(struct platform_device *pdev)
goto err_put_ctrl;
}
if (of_find_property(pdev->dev.of_node, "clock-names", NULL)) {
pa->clock = devm_clk_get(&pdev->dev, "core_clk");
if (IS_ERR(pa->clock)) {
rc = PTR_ERR(pa->clock);
if (rc != -EPROBE_DEFER)
dev_err(&pdev->dev, "unable to request core clock, rc=%d\n",
rc);
goto err_put_ctrl;
}
}
platform_set_drvdata(pdev, ctrl);
raw_spin_lock_init(&pa->lock);