Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+202
-132
+1
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
+1
Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
-30
Documentation/devicetree/bindings/interrupt-controller/st,sti-irq-syscfg.txt
-30
Documentation/devicetree/bindings/interrupt-controller/st,sti-irq-syscfg.txt
···
1
-
STMicroelectronics STi System Configuration Controlled IRQs
2
-
-----------------------------------------------------------
3
-
4
-
On STi based systems; External, CTI (Core Sight), PMU (Performance Management),
5
-
and PL310 L2 Cache IRQs are controlled using System Configuration registers.
6
-
This driver is used to unmask them prior to use.
7
-
8
-
Required properties:
9
-
- compatible : Should be "st,stih407-irq-syscfg"
10
-
- st,syscfg : Phandle to Cortex-A9 IRQ system config registers
11
-
- st,irq-device : Array of IRQs to enable - should be 2 in length
12
-
- st,fiq-device : Array of FIQs to enable - should be 2 in length
13
-
14
-
Optional properties:
15
-
- st,invert-ext : External IRQs can be inverted at will. This property inverts
16
-
these IRQs using bitwise logic. A number of defines have been
17
-
provided for convenience:
18
-
ST_IRQ_SYSCFG_EXT_1_INV
19
-
ST_IRQ_SYSCFG_EXT_2_INV
20
-
ST_IRQ_SYSCFG_EXT_3_INV
21
-
Example:
22
-
23
-
irq-syscfg {
24
-
compatible = "st,stih407-irq-syscfg";
25
-
st,syscfg = <&syscfg_cpu>;
26
-
st,irq-device = <ST_IRQ_SYSCFG_PMU_0>,
27
-
<ST_IRQ_SYSCFG_PMU_1>;
28
-
st,fiq-device = <ST_IRQ_SYSCFG_DISABLED>,
29
-
<ST_IRQ_SYSCFG_DISABLED>;
30
-
};
+65
Documentation/devicetree/bindings/interrupt-controller/st,stih407-irq-syscfg.yaml
+65
Documentation/devicetree/bindings/interrupt-controller/st,stih407-irq-syscfg.yaml
···
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
+
...
-41
Documentation/devicetree/bindings/media/i2c/ov5695.txt
-41
Documentation/devicetree/bindings/media/i2c/ov5695.txt
···
1
-
* Omnivision OV5695 MIPI CSI-2 sensor
2
-
3
-
Required Properties:
4
-
- compatible: shall be "ovti,ov5695"
5
-
- clocks: reference to the xvclk input clock
6
-
- clock-names: shall be "xvclk"
7
-
- avdd-supply: Analog voltage supply, 2.8 volts
8
-
- dovdd-supply: Digital I/O voltage supply, 1.8 volts
9
-
- dvdd-supply: Digital core voltage supply, 1.2 volts
10
-
- reset-gpios: Low active reset gpio
11
-
12
-
The device node shall contain one 'port' child node with an
13
-
'endpoint' subnode for its digital output video port,
14
-
in accordance with the video interface bindings defined in
15
-
Documentation/devicetree/bindings/media/video-interfaces.txt.
16
-
The endpoint optional property 'data-lanes' shall be "<1 2>".
17
-
18
-
Example:
19
-
&i2c7 {
20
-
ov5695: camera-sensor@36 {
21
-
compatible = "ovti,ov5695";
22
-
reg = <0x36>;
23
-
pinctrl-names = "default";
24
-
pinctrl-0 = <&clk_24m_cam>;
25
-
26
-
clocks = <&cru SCLK_TESTCLKOUT1>;
27
-
clock-names = "xvclk";
28
-
29
-
avdd-supply = <&pp2800_cam>;
30
-
dovdd-supply = <&pp1800>;
31
-
dvdd-supply = <&pp1250_cam>;
32
-
reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
33
-
34
-
port {
35
-
wcam_out: endpoint {
36
-
remote-endpoint = <&mipi_in_wcam>;
37
-
data-lanes = <1 2>;
38
-
};
39
-
};
40
-
};
41
-
};
-52
Documentation/devicetree/bindings/media/i2c/ov7251.txt
-52
Documentation/devicetree/bindings/media/i2c/ov7251.txt
···
1
-
* Omnivision 1/7.5-Inch B&W VGA CMOS Digital Image Sensor
2
-
3
-
The Omnivision OV7251 is a 1/7.5-Inch CMOS active pixel digital image sensor
4
-
with an active array size of 640H x 480V. It is programmable through a serial
5
-
I2C interface.
6
-
7
-
Required Properties:
8
-
- compatible: Value should be "ovti,ov7251".
9
-
- clocks: Reference to the xclk clock.
10
-
- clock-names: Should be "xclk".
11
-
- clock-frequency: Frequency of the xclk clock.
12
-
- enable-gpios: Chip enable GPIO. Polarity is GPIO_ACTIVE_HIGH. This corresponds
13
-
to the hardware pin XSHUTDOWN which is physically active low.
14
-
- vdddo-supply: Chip digital IO regulator.
15
-
- vdda-supply: Chip analog regulator.
16
-
- vddd-supply: Chip digital core regulator.
17
-
18
-
The device node shall contain one 'port' child node with a single 'endpoint'
19
-
subnode for its digital output video port, in accordance with the video
20
-
interface bindings defined in
21
-
Documentation/devicetree/bindings/media/video-interfaces.txt.
22
-
23
-
Example:
24
-
25
-
&i2c1 {
26
-
...
27
-
28
-
ov7251: camera-sensor@60 {
29
-
compatible = "ovti,ov7251";
30
-
reg = <0x60>;
31
-
32
-
enable-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
33
-
pinctrl-names = "default";
34
-
pinctrl-0 = <&camera_bw_default>;
35
-
36
-
clocks = <&clks 200>;
37
-
clock-names = "xclk";
38
-
clock-frequency = <24000000>;
39
-
40
-
vdddo-supply = <&camera_dovdd_1v8>;
41
-
vdda-supply = <&camera_avdd_2v8>;
42
-
vddd-supply = <&camera_dvdd_1v2>;
43
-
44
-
port {
45
-
ov7251_ep: endpoint {
46
-
clock-lanes = <1>;
47
-
data-lanes = <0>;
48
-
remote-endpoint = <&csi0_ep>;
49
-
};
50
-
};
51
-
};
52
-
};
+24
-7
Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml
+24
-7
Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml
···
5
5
$id: http://devicetree.org/schemas/media/i2c/ovti,ov5693.yaml#
6
6
$schema: http://devicetree.org/meta-schemas/core.yaml#
7
7
8
-
title: Omnivision OV5693 CMOS Sensor
8
+
title: Omnivision OV5693/OV5695 CMOS Sensors
9
9
10
10
maintainers:
11
11
- Tommaso Merciai <tommaso.merciai@amarulasolutions.com>
12
12
13
13
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,
16
16
sub-sampled, and windowed 10-bit MIPI images in various formats via the
17
17
Serial Camera Control Bus (SCCB) interface.
18
18
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).
21
22
22
23
allOf:
23
24
- $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
24
37
25
38
properties:
26
39
compatible:
27
-
const: ovti,ov5693
40
+
enum:
41
+
- ovti,ov5693
42
+
- ovti,ov5695
28
43
29
44
reg:
30
45
maxItems: 1
···
48
33
description:
49
34
System input clock (aka XVCLK). From 6 to 27 MHz.
50
35
maxItems: 1
36
+
37
+
clock-names:
38
+
const: xvclk
51
39
52
40
dovdd-supply:
53
41
description:
···
90
72
91
73
required:
92
74
- data-lanes
93
-
- link-frequencies
94
75
95
76
required:
96
77
- compatible
+109
Documentation/devicetree/bindings/media/i2c/ovti,ov7251.yaml
+109
Documentation/devicetree/bindings/media/i2c/ovti,ov7251.yaml
···
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
+
...
+1
Documentation/devicetree/bindings/media/rockchip-isp1.yaml
+1
Documentation/devicetree/bindings/media/rockchip-isp1.yaml
+2
-2
include/linux/of.h
+2
-2
include/linux/of.h
···
1676
1676
1677
1677
#else
1678
1678
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)
1681
1681
{
1682
1682
return -ENOTSUPP;
1683
1683
}