redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

I3C for 5.12 

Subsystem:
  - Handle drivers without probe or remove callback
  - Remove callback now returns void
  - DT documentation is now in yaml
 
 New driver:
  - Silvaco I3C master
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEycoQi/giopmpPgB12wIijOdRNOUFAmAy+ycACgkQ2wIijOdR
 NOUDRg/+KPaE8MQMXh/YrnN4VXX+QZe8Yt5WynVThG8GGwDC0PrPtMcepwkd9GGA
 3EsBtuNVE7uvcUX59rmi2VrMlc6e3fRZ6g2Ub2vH5NXDZIeEXjbmq+vk6PlXNgKf
 k7LvVaQLkBCqsBoV1kraR7lPyi7rf2ZFFOYJuObj8yxADhmkpbRFQCbkWkeYGpMn
 2DN3cN2+jybmNBCh5SDDneJn/Bdr0/mBp0bLffOT+uAQ4bu6HbDOrlyZ9gY8rx8y
 TqbOT1JDhTCW0EC6IPw4SSkKXcew20XRmYSax4bx233cTCCjzsXG7vNHtv0KBide
 JlGvKEnE+WDfvPaSoxUjxtmwWfEki/qBzAZ3Mrs8/G9NRWRvE9qDU/x71hduog0g
 pqcRb0plreR7j3XusFaFu83HJtTfwHKVzWb12ExuNfzS4T/uZKs8vM0MFcedIRur
 wJg7+Qv+NGzGegELOaRkquc56x4IjXx+vYj3tbvnOrFdKgAuRU4YBn220QfYwI6d
 zx+6msuzIT/XroH6aq92Ds50hVLMQpNosuJPNsZto57hBShJgA6cmGMj79L9GldM
 CbdOu8ZBgHi4kpCWb9nunNqY0cctlQ0lEV6/1SYhCqRGLS7etS0IaUiWXNDge22N
 kzmeg5+RaA0AlAbzJHi+JOR6OnxxAhvZyys5nfQ4/X08R8JY9iY=
 =282r
 -----END PGP SIGNATURE-----

Merge tag 'i3c/for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux

Pull i3c update from Alexandre Belloni:
 "Subsystem:
   - Handle drivers without probe or remove callback
   - Remove callback now returns void
   - DT documentation is now in yaml

  New driver:
   - Silvaco I3C master"

* tag 'i3c/for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  i3c: master: dw: Drop redundant disec call
  MAINTAINERS: Add Silvaco I3C master
  i3c: master: svc: Add Silvaco I3C master driver
  dt-bindings: i3c: Describe Silvaco master binding
  dt-bindings: Add vendor prefix for Silvaco
  dt-bindings: i3c: mipi-hci: Include the bus binding
  dt-bindings: i3c: Convert the bus description to yaml
  i3c: Make remove callback return void
  i3c: Handle drivers without probe or remove callback
  i3c/master/mipi-i3c-hci: Specify HAS_IOMEM dependency
master
Linus Torvalds 2021-02-22 09:52:55 -08:00
parent 579f50cee1 5c34b8e7e8
commit 36c1b20d15
13 changed files with 1753 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
Documentation/devicetree/bindings/i3c/i3c.txt
View File

@ -1,140 +0,0 @@
Generic device tree bindings for I3C busses
===========================================
This document describes generic bindings that should be used to describe I3C
busses in a device tree.
Required properties
-------------------
- #address-cells - should be <3>. Read more about addresses below.
- #size-cells - should be <0>.
- compatible - name of the I3C master controller driving the I3C bus
For other required properties e.g. to describe register sets,
clocks, etc. check the binding documentation of the specific driver.
The node describing an I3C bus should be named i3c-master.
Optional properties
-------------------
These properties may not be supported by all I3C master drivers. Each I3C
master bindings should specify which of them are supported.
- i3c-scl-hz: frequency of the SCL signal used for I3C transfers.
When undefined the core sets it to 12.5MHz.
- i2c-scl-hz: frequency of the SCL signal used for I2C transfers.
When undefined, the core looks at LVR (Legacy Virtual Register)
values of I2C devices described in the device tree to determine
the maximum I2C frequency.
I2C devices
===========
Each I2C device connected to the bus should be described in a subnode. All
properties described in Documentation/devicetree/bindings/i2c/i2c.txt are
valid here, but several new properties have been added.
New constraint on existing properties:
--------------------------------------
- reg: contains 3 cells
+ first cell : still encoding the I2C address. 10 bit addressing is not
supported. Devices with 10 bit address can't be properly passed through
DEFSLVS command.
+ second cell: shall be 0
+ third cell: shall encode the I3C LVR (Legacy Virtual Register)
bit[31:8]: unused/ignored
bit[7:5]: I2C device index. Possible values
* 0: I2C device has a 50 ns spike filter
* 1: I2C device does not have a 50 ns spike filter but supports high
frequency on SCL
* 2: I2C device does not have a 50 ns spike filter and is not tolerant
to high frequencies
* 3-7: reserved
bit[4]: tell whether the device operates in FM (Fast Mode) or FM+ mode
* 0: FM+ mode
* 1: FM mode
bit[3:0]: device type
* 0-15: reserved
The I2C node unit-address should always match the first cell of the reg
property: <device-type>@<i2c-address>.
I3C devices
===========
All I3C devices are supposed to support DAA (Dynamic Address Assignment), and
are thus discoverable. So, by default, I3C devices do not have to be described
in the device tree.
This being said, one might want to attach extra resources to these devices,
and those resources may have to be described in the device tree, which in turn
means we have to describe I3C devices.
Another use case for describing an I3C device in the device tree is when this
I3C device has a static I2C address and we want to assign it a specific I3C
dynamic address before the DAA takes place (so that other devices on the bus
can't take this dynamic address).
The I3C device should be names <device-type>@<static-i2c-address>,<i3c-pid>,
where device-type is describing the type of device connected on the bus
(gpio-controller, sensor, ...).
Required properties
-------------------
- reg: contains 3 cells
+ first cell : encodes the static I2C address. Should be 0 if the device does
not have one (0 is not a valid I2C address).
+ second and third cells: should encode the ProvisionalID. The second cell
contains the manufacturer ID left-shifted by 1.
The third cell contains ORing of the part ID
left-shifted by 16, the instance ID left-shifted
by 12 and the extra information. This encoding is
following the PID definition provided by the I3C
specification.
Optional properties
-------------------
- assigned-address: dynamic address to be assigned to this device. This
property is only valid if the I3C device has a static
address (first cell of the reg property != 0).
Example:
i3c-master@d040000 {
compatible = "cdns,i3c-master";
clocks = <&coreclock>, <&i3csysclock>;
clock-names = "pclk", "sysclk";
interrupts = <3 0>;
reg = <0x0d040000 0x1000>;
#address-cells = <3>;
#size-cells = <0>;
i2c-scl-hz = <100000>;
/* I2C device. */
nunchuk: nunchuk@52 {
compatible = "nintendo,nunchuk";
reg = <0x52 0x0 0x10>;
};
/* I3C device with a static I2C address. */
thermal_sensor: sensor@68,39200144004 {
reg = <0x68 0x392 0x144004>;
assigned-address = <0xa>;
};
/*
* I3C device without a static I2C address but requiring
* resources described in the DT.
*/
sensor@0,39200154004 {
reg = <0x0 0x392 0x154004>;
clocks = <&clock_provider 0>;
};
};

179
Documentation/devicetree/bindings/i3c/i3c.yaml 100644
View File

@ -0,0 +1,179 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/i3c/i3c.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: I3C bus binding
maintainers:
- Alexandre Belloni <alexandre.belloni@bootlin.com>
- Miquel Raynal <miquel.raynal@bootlin.com>
description: |
I3C busses can be described with a node for the primary I3C controller device
and a set of child nodes for each I2C or I3C slave on the bus. Each of them
may, during the life of the bus, request mastership.
properties:
$nodename:
pattern: "^i3c-master@[0-9a-f]+$"
"#address-cells":
const: 3
description: |
Each I2C device connected to the bus should be described in a subnode.
All I3C devices are supposed to support DAA (Dynamic Address Assignment),
and are thus discoverable. So, by default, I3C devices do not have to be
described in the device tree. This being said, one might want to attach
extra resources to these devices, and those resources may have to be
described in the device tree, which in turn means we have to describe
I3C devices.
Another use case for describing an I3C device in the device tree is when
this I3C device has a static I2C address and we want to assign it a
specific I3C dynamic address before the DAA takes place (so that other
devices on the bus can't take this dynamic address).
"#size-cells":
const: 0
i3c-scl-hz:
description: |
Frequency of the SCL signal used for I3C transfers. When undefined, the
default value should be 12.5MHz.
May not be supported by all controllers.
i2c-scl-hz:
description: |
Frequency of the SCL signal used for I2C transfers. When undefined, the
default should be to look at LVR (Legacy Virtual Register) values of
I2C devices described in the device tree to determine the maximum I2C
frequency.
May not be supported by all controllers.
required:
- "#address-cells"
- "#size-cells"
patternProperties:
"@[0-9a-f]+$":
type: object
description: |
I2C child, should be named: <device-type>@<i2c-address>
All properties described in Documentation/devicetree/bindings/i2c/i2c.txt
are valid here, except the reg property whose content is changed.
properties:
compatible:
description:
Compatible of the I2C device.
reg:
items:
- items:
- description: |
I2C address. 10 bit addressing is not supported. Devices with
10-bit address can't be properly passed through DEFSLVS
command.
minimum: 0
maximum: 0x7f
- const: 0
- description: |
Shall encode the I3C LVR (Legacy Virtual Register):
bit[31:8]: unused/ignored
bit[7:5]: I2C device index. Possible values:
* 0: I2C device has a 50 ns spike filter
* 1: I2C device does not have a 50 ns spike filter but
supports high frequency on SCL
* 2: I2C device does not have a 50 ns spike filter and is
not tolerant to high frequencies
* 3-7: reserved
bit[4]: tell whether the device operates in FM (Fast Mode)
or FM+ mode:
* 0: FM+ mode
* 1: FM mode
bit[3:0]: device type
* 0-15: reserved
required:
- compatible
- reg
"@[0-9a-f]+,[0-9a-f]+$":
type: object
description: |
I3C child, should be named: <device-type>@<static-i2c-address>,<i3c-pid>
properties:
reg:
items:
- items:
- description: |
Encodes the static I2C address. Should be 0 if the device does
not have one (0 is not a valid I2C address).
minimum: 0
maximum: 0x7f
- description: |
First half of the Provisional ID (following the PID
definition provided by the I3C specification).
Contains the manufacturer ID left-shifted by 1.
- description: |
Second half of the Provisional ID (following the PID
definition provided by the I3C specification).
Contains the ORing of the part ID left-shifted by 16,
the instance ID left-shifted by 12 and extra information.
assigned-address:
$ref: /schemas/types.yaml#/definitions/uint32
minimum: 0x1
maximum: 0xff
description: |
Dynamic address to be assigned to this device. This property is only
valid if the I3C device has a static address (first cell of the reg
property != 0).
required:
- reg
additionalProperties: true
examples:
- |
i3c-master@d040000 {
compatible = "cdns,i3c-master";
clocks = <&coreclock>, <&i3csysclock>;
clock-names = "pclk", "sysclk";
interrupts = <3 0>;
reg = <0x0d040000 0x1000>;
#address-cells = <3>;
#size-cells = <0>;
i2c-scl-hz = <100000>;
/* I2C device. */
nunchuk: nunchuk@52 {
compatible = "nintendo,nunchuk";
reg = <0x52 0x0 0x10>;
};
/* I3C device with a static I2C address. */
thermal_sensor: sensor@68,39200144004 {
reg = <0x68 0x392 0x144004>;
assigned-address = <0xa>;
};
/*
* I3C device without a static I2C address but requiring
* resources described in the DT.
*/
sensor@0,39200154004 {
reg = <0x0 0x392 0x154004>;
clocks = <&clock_provider 0>;
};
};

9
Documentation/devicetree/bindings/i3c/mipi-i3c-hci.yaml
View File

@ -9,6 +9,9 @@ title: MIPI I3C HCI Device Tree Bindings
maintainers:
- Nicolas Pitre <npitre@baylibre.com>
allOf:
- $ref: /schemas/i3c/i3c.yaml#
description: |
MIPI I3C Host Controller Interface
@ -36,12 +39,14 @@ required:
- reg
- interrupts
additionalProperties: false
unevaluatedProperties: false
examples:
- |
i3c@a0000000 {
i3c-master@a0000000 {
compatible = "mipi-i3c-hci";
reg = <0xa0000000 0x2000>;
interrupts = <89>;
#address-cells = <3>;
#size-cells = <0>;
};

60
Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml 100644
View File

@ -0,0 +1,60 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/i3c/silvaco,i3c-master.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Silvaco I3C master
maintainers:
- Conor Culhane <conor.culhane@silvaco.com>
allOf:
- $ref: "i3c.yaml#"
properties:
compatible:
const: silvaco,i3c-master-v1
reg:
maxItems: 1
interrupts:
maxItems: 1
clocks:
items:
- description: system clock
- description: bus clock
- description: other (slower) events clock
clock-names:
items:
- const: pclk
- const: fast_clk
- const: slow_clk
resets:
maxItems: 1
required:
- compatible
- reg
- interrupts
- clock-names
- clocks
additionalProperties: true
examples:
- |
i3c-master@a0000000 {
compatible = "silvaco,i3c-master";
clocks = <&zynqmp_clk 71>, <&fclk>, <&sclk>;
clock-names = "pclk", "fast_clk", "slow_clk";
interrupt-parent = <&gic>;
interrupts = <0 89 4>;
reg = <0xa0000000 0x1000>;
#address-cells = <3>;
#size-cells = <0>;
};

2
Documentation/devicetree/bindings/vendor-prefixes.yaml
View File

@ -1085,6 +1085,8 @@ patternProperties:
description: Shenzhen Sunchip Technology Co., Ltd
"^SUNW,.*":
description: Sun Microsystems, Inc
"^silvaco,.*":
description: Silvaco, Inc.
"^swir,.*":
description: Sierra Wireless
"^syna,.*":

8
MAINTAINERS
View File

@ -16277,6 +16277,14 @@ S: Maintained
F: Documentation/fb/sm712fb.rst
F: drivers/video/fbdev/sm712*
SILVACO I3C DUAL-ROLE MASTER
M: Miquel Raynal <miquel.raynal@bootlin.com>
M: Conor Culhane <conor.culhane@silvaco.com>
L: linux-i3c@lists.infradead.org
S: Maintained
F: Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
F: drivers/i3c/master/svc-i3c-master.c
SIMPLE FIRMWARE INTERFACE (SFI)
S: Obsolete
W: http://simplefirmware.org/

5
drivers/i3c/device.c
View File

@ -262,6 +262,11 @@ int i3c_driver_register_with_owner(struct i3c_driver *drv, struct module *owner)
drv->driver.owner = owner;
drv->driver.bus = &i3c_bus_type;
if (!drv->probe) {
pr_err("Trying to register an i3c driver without probe callback\n");
return -EINVAL;
}
return driver_register(&drv->driver);
}
EXPORT_SYMBOL_GPL(i3c_driver_register_with_owner);

8
drivers/i3c/master.c
View File

@ -326,15 +326,13 @@ static int i3c_device_remove(struct device *dev)
{
struct i3c_device *i3cdev = dev_to_i3cdev(dev);
struct i3c_driver *driver = drv_to_i3cdrv(dev->driver);
int ret;
ret = driver->remove(i3cdev);
if (ret)
return ret;
if (driver->remove)
driver->remove(i3cdev);
i3c_device_free_ibi(i3cdev);
return ret;
return 0;
}
struct bus_type i3c_bus_type = {

9
drivers/i3c/master/Kconfig
View File

@ -22,9 +22,18 @@ config DW_I3C_MASTER
This driver can also be built as a module. If so, the module
will be called dw-i3c-master.
config SVC_I3C_MASTER
tristate "Silvaco I3C Dual-Role Master driver"
depends on I3C
depends on HAS_IOMEM
depends on !(ALPHA || PARISC)
help
Support for Silvaco I3C Dual-Role Master Controller.
config MIPI_I3C_HCI
tristate "MIPI I3C Host Controller Interface driver (EXPERIMENTAL)"
depends on I3C
depends on HAS_IOMEM
help
Support for hardware following the MIPI Aliance's I3C Host Controller
Interface specification.

1
drivers/i3c/master/Makefile
View File

@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_CDNS_I3C_MASTER) += i3c-master-cdns.o
obj-$(CONFIG_DW_I3C_MASTER) += dw-i3c-master.o
obj-$(CONFIG_SVC_I3C_MASTER) += svc-i3c-master.o
obj-$(CONFIG_MIPI_I3C_HCI) += mipi-i3c-hci/

5
drivers/i3c/master/dw-i3c-master.c
View File

@ -816,11 +816,6 @@ static int dw_i3c_master_daa(struct i3c_master_controller *m)
dw_i3c_master_free_xfer(xfer);
i3c_master_disec_locked(m, I3C_BROADCAST_ADDR,
I3C_CCC_EVENT_HJ |
I3C_CCC_EVENT_MR |
I3C_CCC_EVENT_SIR);
return 0;
}

1478
drivers/i3c/master/svc-i3c-master.c 100644
View File

File diff suppressed because it is too large Load Diff

2
include/linux/i3c/device.h
View File

@ -176,7 +176,7 @@ struct i3c_device;
struct i3c_driver {
struct device_driver driver;
int (*probe)(struct i3c_device *dev);
int (*remove)(struct i3c_device *dev);
void (*remove)(struct i3c_device *dev);
const struct i3c_device_id *id_table;
};