- New Drivers
- Add support for Maxim MAX77714 PMIC
- Remove Drivers
- Remove support for ST-Ericsson AB8500 DebugFS
- New Device Support
- Add support for Silergy SY7636A to Simple MFD I2C
- Add support for MediaTek MT6366 PMIC to MT6358 IRQ
- Add support for Charger to Intel PMIC CRC
- Add support for Raptor Lake to Intel LPSS PCI
- New Functionality
- Add support for Reboot to Rockchip RK808
- Fix-ups
- Device Tree changes (inc. YAML conversion); silergy,sy7636a, maxim,max77843,
google,cros-ec, maxim,max14577, maxim,max77802,
maxim,max77714, qcom,tcsr, qcom,spmi-pmic,
stericsson,ab8500, stericsson,db8500-prcmu,
samsung,exynos5433-lpass, mt6397, syscon, brcm,cru
- Visible to menuconfig; simple-mfd-i2c
- Clean-up or clarify code; max77686, intel_soc_pmic_crc
- Improve error handling; mc13xxx-core, stmfx, asic3
- Pass device information to child devices; iqs62x, intel-lpss-acpi
- Individually identify IRQ domains; intel_soc_pmic_core
- Remove superfluous code; dbx500-prcmu, exynos-lpass
- Staticify and constify; arizona-i2c
- Mark sometimes used data as __maybe_unused; atmel-flexcom
- Account for different ACPI tables on AOSP/Windows platforms; arizona-spi
- Use provided (platform) APIs; ab8500-core
- Trivial (whitespace, spelling); rohm-bd9576
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAmI9n1YACgkQUa+KL4f8
d2F59RAAi3zTun+i7NEvaPs4awcXgUv9ZFJmP/AcCTvKwmAnom4JHc56c86yE/Fz
IwQ/yug60AQPMe05jw4+KxD87URLGKb/IDTzmRvnC29gwg1FR5A2bFNJ+wveK6od
cN0r40lvHCzVASwOeF2E63RzXcWHFg+tuNq6qm+HQ6LX31MpMe/dfMOCvVm+1A50
aOn2cnEiUw7mhEiEy0CPtd01hjBEu4QS8xzZwGu/4lHEbInDxpAakQP8ixYE0THF
KEvR2gFS6G6wYHO3ZQOJHQJnnzL1nmLtsUX3q+5+DIKnLcY/1xofdxloHAH18i+9
8e9nDB4TVPAHCpiSVFmPtzS7TR5ofkaYIvpxKlolBVgXGkAivYrtcQUMPEG6ZbNL
wpe6j2IB7EeQeh0z8k9mzr6zZ3Dw5EGcytvAMP3SZAsHpy+uiZ0TOqPdFs1NXLJ7
7rlpUhlgn2Ar5TI+z5DLeZsKSO8Lb9+X6BlXfblT0dNBclmh52suWwp1yx7hCehD
mFm7JfkU7+/9XlzkxYqyyl/3qmmuiXfrxf5Uc96kwcczFkXli8z2Q5Jli6dmCq5+
LE9hkLk6JC5m5QpRv8cg06sHraDbPbTnrrhf5w6txukU+HsldxcQNaJMqLhHCPQ4
CUYWRImr0no8PJZQkslIgWaqkpQejS5UzPQbFnkQblvP2XMvOFU=
=1xnI
-----END PGP SIGNATURE-----
Merge tag 'mfd-next-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones:
"New Drivers:
- Add support for Maxim MAX77714 PMIC
Removed Drivers:
- Remove support for ST-Ericsson AB8500 DebugFS
New Device Support:
- Add support for Silergy SY7636A to Simple MFD I2C
- Add support for MediaTek MT6366 PMIC to MT6358 IRQ
- Add support for Charger to Intel PMIC CRC
- Add support for Raptor Lake to Intel LPSS PCI
New Functionality:
- Add support for Reboot to Rockchip RK808
Fix-ups:
- Device Tree changes (includcing YAML conversion) for
silergy,sy7636a, maxim,max77843, google,cros-ec, maxim,max14577,
maxim,max77802, maxim,max77714, qcom,tcsr, qcom,spmi-pmic,
stericsson,ab8500, stericsson,db8500-prcmu,
samsung,exynos5433-lpass, mt6397, syscon, brcm,cru
- Visible to menuconfig; simple-mfd-i2c
- Clean-up or clarify code; max77686, intel_soc_pmic_crc
- Improve error handling; mc13xxx-core, stmfx, asic3
- Pass device information to child devices; iqs62x, intel-lpss-acpi
- Individually identify IRQ domains; intel_soc_pmic_core
- Remove superfluous code; dbx500-prcmu, exynos-lpass
- Staticify and constify; arizona-i2c
- Mark sometimes used data as __maybe_unused; atmel-flexcom
- Account for different ACPI tables on AOSP/Windows platforms; arizona-spi
- Use provided (platform) APIs; ab8500-core
- Trivial (whitespace, spelling); rohm-bd9576"
* tag 'mfd-next-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (50 commits)
dt-bindings: mfd: syscon: Add microchip,lan966x-cpu-syscon compatible
mfd: bd9576: fix typos in comments
mfd: Use platform_get_irq() to get the interrupt
mfd: db8500-prcmu: Remove unused inline function
mfd: arizona-spi: Add Android board ACPI table handling
mfd: arizona-spi: Split Windows ACPI init code into its own function
mfd: asic3: Add missing iounmap() on error asic3_mfd_probe
MAINTAINERS: Rectify entry for ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
mfd: intel-lpss: Provide an SSP type to the driver
dt-bindings: mfd: brcm,cru: Rename pinctrl node
dt-bindings: Add compatibles for undocumented trivial syscons
mfd: atmel-flexcom: Fix compilation warning
dt-bindings: mfd: Add compatible for the MediaTek MT6366 PMIC
dt-bindings: mfd: samsung,exynos5433-lpass: Convert to dtschema
mfd: exynos-lpass: Drop unneeded syscon.h include
mfd: intel-lpss: Add Intel Raptor Lake PCH-S PCI IDs
mfd: ab8500: Drop debugfs module
mfd: sta2x11: Use GFP_KERNEL instead of GFP_ATOMIC
mfd: ab8500: Rewrite bindings in YAML
mfd: qcom-spmi-pmic: Add pm8953 compatible
...
This commit is contained in:
commit
8350e8331b
60 changed files with 1947 additions and 2814 deletions
|
|
@ -556,31 +556,11 @@ static inline void prcmu_clear(unsigned int reg, u32 bits)
|
|||
#define PRCMU_QOS_ARM_OPP 3
|
||||
#define PRCMU_QOS_DEFAULT_VALUE -1
|
||||
|
||||
#ifdef CONFIG_DBX500_PRCMU_QOS_POWER
|
||||
|
||||
unsigned long prcmu_qos_get_cpufreq_opp_delay(void);
|
||||
void prcmu_qos_set_cpufreq_opp_delay(unsigned long);
|
||||
void prcmu_qos_force_opp(int, s32);
|
||||
int prcmu_qos_requirement(int pm_qos_class);
|
||||
int prcmu_qos_add_requirement(int pm_qos_class, char *name, s32 value);
|
||||
int prcmu_qos_update_requirement(int pm_qos_class, char *name, s32 new_value);
|
||||
void prcmu_qos_remove_requirement(int pm_qos_class, char *name);
|
||||
int prcmu_qos_add_notifier(int prcmu_qos_class,
|
||||
struct notifier_block *notifier);
|
||||
int prcmu_qos_remove_notifier(int prcmu_qos_class,
|
||||
struct notifier_block *notifier);
|
||||
|
||||
#else
|
||||
|
||||
static inline unsigned long prcmu_qos_get_cpufreq_opp_delay(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void prcmu_qos_set_cpufreq_opp_delay(unsigned long n) {}
|
||||
|
||||
static inline void prcmu_qos_force_opp(int prcmu_qos_class, s32 i) {}
|
||||
|
||||
static inline int prcmu_qos_requirement(int prcmu_qos_class)
|
||||
{
|
||||
return 0;
|
||||
|
|
@ -613,6 +593,4 @@ static inline int prcmu_qos_remove_notifier(int prcmu_qos_class,
|
|||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* __MACH_PRCMU_H */
|
||||
|
|
|
|||
|
|
@ -14,6 +14,11 @@
|
|||
#define IQS624_PROD_NUM 0x43
|
||||
#define IQS625_PROD_NUM 0x4E
|
||||
|
||||
#define IQS620_HW_NUM_V0 0x82
|
||||
#define IQS620_HW_NUM_V1 IQS620_HW_NUM_V0
|
||||
#define IQS620_HW_NUM_V2 IQS620_HW_NUM_V0
|
||||
#define IQS620_HW_NUM_V3 0x92
|
||||
|
||||
#define IQS621_ALS_FLAGS 0x16
|
||||
#define IQS622_ALS_FLAGS 0x14
|
||||
|
||||
|
|
@ -129,6 +134,8 @@ struct iqs62x_core {
|
|||
struct completion fw_done;
|
||||
enum iqs62x_ui_sel ui_sel;
|
||||
unsigned long event_cache;
|
||||
u8 sw_num;
|
||||
u8 hw_num;
|
||||
};
|
||||
|
||||
extern const struct iqs62x_event_desc iqs62x_events[IQS62X_NUM_EVENTS];
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ enum max77686_rtc_reg {
|
|||
MAX77686_RTC_WEEKDAY = 0x0A,
|
||||
MAX77686_RTC_MONTH = 0x0B,
|
||||
MAX77686_RTC_YEAR = 0x0C,
|
||||
MAX77686_RTC_DATE = 0x0D,
|
||||
MAX77686_RTC_MONTHDAY = 0x0D,
|
||||
MAX77686_ALARM1_SEC = 0x0E,
|
||||
MAX77686_ALARM1_MIN = 0x0F,
|
||||
MAX77686_ALARM1_HOUR = 0x10,
|
||||
|
|
@ -352,7 +352,7 @@ enum max77802_rtc_reg {
|
|||
MAX77802_RTC_WEEKDAY = 0xCA,
|
||||
MAX77802_RTC_MONTH = 0xCB,
|
||||
MAX77802_RTC_YEAR = 0xCC,
|
||||
MAX77802_RTC_DATE = 0xCD,
|
||||
MAX77802_RTC_MONTHDAY = 0xCD,
|
||||
MAX77802_RTC_AE1 = 0xCE,
|
||||
MAX77802_ALARM1_SEC = 0xCF,
|
||||
MAX77802_ALARM1_MIN = 0xD0,
|
||||
|
|
|
|||
60
include/linux/mfd/max77714.h
Normal file
60
include/linux/mfd/max77714.h
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* Maxim MAX77714 Register and data structures definition.
|
||||
*
|
||||
* Copyright (C) 2022 Luca Ceresoli
|
||||
* Author: Luca Ceresoli <luca@lucaceresoli.net>
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_MFD_MAX77714_H_
|
||||
#define __LINUX_MFD_MAX77714_H_
|
||||
|
||||
#include <linux/bits.h>
|
||||
|
||||
#define MAX77714_INT_TOP 0x00
|
||||
#define MAX77714_INT_TOPM 0x07 /* Datasheet says "read only", but it is RW */
|
||||
|
||||
#define MAX77714_INT_TOP_ONOFF BIT(1)
|
||||
#define MAX77714_INT_TOP_RTC BIT(3)
|
||||
#define MAX77714_INT_TOP_GPIO BIT(4)
|
||||
#define MAX77714_INT_TOP_LDO BIT(5)
|
||||
#define MAX77714_INT_TOP_SD BIT(6)
|
||||
#define MAX77714_INT_TOP_GLBL BIT(7)
|
||||
|
||||
#define MAX77714_32K_STATUS 0x30
|
||||
#define MAX77714_32K_STATUS_SIOSCOK BIT(5)
|
||||
#define MAX77714_32K_STATUS_XOSCOK BIT(4)
|
||||
#define MAX77714_32K_STATUS_32KSOURCE BIT(3)
|
||||
#define MAX77714_32K_STATUS_32KLOAD_MSK 0x3
|
||||
#define MAX77714_32K_STATUS_32KLOAD_SHF 1
|
||||
#define MAX77714_32K_STATUS_CRYSTAL_CFG BIT(0)
|
||||
|
||||
#define MAX77714_32K_CONFIG 0x31
|
||||
#define MAX77714_32K_CONFIG_XOSC_RETRY BIT(4)
|
||||
|
||||
#define MAX77714_CNFG_GLBL2 0x91
|
||||
#define MAX77714_WDTEN BIT(2)
|
||||
#define MAX77714_WDTSLPC BIT(3)
|
||||
#define MAX77714_TWD_MASK 0x3
|
||||
#define MAX77714_TWD_2s 0x0
|
||||
#define MAX77714_TWD_16s 0x1
|
||||
#define MAX77714_TWD_64s 0x2
|
||||
#define MAX77714_TWD_128s 0x3
|
||||
|
||||
#define MAX77714_CNFG_GLBL3 0x92
|
||||
#define MAX77714_WDTC BIT(0)
|
||||
|
||||
#define MAX77714_CNFG2_ONOFF 0x94
|
||||
#define MAX77714_WD_RST_WK BIT(5)
|
||||
|
||||
/* Interrupts */
|
||||
enum {
|
||||
MAX77714_IRQ_TOP_ONOFF,
|
||||
MAX77714_IRQ_TOP_RTC, /* Real-time clock */
|
||||
MAX77714_IRQ_TOP_GPIO, /* GPIOs */
|
||||
MAX77714_IRQ_TOP_LDO, /* Low-dropout regulators */
|
||||
MAX77714_IRQ_TOP_SD, /* Step-down regulators */
|
||||
MAX77714_IRQ_TOP_GLBL, /* "Global resources": Low-Battery, overtemp... */
|
||||
};
|
||||
|
||||
#endif /* __LINUX_MFD_MAX77714_H_ */
|
||||
|
|
@ -94,6 +94,10 @@
|
|||
#define MT6358_BUCK_VCORE_CON0 0x1488
|
||||
#define MT6358_BUCK_VCORE_DBG0 0x149e
|
||||
#define MT6358_BUCK_VCORE_DBG1 0x14a0
|
||||
#define MT6358_BUCK_VCORE_SSHUB_CON0 0x14a4
|
||||
#define MT6358_BUCK_VCORE_SSHUB_CON1 0x14a6
|
||||
#define MT6358_BUCK_VCORE_SSHUB_ELR0 MT6358_BUCK_VCORE_SSHUB_CON1
|
||||
#define MT6358_BUCK_VCORE_SSHUB_DBG1 MT6358_BUCK_VCORE_DBG1
|
||||
#define MT6358_BUCK_VCORE_ELR0 0x14aa
|
||||
#define MT6358_BUCK_VGPU_CON0 0x1508
|
||||
#define MT6358_BUCK_VGPU_DBG0 0x151e
|
||||
|
|
@ -169,6 +173,9 @@
|
|||
#define MT6358_LDO_VSRAM_OTHERS_CON0 0x1ba6
|
||||
#define MT6358_LDO_VSRAM_OTHERS_DBG0 0x1bc0
|
||||
#define MT6358_LDO_VSRAM_OTHERS_DBG1 0x1bc2
|
||||
#define MT6358_LDO_VSRAM_OTHERS_SSHUB_CON0 0x1bc4
|
||||
#define MT6358_LDO_VSRAM_OTHERS_SSHUB_CON1 0x1bc6
|
||||
#define MT6358_LDO_VSRAM_OTHERS_SSHUB_DBG1 MT6358_LDO_VSRAM_OTHERS_DBG1
|
||||
#define MT6358_LDO_VSRAM_GPU_CON0 0x1bc8
|
||||
#define MT6358_LDO_VSRAM_GPU_DBG0 0x1be2
|
||||
#define MT6358_LDO_VSRAM_GPU_DBG1 0x1be4
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ enum chip_id {
|
|||
MT6323_CHIP_ID = 0x23,
|
||||
MT6358_CHIP_ID = 0x58,
|
||||
MT6359_CHIP_ID = 0x59,
|
||||
MT6366_CHIP_ID = 0x66,
|
||||
MT6391_CHIP_ID = 0x91,
|
||||
MT6397_CHIP_ID = 0x97,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -373,6 +373,7 @@ enum rk805_reg {
|
|||
#define SWITCH2_EN BIT(6)
|
||||
#define SWITCH1_EN BIT(5)
|
||||
#define DEV_OFF_RST BIT(3)
|
||||
#define DEV_RST BIT(2)
|
||||
#define DEV_OFF BIT(0)
|
||||
#define RTC_STOP BIT(0)
|
||||
|
||||
|
|
|
|||
34
include/linux/mfd/sy7636a.h
Normal file
34
include/linux/mfd/sy7636a.h
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* Functions to access SY3686A power management chip.
|
||||
*
|
||||
* Copyright (C) 2021 reMarkable AS - http://www.remarkable.com/
|
||||
*/
|
||||
|
||||
#ifndef __MFD_SY7636A_H
|
||||
#define __MFD_SY7636A_H
|
||||
|
||||
#define SY7636A_REG_OPERATION_MODE_CRL 0x00
|
||||
/* It is set if a gpio is used to control the regulator */
|
||||
#define SY7636A_OPERATION_MODE_CRL_VCOMCTL BIT(6)
|
||||
#define SY7636A_OPERATION_MODE_CRL_ONOFF BIT(7)
|
||||
#define SY7636A_REG_VCOM_ADJUST_CTRL_L 0x01
|
||||
#define SY7636A_REG_VCOM_ADJUST_CTRL_H 0x02
|
||||
#define SY7636A_REG_VCOM_ADJUST_CTRL_MASK 0x01ff
|
||||
#define SY7636A_REG_VLDO_VOLTAGE_ADJULST_CTRL 0x03
|
||||
#define SY7636A_REG_POWER_ON_DELAY_TIME 0x06
|
||||
#define SY7636A_REG_FAULT_FLAG 0x07
|
||||
#define SY7636A_FAULT_FLAG_PG BIT(0)
|
||||
#define SY7636A_REG_TERMISTOR_READOUT 0x08
|
||||
|
||||
#define SY7636A_REG_MAX 0x08
|
||||
|
||||
#define VCOM_ADJUST_CTRL_MASK 0x1ff
|
||||
// Used to shift the high byte
|
||||
#define VCOM_ADJUST_CTRL_SHIFT 8
|
||||
// Used to scale from VCOM_ADJUST_CTRL to mv
|
||||
#define VCOM_ADJUST_CTRL_SCAL 10000
|
||||
|
||||
#define FAULT_FLAG_SHIFT 1
|
||||
|
||||
#endif /* __LINUX_MFD_SY7636A_H */
|
||||
Loading…
Add table
Add a link
Reference in a new issue