diff options
| author | Rob Herring <robh@kernel.org> | 2022-01-12 10:14:09 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2022-01-12 10:14:09 -0600 |
| commit | e623611b4d3f722b57ceeaf4368ac787837408e7 (patch) | |
| tree | dfcea1c4db3f59b8d084f4ddc24dda6e6180e460 /Documentation/devicetree/bindings/iio | |
| parent | 785576c9356fb249e2715fe25f47c773385574ce (diff) | |
| parent | b398123bff3bcbc1facb0f29bf6e7b9f1bc55931 (diff) | |
Merge branch 'dt/linus' into dt/next
Pick a fix which didn't make it into v5.16.
Diffstat (limited to 'Documentation/devicetree/bindings/iio')
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml b/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml index c65921e66dc1..81c87295912c 100644 --- a/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml +++ b/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml @@ -136,7 +136,7 @@ examples: samsung,syscon-phandle = <&pmu_system_controller>; /* NTC thermistor is a hwmon device */ - ncp15wb473 { + thermistor { compatible = "murata,ncp15wb473"; pullup-uv = <1800000>; pullup-ohm = <47000>; |