Skip to content

Commit 5c024e6

Browse files
Ricardo Cañuelorobherring
authored andcommitted
mfd: google,cros-ec: add missing properties
Add missing properties that are currently used in the examples of subnode bindings and in many DTs. Also updates the example in sound/google,cros-ec-codec.yaml to comply with the google,cros-ec binding. Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com> Link: https://lore.kernel.org/r/20201021114308.25485-4-ricardo.canuelo@collabora.com [robh: Add missing '#address-cells' and '#size-cells'] Signed-off-by: Rob Herring <robh@kernel.org>
1 parent 50d68fe commit 5c024e6

2 files changed

Lines changed: 64 additions & 10 deletions

File tree

Documentation/devicetree/bindings/mfd/google,cros-ec.yaml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ properties:
5959
whether this nvram is present or not.
6060
type: boolean
6161

62+
mtk,rpmsg-name:
63+
description:
64+
Must be defined if the cros-ec is a rpmsg device for a Mediatek
65+
ARM Cortex M4 Co-processor. Contains the name pf the rpmsg
66+
device. Used to match the subnode to the rpmsg device announced by
67+
the SCP.
68+
$ref: "/schemas/types.yaml#/definitions/string"
69+
6270
spi-max-frequency:
6371
description: Maximum SPI frequency of the device in Hz.
6472

@@ -71,14 +79,54 @@ properties:
7179
wakeup-source:
7280
description: Button can wake-up the system.
7381

82+
'#address-cells':
83+
const: 1
84+
85+
'#size-cells':
86+
const: 0
87+
88+
typec:
89+
$ref: "/schemas/chrome/google,cros-ec-typec.yaml#"
90+
91+
ec-pwm:
92+
$ref: "/schemas/pwm/google,cros-ec-pwm.yaml#"
93+
7494
keyboard-controller:
7595
$ref: "/schemas/input/google,cros-ec-keyb.yaml#"
7696

97+
codecs:
98+
type: object
99+
additionalProperties: false
100+
101+
properties:
102+
'#address-cells':
103+
const: 2
104+
105+
'#size-cells':
106+
const: 1
107+
108+
patternProperties:
109+
"^ec-codec@[a-f0-9]+$":
110+
type: object
111+
$ref: "/schemas/sound/google,cros-ec-codec.yaml#"
112+
113+
required:
114+
- "#address-cells"
115+
- "#size-cells"
116+
77117
patternProperties:
78118
"^i2c-tunnel[0-9]*$":
79119
type: object
80120
$ref: "/schemas/i2c/google,cros-ec-i2c-tunnel.yaml#"
81121

122+
"^regulator@[0-9]+$":
123+
type: object
124+
$ref: "/schemas/regulator/google,cros-ec-regulator.yaml#"
125+
126+
"^extcon[0-9]*$":
127+
type: object
128+
$ref: "/schemas/extcon/extcon-usbc-cros-ec.yaml#"
129+
82130
required:
83131
- compatible
84132

Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ maintainers:
1111

1212
description: |
1313
Google's ChromeOS EC codec is a digital mic codec provided by the
14-
Embedded Controller (EC) and is controlled via a host-command interface.
15-
An EC codec node should only be found as a sub-node of the EC node (see
16-
Documentation/devicetree/bindings/mfd/google,cros-ec.yaml).
14+
Embedded Controller (EC) and is controlled via a host-command
15+
interface. An EC codec node should only be found inside the "codecs"
16+
subnode of a cros-ec node.
17+
(see Documentation/devicetree/bindings/mfd/google,cros-ec.yaml).
1718
1819
properties:
1920
compatible:
@@ -54,14 +55,19 @@ examples:
5455
#size-cells = <0>;
5556
cros-ec@0 {
5657
compatible = "google,cros-ec-spi";
57-
#address-cells = <2>;
58-
#size-cells = <1>;
5958
reg = <0>;
60-
cros_ec_codec: ec-codec@10500000 {
61-
compatible = "google,cros-ec-codec";
62-
#sound-dai-cells = <1>;
63-
reg = <0x0 0x10500000 0x80000>;
64-
memory-region = <&reserved_mem>;
59+
60+
codecs {
61+
#address-cells = <2>;
62+
#size-cells = <1>;
63+
64+
cros_ec_codec: ec-codec@10500000 {
65+
compatible = "google,cros-ec-codec";
66+
#sound-dai-cells = <1>;
67+
reg = <0x0 0x10500000 0x80000>;
68+
memory-region = <&reserved_mem>;
69+
};
70+
6571
};
6672
};
6773
};

0 commit comments

Comments
 (0)