Commit 2c50f892 authored by Wolfram Sang's avatar Wolfram Sang

Merge tag 'i2c-host-fixes-6.10-rc5' of...

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.
parents 20738cb9 5a724772
...@@ -77,7 +77,7 @@ required: ...@@ -77,7 +77,7 @@ required:
- clocks - clocks
allOf: allOf:
- $ref: i2c-controller.yaml - $ref: /schemas/i2c/i2c-controller.yaml#
- if: - if:
properties: properties:
compatible: compatible:
......
...@@ -21,7 +21,7 @@ description: | ...@@ -21,7 +21,7 @@ description: |
google,cros-ec-spi or google,cros-ec-i2c. google,cros-ec-spi or google,cros-ec-i2c.
allOf: allOf:
- $ref: i2c-controller.yaml# - $ref: /schemas/i2c/i2c-controller.yaml#
properties: properties:
compatible: compatible:
......
...@@ -431,8 +431,8 @@ static int ocores_init(struct device *dev, struct ocores_i2c *i2c) ...@@ -431,8 +431,8 @@ static int ocores_init(struct device *dev, struct ocores_i2c *i2c)
oc_setreg(i2c, OCI2C_PREHIGH, prescale >> 8); oc_setreg(i2c, OCI2C_PREHIGH, prescale >> 8);
/* Init the device */ /* Init the device */
oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_IACK);
oc_setreg(i2c, OCI2C_CONTROL, ctrl | OCI2C_CTRL_EN); oc_setreg(i2c, OCI2C_CONTROL, ctrl | OCI2C_CTRL_EN);
oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_IACK);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment