Skip to content

Commit 2c50f89

Browse files
author
Wolfram Sang
committed
Merge tag 'i2c-host-fixes-6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
This pull request fixes the paths of the dt-schema to their complete locations for the ChromeOS EC tunnel driver and the Atmel at91sam drivers. Additionally, the OpenCores driver receives a fix for an issue that dates back to version 2.6.18. Specifically, the interrupts need to be acknowledged (clearing all pending interrupts) after enabling the core.
2 parents 20738cb + 5a72477 commit 2c50f89

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ required:
7777
- clocks
7878

7979
allOf:
80-
- $ref: i2c-controller.yaml
80+
- $ref: /schemas/i2c/i2c-controller.yaml#
8181
- if:
8282
properties:
8383
compatible:

Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ description: |
2121
google,cros-ec-spi or google,cros-ec-i2c.
2222
2323
allOf:
24-
- $ref: i2c-controller.yaml#
24+
- $ref: /schemas/i2c/i2c-controller.yaml#
2525

2626
properties:
2727
compatible:

drivers/i2c/busses/i2c-ocores.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,8 @@ static int ocores_init(struct device *dev, struct ocores_i2c *i2c)
431431
oc_setreg(i2c, OCI2C_PREHIGH, prescale >> 8);
432432

433433
/* Init the device */
434-
oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_IACK);
435434
oc_setreg(i2c, OCI2C_CONTROL, ctrl | OCI2C_CTRL_EN);
435+
oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_IACK);
436436

437437
return 0;
438438
}

0 commit comments

Comments
 (0)