mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
Merge tag 'mfd-next-6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones:
"New Support & Features:
- Add comprehensive support for the ROHM BD72720 PMIC, including core
MFD, regulator, GPIO, clock gate, RTC, and power-supply drivers
- Add support for the Rockchip RK801 PMIC, including core MFD and
regulator drivers
- Add support for the ROHM BD73900 PMIC by leveraging existing common
drivers
- Wire up RTC, hwmon, and input sub-devices for the Apple SMC
(macsmc) driver
- Add support for the Delta Networks TN48M switch CPLD via the
simple-mfd-i2c driver
- Add support for the TS133 variant to the QNAP MCU driver
- Provide support for the sama7d65 XLCD controller in the Atmel HLCDC
driver
- Add backlight sub-device support to the Congatec Board Controller
(cgbc)
- Add Intel Nova Lake-S (NVL-S) PCI IDs to the Intel LPSS driver
Improvements & Fixes:
- Implement a "wrapper regmap" for the ROHM BD72720 to handle dual
I2C slave addresses (0x4b and 0x4c) transparently for child devices
- Introduce mutex locking around 'mfd_of_node_list' in the MFD core
to ensure safe concurrent access
- Fix a potential regulator resource leak in the Arizona core driver
during boot sequence failures
- Resolve child device duplication issues on driver rebind for
Qualcomm PM8xxx and OMAP USB host drivers by using
of_platform_depopulate()
- Fix IRQ domain name duplication for the Samsung S2MPG10 by adding a
unique domain suffix
- Implement LOCK register handling for the TI TPS65214 variant to
unlock registers at probe time
- Fully convert the Loongson-2K BMC driver to use managed resources
(pcim) and the standard PCI resource API
- Ensure the Apple SMC mutex is correctly initialized during probe to
prevent NULL pointer dereferences
- Expand the ROHM BD71828 power-supply driver to support 9-bit
register addresses
- Simplify the Samsung S5M RTC driver by querying platform device IRQ
resources directly
- Revert an incorrect read-to-write mask change in the DA9052 SPI
driver to restore default OTP behavior
- Fix kernel-doc warnings in the TI TPS6105x driver
- Cleanups & Refactoring
- Simplify the MFD core by utilizing the scoped
for_each_child_of_node_scoped() macro and streamlining device_node
storage
- Rename ROHM BD71828 IC-specific entities to use consistent prefixes
for better extensibility
- Refactor ROHM BD71828 regmap definitions using the
regmap_reg_range() macro
- Update the ROHM BD71828 driver to use standard C-style comment
headers
- Remove the now unused 'irq_data' field from the Samsung SEC core
structure
- Drop unnecessary use of irqd_get_trigger_type() in the Maxim
MAX77759 driver
- Default MFD_SPACEMIT_P1 to 'm' if ARCH_SPACEMIT is selected
- Add missing charger-related registers to the ROHM BD71828 core
header and Type-C CC registers to the AXP717
Device Tree Binding Updates:
- Add new bindings for the ROHM BD72720 PMIC, Rockchip RK801 PMIC,
Bitmain BM1880 System Controller, and NXP LPC32xx System Control
Block
- Clarify trickle-charge terminology and add properties for voltage
drop (VDR) correction and upper charge limits to the generic
battery binding
- Document GPR syscon for NXP S32 SoCs and the smp-memram subnode for
Aspeed SCU
- Document numerous new Qualcomm SPMI PMIC compatibles (pmcx0102,
pmh0101, pmk8850, etc)
- Add compatibles for the sama7d65 XLCD (Atmel), LAN9691 Flexcom
(Microchip), and various MediaTek SCPSYS and regulator components
- Fix a dead link to the audio codec binding in the DA9055
documentation"
* tag 'mfd-next-6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (41 commits)
dt-bindings: mfd: da9055: Fix dead link to codec binding
mfd: cgbc: Add support for backlight
dt-bindings: mfd: qcom,spmi-pmic: Document PMICs present on Glymur and Kaanapali
dt-bindings: mfd: Document smp-memram subnode for aspeed,ast2x00-scu
mfd: intel-lpss: Add Intel Nova Lake-S PCI IDs
mfd: ls2kbmc: Use PCI API instead of direct accesses
mfd: ls2kbmc: Fully convert to use managed resources
dt-bindings: mfd: mediatek: mt6397: Add missing MT6331 regulator compat
dt-bindings: mfd: mediatek,mt8195-scpsys: Add mediatek,mt6795-scpsys
dt-bindings: mfd: atmel,sama5d2-flexcom: Add microchip,lan9691-flexcom
mfd: omap-usb-host: Fix OF populate on driver rebind
mfd: qcom-pm8xxx: Fix OF populate on driver rebind
dt-bindings: mfd: syscon: Allow syscon compatible for mediatek,mt7981-topmisc
mfd: qnap-mcu: Add driver data for TS133 variant
dt-bindings: mfd: qnap,ts433-mcu: Add qnap,ts133-mcu compatible
mfd: sec: Fix IRQ domain names duplication
mfd: simple-mfd-i2c: Add Delta TN48M CPLD support
mfd: macsmc: Initialize mutex
dt-bindings: mfd: nxp: Add NXP LPC32xx System Control Block
mfd: Kconfig: Default MFD_SPACEMIT_P1 to 'm' if ARCH_SPACEMIT
...
This commit is contained in:
Linus Torvalds
@@ -130,6 +130,23 @@ patternProperties:
|
||||
- description: silicon id information registers
|
||||
- description: unique chip id registers
|
||||
|
||||
'^smp-memram@[0-9a-f]+$':
|
||||
description: Memory region used for the AST2600's custom SMP bringup protocol
|
||||
type: object
|
||||
additionalProperties: false
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
const: aspeed,ast2600-smpmem
|
||||
|
||||
reg:
|
||||
description: The SMP memory region
|
||||
maxItems: 1
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
|
||||
@@ -25,6 +25,7 @@ properties:
|
||||
- atmel,sama5d4-hlcdc
|
||||
- microchip,sam9x60-hlcdc
|
||||
- microchip,sam9x75-xlcdc
|
||||
- microchip,sama7d65-xlcdc
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
@@ -20,6 +20,7 @@ properties:
|
||||
- const: atmel,sama5d2-flexcom
|
||||
- items:
|
||||
- enum:
|
||||
- microchip,lan9691-flexcom
|
||||
- microchip,sam9x7-flexcom
|
||||
- microchip,sama7d65-flexcom
|
||||
- microchip,sama7g5-flexcom
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/mfd/bitmain,bm1880-sctrl.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Bitmain BM1880 System Controller
|
||||
|
||||
maintainers:
|
||||
- Manivannan Sadhasivam <mani@kernel.org>
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
items:
|
||||
- const: bitmain,bm1880-sctrl
|
||||
- const: syscon
|
||||
- const: simple-mfd
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
ranges: true
|
||||
|
||||
'#address-cells':
|
||||
const: 1
|
||||
|
||||
'#size-cells':
|
||||
const: 1
|
||||
|
||||
patternProperties:
|
||||
'^pinctrl@[0-9a-f]+$':
|
||||
type: object
|
||||
additionalProperties: true
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
const: bitmain,bm1880-pinctrl
|
||||
|
||||
'^clock-controller@[0-9a-f]+$':
|
||||
type: object
|
||||
additionalProperties: true
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
const: bitmain,bm1880-clk
|
||||
|
||||
'^reset-controller@[0-9a-f]+$':
|
||||
type: object
|
||||
additionalProperties: true
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
const: bitmain,bm1880-reset
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
- ranges
|
||||
- '#address-cells'
|
||||
- '#size-cells'
|
||||
|
||||
additionalProperties: false
|
||||
...
|
||||
@@ -15,7 +15,7 @@ The CODEC device in DA9055 has a separate, configurable I2C address and so
|
||||
is instantiated separately from the PMIC.
|
||||
|
||||
For details on accompanying CODEC I2C device, see the following:
|
||||
Documentation/devicetree/bindings/sound/da9055.txt
|
||||
Documentation/devicetree/bindings/sound/trivial-codec.yaml
|
||||
|
||||
======
|
||||
|
||||
|
||||
@@ -90,6 +90,7 @@ properties:
|
||||
- enum:
|
||||
- mediatek,mt6323-regulator
|
||||
- mediatek,mt6328-regulator
|
||||
- mediatek,mt6331-regulator
|
||||
- mediatek,mt6358-regulator
|
||||
- mediatek,mt6359-regulator
|
||||
- mediatek,mt6397-regulator
|
||||
|
||||
@@ -19,6 +19,7 @@ properties:
|
||||
compatible:
|
||||
items:
|
||||
- enum:
|
||||
- mediatek,mt6795-scpsys
|
||||
- mediatek,mt6893-scpsys
|
||||
- mediatek,mt8167-scpsys
|
||||
- mediatek,mt8173-scpsys
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/mfd/nxp,lpc3220-scb.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: NXP LPC32xx System Control Block
|
||||
|
||||
maintainers:
|
||||
- Vladimir Zapolskiy <vz@mleia.com>
|
||||
|
||||
description:
|
||||
NXP LPC32xx SoC series have a System Control Block, which serves for
|
||||
a multitude of purposes including clock management, DMA muxes, storing
|
||||
SoC unique ID etc.
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
items:
|
||||
- enum:
|
||||
- nxp,lpc3220-scb
|
||||
- const: syscon
|
||||
- const: simple-mfd
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
ranges: true
|
||||
|
||||
"#address-cells":
|
||||
const: 1
|
||||
|
||||
"#size-cells":
|
||||
const: 1
|
||||
|
||||
patternProperties:
|
||||
"^clock-controller@[0-9a-f]+$":
|
||||
$ref: /schemas/clock/nxp,lpc3220-clk.yaml#
|
||||
|
||||
"^dma-router@[0-9a-f]+$":
|
||||
$ref: /schemas/dma/nxp,lpc3220-dmamux.yaml#
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
- "#address-cells"
|
||||
- "#size-cells"
|
||||
|
||||
additionalProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
syscon@400040000 {
|
||||
compatible = "nxp,lpc3220-scb", "syscon", "simple-mfd";
|
||||
reg = <0x40004000 0x1000>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges = <0 0x40004000 0x1000>;
|
||||
|
||||
clock-controller@0 {
|
||||
compatible = "nxp,lpc3220-clk";
|
||||
reg = <0x0 0x114>;
|
||||
clocks = <&xtal_32k>, <&xtal>;
|
||||
clock-names = "xtal_32k", "xtal";
|
||||
#clock-cells = <1>;
|
||||
};
|
||||
|
||||
dma-router@78 {
|
||||
compatible = "nxp,lpc3220-dmamux";
|
||||
reg = <0x78 0x8>;
|
||||
dma-masters = <&dma>;
|
||||
#dma-cells = <3>;
|
||||
};
|
||||
};
|
||||
@@ -77,8 +77,12 @@ properties:
|
||||
- qcom,pmc8180
|
||||
- qcom,pmc8180c
|
||||
- qcom,pmc8380
|
||||
- qcom,pmcx0102
|
||||
- qcom,pmd8028
|
||||
- qcom,pmd9635
|
||||
- qcom,pmh0101
|
||||
- qcom,pmh0104
|
||||
- qcom,pmh0110
|
||||
- qcom,pmi632
|
||||
- qcom,pmi8950
|
||||
- qcom,pmi8962
|
||||
@@ -89,6 +93,7 @@ properties:
|
||||
- qcom,pmk8002
|
||||
- qcom,pmk8350
|
||||
- qcom,pmk8550
|
||||
- qcom,pmk8850
|
||||
- qcom,pmm8155au
|
||||
- qcom,pmm8654au
|
||||
- qcom,pmp8074
|
||||
@@ -101,6 +106,7 @@ properties:
|
||||
- qcom,pmx75
|
||||
- qcom,smb2351
|
||||
- qcom,smb2360
|
||||
- qcom,smb2370
|
||||
- const: qcom,spmi-pmic
|
||||
|
||||
reg:
|
||||
|
||||
@@ -16,6 +16,7 @@ description:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- qnap,ts133-mcu
|
||||
- qnap,ts233-mcu
|
||||
- qnap,ts433-mcu
|
||||
|
||||
|
||||
@@ -0,0 +1,197 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/mfd/rockchip,rk801.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: RK801 Power Management Integrated Circuit
|
||||
|
||||
maintainers:
|
||||
- Joseph Chen <chenjh@rock-chips.com>
|
||||
|
||||
description: |
|
||||
Rockchip RK801 series PMIC. This device consists of an i2c controlled MFD
|
||||
that includes multiple switchable regulators.
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- rockchip,rk801
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
interrupts:
|
||||
maxItems: 1
|
||||
|
||||
system-power-controller:
|
||||
type: boolean
|
||||
description:
|
||||
Telling whether or not this PMIC is controlling the system power.
|
||||
|
||||
wakeup-source:
|
||||
type: boolean
|
||||
description:
|
||||
Device can be used as a wakeup source.
|
||||
|
||||
vcc1-supply:
|
||||
description:
|
||||
The input supply for dcdc1.
|
||||
|
||||
vcc2-supply:
|
||||
description:
|
||||
The input supply for dcdc2.
|
||||
|
||||
vcc3-supply:
|
||||
description:
|
||||
The input supply for dcdc3.
|
||||
|
||||
vcc4-supply:
|
||||
description:
|
||||
The input supply for dcdc4.
|
||||
|
||||
vcc5-supply:
|
||||
description:
|
||||
The input supply for ldo1.
|
||||
|
||||
vcc6-supply:
|
||||
description:
|
||||
The input supply for ldo2.
|
||||
|
||||
vcc7-supply:
|
||||
description:
|
||||
The input supply for switch.
|
||||
|
||||
regulators:
|
||||
type: object
|
||||
patternProperties:
|
||||
"^(dcdc[1-4]|ldo[1-2]|switch)$":
|
||||
type: object
|
||||
$ref: /schemas/regulator/regulator.yaml#
|
||||
unevaluatedProperties: false
|
||||
additionalProperties: false
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
- interrupts
|
||||
|
||||
additionalProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
#include <dt-bindings/pinctrl/rockchip.h>
|
||||
#include <dt-bindings/interrupt-controller/irq.h>
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
|
||||
i2c {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
rk801: pmic@27 {
|
||||
compatible = "rockchip,rk801";
|
||||
reg = <0x27>;
|
||||
interrupt-parent = <&gpio0>;
|
||||
interrupts = <RK_PC0 IRQ_TYPE_LEVEL_LOW>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pmic_int_l>;
|
||||
system-power-controller;
|
||||
wakeup-source;
|
||||
|
||||
vcc1-supply = <&vcc_sys>;
|
||||
vcc2-supply = <&vcc_sys>;
|
||||
vcc3-supply = <&vcc_sys>;
|
||||
vcc4-supply = <&vcc_sys>;
|
||||
vcc5-supply = <&vcc3v3_sys>;
|
||||
vcc6-supply = <&vcc3v3_sys>;
|
||||
vcc7-supply = <&vcc3v3_sys>;
|
||||
|
||||
regulators {
|
||||
vdd_cpu: dcdc1 {
|
||||
regulator-name = "vdd_cpu";
|
||||
regulator-min-microvolt = <500000>;
|
||||
regulator-max-microvolt = <1500000>;
|
||||
regulator-initial-mode = <0x1>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
regulator-state-mem {
|
||||
regulator-mode = <0x2>;
|
||||
regulator-off-in-suspend;
|
||||
regulator-suspend-microvolt = <950000>;
|
||||
};
|
||||
};
|
||||
|
||||
vcc3v3_sys: dcdc2 {
|
||||
regulator-name = "vcc3v3_sys";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-initial-mode = <0x1>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
regulator-state-mem {
|
||||
regulator-mode = <0x2>;
|
||||
regulator-on-in-suspend;
|
||||
regulator-suspend-microvolt = <3300000>;
|
||||
};
|
||||
};
|
||||
|
||||
vcc_ddr: dcdc3 {
|
||||
regulator-name = "vcc_ddr";
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
regulator-state-mem {
|
||||
regulator-mode = <0x2>;
|
||||
regulator-on-in-suspend;
|
||||
};
|
||||
};
|
||||
|
||||
vdd_logic: dcdc4 {
|
||||
regulator-name = "vdd_logic";
|
||||
regulator-min-microvolt = <500000>;
|
||||
regulator-max-microvolt = <1500000>;
|
||||
regulator-initial-mode = <0x1>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
regulator-state-mem {
|
||||
regulator-mode = <0x2>;
|
||||
regulator-off-in-suspend;
|
||||
regulator-suspend-microvolt = <900000>;
|
||||
};
|
||||
};
|
||||
|
||||
vdd0v9_sys: ldo1 {
|
||||
regulator-name = "vdd0v9_sys";
|
||||
regulator-min-microvolt = <900000>;
|
||||
regulator-max-microvolt = <900000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
regulator-suspend-microvolt = <900000>;
|
||||
};
|
||||
};
|
||||
|
||||
vcc_1v8: ldo2 {
|
||||
regulator-name = "vcc_1v8";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
regulator-suspend-microvolt = <1800000>;
|
||||
};
|
||||
};
|
||||
|
||||
vcc_3v3: switch {
|
||||
regulator-name = "vcc_3v3";
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
regulator-suspend-microvolt = <3300000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -102,6 +102,8 @@ select:
|
||||
- mstar,msc313-pmsleep
|
||||
- nuvoton,ma35d1-sys
|
||||
- nuvoton,wpcm450-shm
|
||||
- nxp,s32g2-gpr
|
||||
- nxp,s32g3-gpr
|
||||
- qcom,apq8064-mmss-sfpb
|
||||
- qcom,apq8064-sps-sic
|
||||
- rockchip,px30-qos
|
||||
@@ -195,6 +197,7 @@ properties:
|
||||
- mediatek,mt2701-pctl-a-syscfg
|
||||
- mediatek,mt2712-pctl-a-syscfg
|
||||
- mediatek,mt6397-pctl-pmic-syscfg
|
||||
- mediatek,mt7981-topmisc
|
||||
- mediatek,mt7988-topmisc
|
||||
- mediatek,mt8135-pctl-a-syscfg
|
||||
- mediatek,mt8135-pctl-b-syscfg
|
||||
@@ -212,6 +215,8 @@ properties:
|
||||
- mstar,msc313-pmsleep
|
||||
- nuvoton,ma35d1-sys
|
||||
- nuvoton,wpcm450-shm
|
||||
- nxp,s32g2-gpr
|
||||
- nxp,s32g3-gpr
|
||||
- qcom,apq8064-mmss-sfpb
|
||||
- qcom,apq8064-sps-sic
|
||||
- rockchip,px30-qos
|
||||
|
||||
+15
-3
@@ -407,6 +407,17 @@ config MFD_CS47L92
|
||||
help
|
||||
Support for Cirrus Logic CS42L92, CS47L92 and CS47L93 Smart Codecs
|
||||
|
||||
config MFD_TN48M_CPLD
|
||||
tristate "Delta Networks TN48M switch CPLD driver"
|
||||
depends on I2C
|
||||
depends on ARCH_MVEBU || COMPILE_TEST
|
||||
select MFD_SIMPLE_MFD_I2C
|
||||
help
|
||||
Select this option to enable support for Delta Networks TN48M switch
|
||||
CPLD. It consists of reset and GPIO drivers. CPLD provides GPIOS-s
|
||||
for the SFP slots as well as power supply related information.
|
||||
SFP support depends on the GPIO driver being selected.
|
||||
|
||||
config PMIC_DA903X
|
||||
bool "Dialog Semiconductor DA9030/DA9034 PMIC Support"
|
||||
depends on I2C=y
|
||||
@@ -1276,6 +1287,7 @@ config MFD_SPACEMIT_P1
|
||||
depends on ARCH_SPACEMIT || COMPILE_TEST
|
||||
depends on I2C
|
||||
select MFD_SIMPLE_MFD_I2C
|
||||
default m if ARCH_SPACEMIT
|
||||
help
|
||||
This option supports the I2C-based SpacemiT P1 PMIC, which
|
||||
contains regulators, a power switch, GPIOs, an RTC, and more.
|
||||
@@ -1371,15 +1383,15 @@ config MFD_RK8XX
|
||||
select MFD_CORE
|
||||
|
||||
config MFD_RK8XX_I2C
|
||||
tristate "Rockchip RK805/RK808/RK809/RK816/RK817/RK818 Power Management Chip"
|
||||
tristate "Rockchip RK8xx Power Management Chips"
|
||||
depends on I2C && OF
|
||||
select MFD_CORE
|
||||
select REGMAP_I2C
|
||||
select REGMAP_IRQ
|
||||
select MFD_RK8XX
|
||||
help
|
||||
If you say yes here you get support for the RK805, RK808, RK809,
|
||||
RK816, RK817 and RK818 Power Management chips.
|
||||
If you say yes here you get support for the RK801, RK805, RK808,
|
||||
RK809, RK816, RK817 and RK818 Power Management chips.
|
||||
This driver provides common support for accessing the device
|
||||
through I2C interface. The device supports multiple sub-devices
|
||||
including interrupts, RTC, LDO & DCDC regulators, and onkey.
|
||||
|
||||
@@ -1100,7 +1100,7 @@ int arizona_dev_init(struct arizona *arizona)
|
||||
} else if (val & 0x01) {
|
||||
ret = wm5102_clear_write_sequencer(arizona);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto err_reset;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -140,6 +140,7 @@ static const struct of_device_id atmel_hlcdc_match[] = {
|
||||
{ .compatible = "atmel,sama5d4-hlcdc" },
|
||||
{ .compatible = "microchip,sam9x60-hlcdc" },
|
||||
{ .compatible = "microchip,sam9x75-xlcdc" },
|
||||
{ .compatible = "microchip,sama7d65-xlcdc" },
|
||||
{ /* sentinel */ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, atmel_hlcdc_match);
|
||||
|
||||
@@ -229,6 +229,8 @@ static const struct regmap_range axp717_writeable_ranges[] = {
|
||||
regmap_reg_range(AXP717_DCDC_OUTPUT_CONTROL, AXP717_CPUSLDO_CONTROL),
|
||||
regmap_reg_range(AXP717_ADC_CH_EN_CONTROL, AXP717_ADC_CH_EN_CONTROL),
|
||||
regmap_reg_range(AXP717_ADC_DATA_SEL, AXP717_ADC_DATA_SEL),
|
||||
regmap_reg_range(AXP717_TYPEC_CC_AA_EN, AXP717_TYPEC_CC_AA_EN),
|
||||
regmap_reg_range(AXP717_TYPEC_CC_MODE_CONTROL, AXP717_TYPEC_CC_MODE_CONTROL),
|
||||
};
|
||||
|
||||
static const struct regmap_range axp717_volatile_ranges[] = {
|
||||
@@ -237,6 +239,7 @@ static const struct regmap_range axp717_volatile_ranges[] = {
|
||||
regmap_reg_range(AXP717_BATT_PERCENT_DATA, AXP717_BATT_PERCENT_DATA),
|
||||
regmap_reg_range(AXP717_BATT_V_H, AXP717_BATT_CHRG_I_L),
|
||||
regmap_reg_range(AXP717_ADC_DATA_H, AXP717_ADC_DATA_L),
|
||||
regmap_reg_range(AXP717_TYPEC_CC_STATUS, AXP717_TYPEC_CC_STATUS),
|
||||
};
|
||||
|
||||
static const struct regmap_access_table axp717_writeable_table = {
|
||||
@@ -458,7 +461,7 @@ static const struct regmap_config axp717_regmap_config = {
|
||||
.val_bits = 8,
|
||||
.wr_table = &axp717_writeable_table,
|
||||
.volatile_table = &axp717_volatile_table,
|
||||
.max_register = AXP717_ADC_DATA_L,
|
||||
.max_register = AXP717_TYPEC_CC_STATUS,
|
||||
.cache_type = REGCACHE_MAPLE,
|
||||
};
|
||||
|
||||
|
||||
@@ -237,6 +237,7 @@ static struct mfd_cell cgbc_devs[] = {
|
||||
{ .name = "cgbc-i2c", .id = 1 },
|
||||
{ .name = "cgbc-i2c", .id = 2 },
|
||||
{ .name = "cgbc-hwmon" },
|
||||
{ .name = "cgbc-backlight" },
|
||||
};
|
||||
|
||||
static int cgbc_map(struct cgbc_device_data *cgbc)
|
||||
|
||||
@@ -37,7 +37,7 @@ static int da9052_spi_probe(struct spi_device *spi)
|
||||
spi_set_drvdata(spi, da9052);
|
||||
|
||||
config = da9052_regmap_config;
|
||||
config.write_flag_mask = 1;
|
||||
config.read_flag_mask = 1;
|
||||
config.reg_bits = 7;
|
||||
config.pad_bits = 1;
|
||||
config.val_bits = 8;
|
||||
|
||||
@@ -437,6 +437,19 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
|
||||
{ PCI_VDEVICE(INTEL, 0x5ac4), (kernel_ulong_t)&bxt_spi_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x5ac6), (kernel_ulong_t)&bxt_spi_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x5aee), (kernel_ulong_t)&bxt_uart_info },
|
||||
/* NVL-S */
|
||||
{ PCI_VDEVICE(INTEL, 0x6e28), (kernel_ulong_t)&bxt_uart_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e29), (kernel_ulong_t)&bxt_uart_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e2a), (kernel_ulong_t)&tgl_spi_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e2b), (kernel_ulong_t)&tgl_spi_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e4c), (kernel_ulong_t)&ehl_i2c_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e4d), (kernel_ulong_t)&ehl_i2c_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e4e), (kernel_ulong_t)&ehl_i2c_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e4f), (kernel_ulong_t)&ehl_i2c_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e5c), (kernel_ulong_t)&bxt_uart_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e5e), (kernel_ulong_t)&tgl_spi_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e7a), (kernel_ulong_t)&ehl_i2c_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x6e7b), (kernel_ulong_t)&ehl_i2c_info },
|
||||
/* ARL-H */
|
||||
{ PCI_VDEVICE(INTEL, 0x7725), (kernel_ulong_t)&bxt_uart_info },
|
||||
{ PCI_VDEVICE(INTEL, 0x7726), (kernel_ulong_t)&bxt_uart_info },
|
||||
|
||||
+10
-28
@@ -464,53 +464,36 @@ static int ls2k_bmc_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
||||
resource_size_t base;
|
||||
int ret;
|
||||
|
||||
ret = pci_enable_device(dev);
|
||||
ret = pcim_enable_device(dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ddata = devm_kzalloc(&dev->dev, sizeof(*ddata), GFP_KERNEL);
|
||||
if (!ddata) {
|
||||
ret = -ENOMEM;
|
||||
goto disable_pci;
|
||||
}
|
||||
if (!ddata)
|
||||
return -ENOMEM;
|
||||
|
||||
ddata->dev = &dev->dev;
|
||||
|
||||
ret = ls2k_bmc_init(ddata);
|
||||
if (ret)
|
||||
goto disable_pci;
|
||||
return ret;
|
||||
|
||||
ret = ls2k_bmc_parse_mode(dev, &pd);
|
||||
if (ret)
|
||||
goto disable_pci;
|
||||
return ret;
|
||||
|
||||
ls2k_bmc_cells[LS2K_BMC_DISPLAY].platform_data = &pd;
|
||||
ls2k_bmc_cells[LS2K_BMC_DISPLAY].pdata_size = sizeof(pd);
|
||||
base = dev->resource[0].start + LS2K_DISPLAY_RES_START;
|
||||
base = pci_resource_start(dev, 0) + LS2K_DISPLAY_RES_START;
|
||||
|
||||
/* Remove conflicting efifb device */
|
||||
ret = aperture_remove_conflicting_devices(base, SZ_4M, "simple-framebuffer");
|
||||
if (ret) {
|
||||
dev_err(&dev->dev, "Failed to removed firmware framebuffers: %d\n", ret);
|
||||
goto disable_pci;
|
||||
}
|
||||
|
||||
ret = devm_mfd_add_devices(&dev->dev, PLATFORM_DEVID_AUTO,
|
||||
ls2k_bmc_cells, ARRAY_SIZE(ls2k_bmc_cells),
|
||||
&dev->resource[0], 0, NULL);
|
||||
if (ret)
|
||||
goto disable_pci;
|
||||
return dev_err_probe(&dev->dev, ret, "Failed to removed firmware framebuffers\n");
|
||||
|
||||
return 0;
|
||||
|
||||
disable_pci:
|
||||
pci_disable_device(dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void ls2k_bmc_remove(struct pci_dev *dev)
|
||||
{
|
||||
pci_disable_device(dev);
|
||||
return devm_mfd_add_devices(&dev->dev, PLATFORM_DEVID_AUTO,
|
||||
ls2k_bmc_cells, ARRAY_SIZE(ls2k_bmc_cells),
|
||||
pci_resource_n(dev, 0), 0, NULL);
|
||||
}
|
||||
|
||||
static struct pci_device_id ls2k_bmc_devices[] = {
|
||||
@@ -523,7 +506,6 @@ static struct pci_driver ls2k_bmc_driver = {
|
||||
.name = "ls2k-bmc",
|
||||
.id_table = ls2k_bmc_devices,
|
||||
.probe = ls2k_bmc_probe,
|
||||
.remove = ls2k_bmc_remove,
|
||||
};
|
||||
module_pci_driver(ls2k_bmc_driver);
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user