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

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

Merge "regulator: spm_regulator: Add snapshot of spm_regulator driver"

parents d64dc10d a878300a

drivers/irqchip/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -88,5 +88,5 @@ obj-$(CONFIG_MESON_IRQ_GPIO) += irq-meson-gpio.o 
obj-$(CONFIG_GOLDFISH_PIC) 		+= irq-goldfish-pic.o

obj-$(CONFIG_NDS32)			+= irq-ativic32.o

obj-$(CONFIG_QCOM_PDC)			+= qcom-pdc.o

obj-$(CONFIG_QCOM_MPM)			+= qcom-mpm.o qcom-mpm-bengal.o qcom-mpm-scuba.o

obj-$(CONFIG_QCOM_MPM)			+= qcom-mpm.o qcom-mpm-bengal.o qcom-mpm-scuba.o qcom-mpm-sdm660.o

obj-$(CONFIG_SIFIVE_PLIC)		+= irq-sifive-plic.o

drivers/irqchip/qcom-mpm-sdm660.c

0 → 100644
+19 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 */



#include <soc/qcom/mpm.h>



const struct mpm_pin mpm_sdm660_gic_chip_data[] = {

	{2, 216}, /* tsens1_tsens_upper_lower_int */

	{52, 275}, /* qmp_usb3_lfps_rxterm_irq_cx */

	{61, 209}, /* lpi_dir_conn_irq_apps[1] */

	{79, 379}, /* qusb2phy_intr for Dm */

	{80, 380}, /* qusb2phy_intr for Dm for secondary PHY */

	{81, 379}, /* qusb2phy_intr for Dp */

	{82, 380}, /* qusb2phy_intr for Dp for secondary PHY */

	{87, 358}, /* ee0_apps_hlos_spmi_periph_irq */

	{91, 519}, /* lpass_pmu_tmr_timeout_irq_cx */

	{-1},

};

drivers/irqchip/qcom-mpm.c

+4 −0
Original line number Diff line number Diff line
@@ -592,6 +592,10 @@ static const struct of_device_id mpm_gic_chip_data_table[] = { 
		.compatible = "qcom,mpm-gic-scuba",

		.data = mpm_scuba_gic_chip_data,

	},

	{

		.compatible = "qcom,mpm-gic-sdm660",

		.data = mpm_sdm660_gic_chip_data,

	},

	{}

};

MODULE_DEVICE_TABLE(of, mpm_gic_chip_data_table);

drivers/regulator/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -1094,6 +1094,16 @@ config REGULATOR_RPM_SMD 
	  be used on systems which contain an RPM which communicates with the

	  application processor over SMD.



config REGULATOR_SPM

	bool "SPM regulator driver"

	depends on SPMI

	help

	  Enable support for the SPM regulator driver which is used for

	  setting voltages of processor supply regulators via the SPM module

	  found inside chips of Qualcomm Technologies Inc. The SPM regulator

	  driver can be used on QTI SoCs where the APSS processor cores are

	  supplied by their own PMIC regulator.



config REGULATOR_STUB

	tristate "Stub Regulator"

	help

drivers/regulator/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o 
obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o

obj-$(CONFIG_REGULATOR_MEM_ACC) += mem-acc-regulator.o

obj-$(CONFIG_REGULATOR_REFGEN) += refgen.o

obj-$(CONFIG_REGULATOR_SPM) += spm-regulator.o

obj-$(CONFIG_REGULATOR_RPMH) += rpmh-regulator.o

obj-$(CONFIG_REGULATOR_STUB) += stub-regulator.o