Merge "defconfig: kona: Enable SPMI PMIC arbiter debug bus driver" (54f3590a) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0

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

arch/arm64/configs/vendor/kona_defconfig

+1 −0

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

drivers/spmi/spmi-pmic-arb-debug.c

+27 −0

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. */		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. */

			#include <linux/clk.h>
	#include <linux/delay.h>		#include <linux/delay.h>
	#include <linux/err.h>		#include <linux/err.h>
	#include <linux/io.h>		#include <linux/io.h>
	@@ -59,6 +60,7 @@ enum pmic_arb_cmd_op_code {
	struct spmi_pmic_arb_debug {		struct spmi_pmic_arb_debug {
	void __iomem *addr;		void __iomem *addr;
	raw_spinlock_t lock;		raw_spinlock_t lock;
			struct clk *clock;
	};		};

	static inline void pmic_arb_debug_write(struct spmi_pmic_arb_debug *pa,		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		else
	return -EINVAL;		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);		raw_spin_lock_irqsave(&pa->lock, flags);

	rc = pmic_arb_debug_issue_command(ctrl, opc, sid, addr, len);		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));		buf[i] = pmic_arb_debug_read(pa, PMIC_ARB_DEBUG_RDATA(i));
	done:		done:
	raw_spin_unlock_irqrestore(&pa->lock, flags);		raw_spin_unlock_irqrestore(&pa->lock, flags);
			clk_disable_unprepare(pa->clock);

	return rc;		return rc;
	}		}
	@@ -211,6 +220,12 @@ static int pmic_arb_debug_write_cmd(struct spmi_controller *ctrl, u8 opc,
	else		else
	return -EINVAL;		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);		raw_spin_lock_irqsave(&pa->lock, flags);

	/* Write data to FIFO */		/* 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);		rc = pmic_arb_debug_issue_command(ctrl, opc, sid, addr, len);

	raw_spin_unlock_irqrestore(&pa->lock, flags);		raw_spin_unlock_irqrestore(&pa->lock, flags);
			clk_disable_unprepare(pa->clock);

	return rc;		return rc;
	}		}
	@@ -283,6 +299,17 @@ static int spmi_pmic_arb_debug_probe(struct platform_device *pdev)
	goto err_put_ctrl;		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);		platform_set_drvdata(pdev, ctrl);
	raw_spin_lock_init(&pa->lock);		raw_spin_lock_init(&pa->lock);