Skip to content

Commit 2ab35ce

Browse files
torvaldstorvalds
committed
Merge tag 'devicetree-fixes-for-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull more devicetree updates from Rob Herring: "A couple of conversions which didn't get picked up by the subsystems and one fix: - Convert st,stih407-irq-syscfg and Omnivision OV7251 bindings to DT schema - Merge Omnivision OV5695 into OV5693 binding - Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY" * tag 'devicetree-fixes-for-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: irqchip: convert st,stih407-irq-syscfg to DT schema media: dt-bindings: Convert Omnivision OV7251 to DT schema media: dt-bindings: Merge OV5695 into OV5693 binding of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY
2 parents 8d844b3 + 591b00c commit 2ab35ce

File tree

9 files changed

+202
-132
lines changed

9 files changed

+202
-132
lines changed

‎Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ examples:
269269
port {
270270
ov7251_ep: endpoint {
271271
data-lanes = <0 1>;
272+
link-frequencies = /bits/ 64 <240000000 319200000>;
272273
remote-endpoint = <&csiphy3_ep>;
273274
};
274275
};

‎Documentation/devicetree/bindings/interrupt-controller/st,sti-irq-syscfg.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎Documentation/devicetree/bindings/interrupt-controller/st,stih407-irq-syscfg.yaml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interrupt-controller/st,stih407-irq-syscfg.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: STMicroelectronics STi System Configuration Controlled IRQs
8+
9+
maintainers:
10+
- Patrice Chotard <patrice.chotard@foss.st.com>
11+
12+
description:
13+
On STi based systems; External, CTI (Core Sight), PMU (Performance
14+
Management), and PL310 L2 Cache IRQs are controlled using System
15+
Configuration registers. This device is used to unmask them prior to use.
16+
17+
properties:
18+
compatible:
19+
const: st,stih407-irq-syscfg
20+
21+
st,syscfg:
22+
description: Phandle to Cortex-A9 IRQ system config registers
23+
$ref: /schemas/types.yaml#/definitions/phandle
24+
25+
st,irq-device:
26+
description: Array of IRQs to enable.
27+
$ref: /schemas/types.yaml#/definitions/uint32-array
28+
items:
29+
- description: Enable the IRQ of the channel one.
30+
- description: Enable the IRQ of the channel two.
31+
32+
st,fiq-device:
33+
description: Array of FIQs to enable.
34+
$ref: /schemas/types.yaml#/definitions/uint32-array
35+
items:
36+
- description: Enable the IRQ of the channel one.
37+
- description: Enable the IRQ of the channel two.
38+
39+
st,invert-ext:
40+
description: External IRQs can be inverted at will. This property inverts
41+
these three IRQs using bitwise logic, each one being encoded respectively
42+
on the first, second and fourth bit.
43+
$ref: /schemas/types.yaml#/definitions/uint32
44+
enum: [ 1, 2, 3, 4, 5, 6 ]
45+
46+
required:
47+
- compatible
48+
- st,syscfg
49+
- st,irq-device
50+
- st,fiq-device
51+
52+
additionalProperties: false
53+
54+
examples:
55+
- |
56+
#include <dt-bindings/interrupt-controller/irq-st.h>
57+
irq-syscfg {
58+
compatible = "st,stih407-irq-syscfg";
59+
st,syscfg = <&syscfg_cpu>;
60+
st,irq-device = <ST_IRQ_SYSCFG_PMU_0>,
61+
<ST_IRQ_SYSCFG_PMU_1>;
62+
st,fiq-device = <ST_IRQ_SYSCFG_DISABLED>,
63+
<ST_IRQ_SYSCFG_DISABLED>;
64+
};
65+
...

‎Documentation/devicetree/bindings/media/i2c/ov5695.txt

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎Documentation/devicetree/bindings/media/i2c/ov7251.txt

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,41 @@
55
$id: http://devicetree.org/schemas/media/i2c/ovti,ov5693.yaml#
66
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

8-
title: Omnivision OV5693 CMOS Sensor
8+
title: Omnivision OV5693/OV5695 CMOS Sensors
99

1010
maintainers:
1111
- Tommaso Merciai <tommaso.merciai@amarulasolutions.com>
1212

1313
description: |
14-
The Omnivision OV5693 is a high performance, 1/4-inch, 5 megapixel, CMOS
15-
image sensor that delivers 2592x1944 at 30fps. It provides full-frame,
14+
The Omnivision OV5693/OV5695 are high performance, 1/4-inch, 5 megapixel, CMOS
15+
image sensors that deliver 2592x1944 at 30fps. It provides full-frame,
1616
sub-sampled, and windowed 10-bit MIPI images in various formats via the
1717
Serial Camera Control Bus (SCCB) interface.
1818
19-
OV5693 is controlled via I2C and two-wire Serial Camera Control Bus (SCCB).
20-
The sensor output is available via CSI-2 serial data output (up to 2-lane).
19+
OV5693/OV5695 are controlled via I2C and two-wire Serial Camera Control Bus
20+
(SCCB). The sensor output is available via CSI-2 serial data output (up to
21+
2-lane).
2122
2223
allOf:
2324
- $ref: /schemas/media/video-interface-devices.yaml#
25+
- if:
26+
properties:
27+
compatible:
28+
contains:
29+
const: ovti,ov5693
30+
then:
31+
properties:
32+
port:
33+
properties:
34+
endpoint:
35+
required:
36+
- link-frequencies
2437

2538
properties:
2639
compatible:
27-
const: ovti,ov5693
40+
enum:
41+
- ovti,ov5693
42+
- ovti,ov5695
2843

2944
reg:
3045
maxItems: 1
@@ -34,6 +49,9 @@ properties:
3449
System input clock (aka XVCLK). From 6 to 27 MHz.
3550
maxItems: 1
3651

52+
clock-names:
53+
const: xvclk
54+
3755
dovdd-supply:
3856
description:
3957
Digital I/O voltage supply, 1.8V.
@@ -72,7 +90,6 @@ properties:
7290

7391
required:
7492
- data-lanes
75-
- link-frequencies
7693

7794
required:
7895
- compatible

‎Documentation/devicetree/bindings/media/i2c/ovti,ov7251.yaml

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/i2c/ovti,ov7251.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: OmniVision OV7251 Image Sensor
8+
9+
description:
10+
The Omnivision OV7251 is a 1/7.5-Inch CMOS active pixel digital image sensor
11+
with an active array size of 640H x 480V. It is programmable through a serial
12+
I2C interface.
13+
14+
maintainers:
15+
- Todor Tomov <todor.too@gmail.com>
16+
17+
properties:
18+
compatible:
19+
const: ovti,ov7251
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
description: XCLK Input Clock
26+
27+
clock-names:
28+
const: xclk
29+
30+
clock-frequency:
31+
description: Frequency of the xclk clock in Hz.
32+
33+
vdda-supply:
34+
description: Analog voltage supply, 2.8 volts
35+
36+
vddd-supply:
37+
description: Digital core voltage supply, 1.2 volts
38+
39+
vdddo-supply:
40+
description: Digital I/O voltage supply, 1.8 volts
41+
42+
enable-gpios:
43+
maxItems: 1
44+
description:
45+
Reference to the GPIO connected to the XSHUTDOWN pin, if any. Polarity
46+
is GPIO_ACTIVE_HIGH.
47+
48+
port:
49+
description: Digital Output Port
50+
$ref: /schemas/graph.yaml#/$defs/port-base
51+
additionalProperties: false
52+
53+
properties:
54+
endpoint:
55+
$ref: /schemas/media/video-interfaces.yaml#
56+
unevaluatedProperties: false
57+
58+
properties:
59+
clock-lanes:
60+
maximum: 1
61+
62+
data-lanes:
63+
maxItems: 1
64+
65+
link-frequencies: true
66+
67+
required:
68+
- data-lanes
69+
- link-frequencies
70+
71+
required:
72+
- compatible
73+
- reg
74+
- clocks
75+
- vdddo-supply
76+
- vdda-supply
77+
- port
78+
79+
additionalProperties: false
80+
81+
examples:
82+
- |
83+
#include <dt-bindings/gpio/gpio.h>
84+
85+
i2c {
86+
#address-cells = <1>;
87+
#size-cells = <0>;
88+
89+
camera@3c {
90+
compatible = "ovti,ov7251";
91+
reg = <0x3c>;
92+
clocks = <&clks 1>;
93+
clock-frequency = <24000000>;
94+
vdddo-supply = <&ov7251_vdddo_1v8>;
95+
vdda-supply = <&ov7251_vdda_2v8>;
96+
vddd-supply = <&ov7251_vddd_1v5>;
97+
enable-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
98+
99+
port {
100+
ov7251_ep: endpoint {
101+
remote-endpoint = <&csi0_ep>;
102+
clock-lanes = <1>;
103+
data-lanes = <0>;
104+
link-frequencies = /bits/ 64 <240000000 319200000>;
105+
};
106+
};
107+
};
108+
};
109+
...

‎Documentation/devicetree/bindings/media/rockchip-isp1.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ examples:
199199
wcam: camera@36 {
200200
compatible = "ovti,ov5695";
201201
reg = <0x36>;
202+
clocks = <&cru SCLK_TESTCLKOUT1>;
202203
203204
port {
204205
wcam_out: endpoint {

‎include/linux/of.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,8 +1676,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
16761676

16771677
#else
16781678

1679-
static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size,
1680-
int *ovcs_id)
1679+
static inline int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
1680+
int *ovcs_id, struct device_node *target_base)
16811681
{
16821682
return -ENOTSUPP;
16831683
}

0 commit comments

Comments
 (0)