| Message ID | 20191112143152.23176-2-bparrot@ti.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | media: ti-vpe: cal: maintenance | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success |
+ Rob Benoit Parrot <bparrot@ti.com> wrote on Tue [2019-Nov-12 08:31:33 -0600]: > Update Device Tree bindings for the CAL driver to use syscon to access > the phy config register instead of trying to map it directly. > > Signed-off-by: Benoit Parrot <bparrot@ti.com> > --- > Documentation/devicetree/bindings/media/ti-cal.txt | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/Documentation/devicetree/bindings/media/ti-cal.txt b/Documentation/devicetree/bindings/media/ti-cal.txt > index ae9b52f37576..93096d924786 100644 > --- a/Documentation/devicetree/bindings/media/ti-cal.txt > +++ b/Documentation/devicetree/bindings/media/ti-cal.txt > @@ -10,9 +10,14 @@ Required properties: > - compatible: must be "ti,dra72-cal" > - reg: CAL Top level, Receiver Core #0, Receiver Core #1 and Camera RX > control address space > -- reg-names: cal_top, cal_rx_core0, cal_rx_core1, and camerrx_control > +- reg-names: cal_top, cal_rx_core0, cal_rx_core1 and camerrx_control > registers > - interrupts: should contain IRQ line for the CAL; > +- ti,camerrx-control: phandle to the device control module and offset to > + the control_camerarx_core register. > + This node is meant to replace the "camerrx_control" > + reg entry above but "camerrx_control" is still > + handled for backward compatibility. > > CAL supports 2 camera port nodes on MIPI bus. Each CSI2 camera port nodes > should contain a 'port' child node with child 'endpoint' node. Please > @@ -25,13 +30,12 @@ Example: > ti,hwmods = "cal"; > reg = <0x4845B000 0x400>, > <0x4845B800 0x40>, > - <0x4845B900 0x40>, > - <0x4A002e94 0x4>; > + <0x4845B900 0x40>; > reg-names = "cal_top", > "cal_rx_core0", > - "cal_rx_core1", > - "camerrx_control"; > + "cal_rx_core1"; > interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; > + ti,camerrx-control = <&scm_conf 0xE94>; > #address-cells = <1>; > #size-cells = <0>; > > -- > 2.17.1 >
diff --git a/Documentation/devicetree/bindings/media/ti-cal.txt b/Documentation/devicetree/bindings/media/ti-cal.txt index ae9b52f37576..93096d924786 100644 --- a/Documentation/devicetree/bindings/media/ti-cal.txt +++ b/Documentation/devicetree/bindings/media/ti-cal.txt @@ -10,9 +10,14 @@ Required properties: - compatible: must be "ti,dra72-cal" - reg: CAL Top level, Receiver Core #0, Receiver Core #1 and Camera RX control address space -- reg-names: cal_top, cal_rx_core0, cal_rx_core1, and camerrx_control +- reg-names: cal_top, cal_rx_core0, cal_rx_core1 and camerrx_control registers - interrupts: should contain IRQ line for the CAL; +- ti,camerrx-control: phandle to the device control module and offset to + the control_camerarx_core register. + This node is meant to replace the "camerrx_control" + reg entry above but "camerrx_control" is still + handled for backward compatibility. CAL supports 2 camera port nodes on MIPI bus. Each CSI2 camera port nodes should contain a 'port' child node with child 'endpoint' node. Please @@ -25,13 +30,12 @@ Example: ti,hwmods = "cal"; reg = <0x4845B000 0x400>, <0x4845B800 0x40>, - <0x4845B900 0x40>, - <0x4A002e94 0x4>; + <0x4845B900 0x40>; reg-names = "cal_top", "cal_rx_core0", - "cal_rx_core1", - "camerrx_control"; + "cal_rx_core1"; interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; + ti,camerrx-control = <&scm_conf 0xE94>; #address-cells = <1>; #size-cells = <0>;
Update Device Tree bindings for the CAL driver to use syscon to access the phy config register instead of trying to map it directly. Signed-off-by: Benoit Parrot <bparrot@ti.com> --- Documentation/devicetree/bindings/media/ti-cal.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)