Skip to content

Commit 765b233

Browse files
committed
Merge tag 'i2c-for-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: - bcm, pxa, rcar: fix void-pointer-to-enum-cast warning - new hardware IDs / DT bindings for - Intel Nova Lake-S - Mobileye - Qualcomm SM8750 * tag 'i2c-for-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: dt-bindings: i2c: qcom-cci: Document SM8750 compatible i2c: i801: Add support for Intel Nova Lake-S dt-bindings: i2c: dw: Add Mobileye I2C controllers i2c: rcar: Fix Wvoid-pointer-to-enum-cast warning i2c: pxa: Fix Wvoid-pointer-to-enum-cast warning i2c: bcm-iproc: Fix Wvoid-pointer-to-enum-cast warning
2 parents 44087d3 + 880977f commit 765b233

8 files changed

Lines changed: 17 additions & 4 deletions

File tree

Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ properties:
3838
- qcom,sm8450-cci
3939
- qcom,sm8550-cci
4040
- qcom,sm8650-cci
41+
- qcom,sm8750-cci
4142
- qcom,x1e80100-cci
4243
- const: qcom,msm8996-cci # CCI v2
4344

@@ -132,6 +133,7 @@ allOf:
132133
enum:
133134
- qcom,kaanapali-cci
134135
- qcom,qcm2290-cci
136+
- qcom,sm8750-cci
135137
then:
136138
properties:
137139
clocks:

Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,15 @@ properties:
3434
- const: snps,designware-i2c
3535
- description: Baikal-T1 SoC System I2C controller
3636
const: baikal,bt1-sys-i2c
37+
- description: Mobileye EyeQ DesignWare I2C controller
38+
items:
39+
- enum:
40+
- mobileye,eyeq7h-i2c
41+
- const: mobileye,eyeq6lplus-i2c
42+
- const: snps,designware-i2c
3743
- items:
3844
- enum:
45+
- mobileye,eyeq6lplus-i2c
3946
- mscc,ocelot-i2c
4047
- sophgo,sg2044-i2c
4148
- thead,th1520-i2c

Documentation/i2c/busses/i2c-i801.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Supported adapters:
5252
* Intel Panther Lake (SOC)
5353
* Intel Wildcat Lake (SOC)
5454
* Intel Diamond Rapids (SOC)
55+
* Intel Nova Lake (PCH)
5556

5657
Datasheets: Publicly available at the Intel website
5758

drivers/i2c/busses/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ config I2C_I801
167167
Panther Lake (SOC)
168168
Wildcat Lake (SOC)
169169
Diamond Rapids (SOC)
170+
Nova Lake (PCH)
170171

171172
This driver can also be built as a module. If so, the module
172173
will be called i2c-i801.

drivers/i2c/busses/i2c-bcm-iproc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,8 +1098,7 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev)
10981098

10991099
platform_set_drvdata(pdev, iproc_i2c);
11001100
iproc_i2c->device = &pdev->dev;
1101-
iproc_i2c->type =
1102-
(enum bcm_iproc_i2c_type)of_device_get_match_data(&pdev->dev);
1101+
iproc_i2c->type = (kernel_ulong_t)of_device_get_match_data(&pdev->dev);
11031102
init_completion(&iproc_i2c->done);
11041103

11051104
iproc_i2c->base = devm_platform_ioremap_resource(pdev, 0);

drivers/i2c/busses/i2c-i801.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
* Panther Lake-P (SOC) 0xe422 32 hard yes yes yes
8686
* Wildcat Lake-U (SOC) 0x4d22 32 hard yes yes yes
8787
* Diamond Rapids (SOC) 0x5827 32 hard yes yes yes
88+
* Nova Lake-S (PCH) 0x6e23 32 hard yes yes yes
8889
*
8990
* Features supported by this driver:
9091
* Software PEC no
@@ -245,6 +246,7 @@
245246
#define PCI_DEVICE_ID_INTEL_BIRCH_STREAM_SMBUS 0x5796
246247
#define PCI_DEVICE_ID_INTEL_DIAMOND_RAPIDS_SMBUS 0x5827
247248
#define PCI_DEVICE_ID_INTEL_BROXTON_SMBUS 0x5ad4
249+
#define PCI_DEVICE_ID_INTEL_NOVA_LAKE_S_SMBUS 0x6e23
248250
#define PCI_DEVICE_ID_INTEL_ARROW_LAKE_H_SMBUS 0x7722
249251
#define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_S_SMBUS 0x7a23
250252
#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS 0x7aa3
@@ -1061,6 +1063,7 @@ static const struct pci_device_id i801_ids[] = {
10611063
{ PCI_DEVICE_DATA(INTEL, PANTHER_LAKE_H_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
10621064
{ PCI_DEVICE_DATA(INTEL, PANTHER_LAKE_P_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
10631065
{ PCI_DEVICE_DATA(INTEL, WILDCAT_LAKE_U_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
1066+
{ PCI_DEVICE_DATA(INTEL, NOVA_LAKE_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
10641067
{ 0, }
10651068
};
10661069

drivers/i2c/busses/i2c-pxa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c,
12661266
i2c->use_pio = of_property_read_bool(np, "mrvl,i2c-polling");
12671267
i2c->fast_mode = of_property_read_bool(np, "mrvl,i2c-fast-mode");
12681268

1269-
*i2c_types = (enum pxa_i2c_types)device_get_match_data(&pdev->dev);
1269+
*i2c_types = (kernel_ulong_t)device_get_match_data(&pdev->dev);
12701270

12711271
return 0;
12721272
}

drivers/i2c/busses/i2c-rcar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@ static int rcar_i2c_probe(struct platform_device *pdev)
11411141
if (IS_ERR(priv->io))
11421142
return PTR_ERR(priv->io);
11431143

1144-
priv->devtype = (enum rcar_i2c_type)of_device_get_match_data(dev);
1144+
priv->devtype = (kernel_ulong_t)of_device_get_match_data(dev);
11451145
init_waitqueue_head(&priv->wait);
11461146

11471147
adap = &priv->adap;

0 commit comments

Comments
 (0)