diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2023-10-31 10:54:48 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2023-10-31 10:54:48 -0300 |
| commit | 162e3480246ef69386d4647d2320d86741bf08a2 (patch) | |
| tree | caada42ce40114e7abe5e74acb54781ad4aa424a /Documentation/devicetree/bindings/iio/health/ti,afe4403.yaml | |
| parent | d4b2d165714c0ce8777d5131f6e0aad617b7adc4 (diff) | |
| parent | ffc253263a1375a65fa6c9f62a893e9767fbebfa (diff) | |
Merge tag 'v6.6' into rdma.git for-next
Resolve conflict by taking the spin_lock hunk from for-next:
https://lore.kernel.org/r/20230928113851.5197a1ec@canb.auug.org.au
Required for the next patch.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'Documentation/devicetree/bindings/iio/health/ti,afe4403.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/iio/health/ti,afe4403.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/iio/health/ti,afe4403.yaml b/Documentation/devicetree/bindings/iio/health/ti,afe4403.yaml index b9b5beac33b2..5b6cde86b5a5 100644 --- a/Documentation/devicetree/bindings/iio/health/ti,afe4403.yaml +++ b/Documentation/devicetree/bindings/iio/health/ti,afe4403.yaml @@ -23,7 +23,8 @@ properties: maxItems: 1 description: Connected to ADC_RDY pin. - reset-gpios: true + reset-gpios: + maxItems: 1 required: - compatible |