forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'i2c/for-5.3' of git://git.kernel.org/pub/scm/linux/kern…
…el/git/wsa/linux Pull i2c updates from Wolfram Sang: "New stuff from the I2C world: - in the core, getting irqs from ACPI is now similar to OF - new driver for MediaTek MT7621/7628/7688 SoCs - bcm2835, i801, and tegra drivers got some more attention - GPIO API cleanups - cleanups in the core headers - lots of usual driver updates" * 'i2c/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (74 commits) i2c: mt7621: Fix platform_no_drv_owner.cocci warnings i2c: cpm: remove casting dma_alloc dt-bindings: i2c: sun6i-p2wi: Fix the binding example dt-bindings: i2c: mv64xxx: Fix the example compatible i2c: i801: Documentation update i2c: i801: Add support for Intel Tiger Lake i2c: i801: Fix PCI ID sorting dt-bindings: i2c-stm32: document optional dmas i2c: i2c-stm32f7: Add I2C_SMBUS_I2C_BLOCK_DATA support i2c: core: Tidy up handling of init_irq i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq i2c: core: Move ACPI IRQ handling to probe time i2c: acpi: Factor out getting the IRQ from ACPI i2c: acpi: Use available IRQ helper functions i2c: core: Allow whole core to use i2c_dev_irq_from_resources eeprom: at24: modify a comment referring to platform data dt-bindings: i2c: omap: Add new compatible for J721E SoCs dt-bindings: i2c: mv64xxx: Add YAML schemas dt-bindings: i2c: sun6i-p2wi: Add YAML schemas i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver ...
- Loading branch information
Showing
51 changed files
with
1,605 additions
and
644 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
What: /sys/devices/platform/<i2c-demux-name>/available_masters | ||
Date: January 2016 | ||
KernelVersion: 4.6 | ||
Contact: Wolfram Sang <wsa@the-dreams.de> | ||
Contact: Wolfram Sang <wsa[email protected]> | ||
Description: | ||
Reading the file will give you a list of masters which can be | ||
selected for a demultiplexed bus. The format is | ||
|
@@ -12,7 +12,7 @@ Description: | |
What: /sys/devices/platform/<i2c-demux-name>/current_master | ||
Date: January 2016 | ||
KernelVersion: 4.6 | ||
Contact: Wolfram Sang <wsa@the-dreams.de> | ||
Contact: Wolfram Sang <wsa[email protected]> | ||
Description: | ||
This file selects/shows the active I2C master for a demultiplexed | ||
bus. It uses the <index> value from the file 'available_masters'. |
65 changes: 65 additions & 0 deletions
65
Documentation/devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
# SPDX-License-Identifier: GPL-2.0 | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/i2c/allwinner,sun6i-a31-p2wi.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Allwinner A31 P2WI (Push/Pull 2 Wires Interface) Device Tree Bindings | ||
|
||
maintainers: | ||
- Chen-Yu Tsai <[email protected]> | ||
- Maxime Ripard <[email protected]> | ||
|
||
allOf: | ||
- $ref: /schemas/i2c/i2c-controller.yaml# | ||
|
||
properties: | ||
compatible: | ||
const: allwinner,sun6i-a31-p2wi | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
resets: | ||
maxItems: 1 | ||
|
||
clock-frequency: | ||
minimum: 1 | ||
maximum: 6000000 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
- resets | ||
|
||
# FIXME: We should set it, but it would report all the generic | ||
# properties as additional properties. | ||
# additionalProperties: false | ||
|
||
examples: | ||
- | | ||
i2c@1f03400 { | ||
compatible = "allwinner,sun6i-a31-p2wi"; | ||
reg = <0x01f03400 0x400>; | ||
interrupts = <0 39 4>; | ||
clocks = <&apb0_gates 3>; | ||
clock-frequency = <100000>; | ||
resets = <&apb0_rst 3>; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
axp221: pmic@68 { | ||
compatible = "x-powers,axp221"; | ||
reg = <0x68>; | ||
}; | ||
}; | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
MediaTek MT7621/MT7628 I2C master controller | ||
|
||
Required properties: | ||
|
||
- compatible: Should be one of the following: | ||
- "mediatek,mt7621-i2c": for MT7621/MT7628/MT7688 platforms | ||
- #address-cells: should be 1. | ||
- #size-cells: should be 0. | ||
- reg: Address and length of the register set for the device | ||
- resets: phandle to the reset controller asserting this device in | ||
reset | ||
See ../reset/reset.txt for details. | ||
|
||
Optional properties : | ||
|
||
Example: | ||
|
||
i2c: i2c@900 { | ||
compatible = "mediatek,mt7621-i2c"; | ||
reg = <0x900 0x100>; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
resets = <&rstctrl 16>; | ||
reset-names = "i2c"; | ||
}; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
124 changes: 124 additions & 0 deletions
124
Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,124 @@ | ||
# SPDX-License-Identifier: GPL-2.0 | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/i2c/marvell,mv64xxx-i2c.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Marvell MV64XXX I2C Controller Device Tree Bindings | ||
|
||
maintainers: | ||
- Gregory CLEMENT <[email protected]> | ||
|
||
properties: | ||
compatible: | ||
oneOf: | ||
- const: allwinner,sun4i-a10-i2c | ||
- items: | ||
- const: allwinner,sun7i-a20-i2c | ||
- const: allwinner,sun4i-a10-i2c | ||
- const: allwinner,sun6i-a31-i2c | ||
- items: | ||
- const: allwinner,sun8i-a23-i2c | ||
- const: allwinner,sun6i-a31-i2c | ||
- items: | ||
- const: allwinner,sun8i-a83t-i2c | ||
- const: allwinner,sun6i-a31-i2c | ||
- items: | ||
- const: allwinner,sun50i-a64-i2c | ||
- const: allwinner,sun6i-a31-i2c | ||
|
||
- const: marvell,mv64xxx-i2c | ||
- const: marvell,mv78230-i2c | ||
- const: marvell,mv78230-a0-i2c | ||
|
||
description: | ||
Only use "marvell,mv78230-a0-i2c" for a very rare, initial | ||
version of the SoC which had broken offload support. Linux | ||
auto-detects this and sets it appropriately. | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
clocks: | ||
minItems: 1 | ||
maxItems: 2 | ||
items: | ||
- description: Reference clock for the I2C bus | ||
- description: Bus clock (Only for Armada 7K/8K) | ||
|
||
clock-names: | ||
minItems: 1 | ||
maxItems: 2 | ||
items: | ||
- const: core | ||
- const: reg | ||
description: | ||
Mandatory if two clocks are used (only for Armada 7k and 8k). | ||
|
||
resets: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
|
||
allOf: | ||
- $ref: /schemas/i2c/i2c-controller.yaml# | ||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
enum: | ||
- allwinner,sun4i-a10-i2c | ||
- allwinner,sun6i-a31-i2c | ||
|
||
then: | ||
required: | ||
- clocks | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
const: allwinner,sun6i-a31-i2c | ||
|
||
then: | ||
required: | ||
- resets | ||
|
||
# FIXME: We should set it, but it would report all the generic | ||
# properties as additional properties. | ||
# additionalProperties: false | ||
|
||
examples: | ||
- | | ||
i2c@11000 { | ||
compatible = "marvell,mv64xxx-i2c"; | ||
reg = <0x11000 0x20>; | ||
interrupts = <29>; | ||
clock-frequency = <100000>; | ||
}; | ||
- | | ||
i2c@11000 { | ||
compatible = "marvell,mv78230-i2c"; | ||
reg = <0x11000 0x100>; | ||
interrupts = <29>; | ||
clock-frequency = <100000>; | ||
}; | ||
- | | ||
i2c@701000 { | ||
compatible = "marvell,mv78230-i2c"; | ||
reg = <0x701000 0x20>; | ||
interrupts = <29>; | ||
clock-frequency = <100000>; | ||
clock-names = "core", "reg"; | ||
clocks = <&core_clock>, <®_clock>; | ||
}; | ||
... |
Oops, something went wrong.