media: ti-vpe: cal: maintenance
Subsystems (3)
v3 cover media: ti-vpe: cal: maintenance
This a collection of backlog patches I have been carrying for the CAL driver.
- Add support for SoC variants.
- Switches to syscon/regmap to access a system controller register for the DPHY configuration. This register has different bit layout depending on the SoC version.
- It adds supports for pre ES2.0 silicon errata.
- Reworked the DPHY initialization sequence to match the technical reference manual and provide a more robust restartability.
- Adds the missing ability to power subdevice.
- Update the devicetree binding and then converts it to dt-schema
Changes since v2:
- Added a patch which converts all BIT_MASK() into BIT().
- Constify stuct cal_data.
- Remove blank line.
- Fix to use BIT() instead of BIT_MASK() in "add CSI2 PHY LDO errata support" patch
- Fix commit description related to v4l2 power management:
- Add missing binding update from v2
- Merge dt-binding and maintainer patch
Changes since v1:
- Removed unneeded "items/max/min".
- Add a ref for ti,camerrx-control type
- Move compatible description as comment in the schemas
- Simplify 'endpoint' syntax
- Removed clocks description
- Added ti,cal.yaml to MAINTAINERS as a separate patch.
- Added Rob's ack
- Remove 'inline' from cal_runtime_get()
- Switch to use of_device_get_match_data
- Reworked the syscon_regmap_lookup_by_phandle() section
- Updated the binding to use ti,camerrx-control instead of sycon_camerrx
- Updated the binding to use ti,camerrx-control instead of sycon_camerrx
Benoit Parrot (19):
dt-bindings: media: cal: update binding to use syscon
dt-bindings: media: cal: update binding example
media: ti-vpe: cal: switch BIT_MASK to BIT
media: ti-vpe: cal: Add per platform data support
media: ti-vpe: cal: Enable DMABUF export
dt-bindings: media: cal: update binding to add PHY LDO errata support
media: ti-vpe: cal: add CSI2 PHY LDO errata support
media: ti-vpe: cal: Fix ths_term/ths_settle parameters
media: ti-vpe: cal: Fix pixel processing parameters
media: ti-vpe: cal: Align DPHY init sequence with docs
dt-bindings: media: cal: update binding to add DRA76x support
media: ti-vpe: cal: Add DRA76x support
dt-bindings: media: cal: update binding to add AM654 support
media: ti-vpe: cal: Add AM654 support
media: ti-vpe: cal: Add subdev s_power hooks
media: ti-vpe: cal: Properly calculate max resolution boundary
media: ti-vpe: cal: Fix a WARN issued when start streaming fails
media: ti-vpe: cal: fix enum_mbus_code/frame_size subdev arguments
dt-bindings: media: cal: convert binding to yaml
Nikhil Devshatwar (1):
media: ti-vpe: cal: Restrict DMA to avoid memory corruption
.../devicetree/bindings/media/ti,cal.yaml | 202 +++++ .../devicetree/bindings/media/ti-cal.txt | 72 -- MAINTAINERS | 1 + drivers/media/platform/Kconfig | 2 +- drivers/media/platform/ti-vpe/cal.c | 773 ++++++++++++++---- drivers/media/platform/ti-vpe/cal_regs.h | 221 ++--- 6 files changed, 937 insertions(+), 334 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/ti,cal.yaml delete mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt
Signature · 1 line
2.17.1
PATCH v3 1/20 dt-bindings: media: cal: update binding to use syscon
Update Device Tree bindings for the CAL driver to use syscon to access the phy config register instead of trying to map it directly.
--- Documentation/devicetree/bindings/media/ti-cal.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/media/ti-cal.txt +9 -5
@@ -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>;
Signature · 1 line
2.17.1
Re: [Patch v3 01/20] dt-bindings: media: cal: update binding to use syscon
+ Rob
Benoit Parrot <[email protected]> wrote on Tue [2019-Nov-12 08:31:33 -0600]:
Quoted 48 lines
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 <[email protected]>--- Documentation/devicetree/bindings/media/ti-cal.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)Documentation/devicetree/bindings/media/ti-cal.txt +9
-5@@ -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>;Signature · 1 line
2.17.1
PATCH v3 2/20 dt-bindings: media: cal: update binding example
In reply to Benoit ParrotUpdate binding example to show proper endpoint properties and linkage.
--- .../devicetree/bindings/media/ti-cal.txt | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-)
Documentation/devicetree/bindings/media/ti-cal.txt +16 -15
@@ -27,7 +27,6 @@ Documentation/devicetree/bindings/media/video-interfaces.txt. Example: cal: cal@4845b000 { compatible = "ti,dra72-cal"; - ti,hwmods = "cal"; reg = <0x4845B000 0x400>, <0x4845B800 0x40>, <0x4845B900 0x40>;
@@ -45,9 +44,10 @@ Example: csi2_0: port@0 { reg = <0>; - endpoint { - slave-mode; - remote-endpoint = <&ar0330_1>; + csi2_phy0: endpoint { + remote-endpoint = <&csi2_cam0>; + clock-lanes = <0>; + data-lanes = <1 2>; }; }; csi2_1: port@1 {
@@ -57,19 +57,20 @@ Example: }; i2c5: i2c@4807c000 { - ar0330@10 { - compatible = "ti,ar0330"; - reg = <0x10>; + clock-frequency = <400000>; - port { - #address-cells = <1>; - #size-cells = <0>; + camera-sensor@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; + + clocks = <&clk_fixed>; + clock-names = "xclk"; - ar0330_1: endpoint { - reg = <0>; - clock-lanes = <1>; - data-lanes = <0 2 3 4>; - remote-endpoint = <&csi2_0>; + port { + csi2_cam0: endpoint { + remote-endpoint = <&csi2_phy0>; + clock-lanes = <0>; + data-lanes = <1 2>; }; }; };
Signature · 1 line
2.17.1
Re: [Patch v3 02/20] dt-bindings: media: cal: update binding example
+Rob
Benoit Parrot <[email protected]> wrote on Tue [2019-Nov-12 08:31:34 -0600]:
Quoted 68 lines
Update binding example to show proper endpoint properties and linkage.
Signed-off-by Benoit Parrot <[email protected]>--- .../devicetree/bindings/media/ti-cal.txt | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-)Documentation/devicetree/bindings/media/ti-cal.txt +16
-15@@ -27,7 +27,6 @@ Documentation/devicetree/bindings/media/video-interfaces.txt. Example: cal: cal@4845b000 { compatible = "ti,dra72-cal"; - ti,hwmods = "cal"; reg = <0x4845B000 0x400>, <0x4845B800 0x40>, <0x4845B900 0x40>;@@ -45,9 +44,10 @@ Example: csi2_0: port@0 { reg = <0>; - endpoint { - slave-mode; - remote-endpoint = <&ar0330_1>; + csi2_phy0: endpoint { + remote-endpoint = <&csi2_cam0>; + clock-lanes = <0>; + data-lanes = <1 2>; }; }; csi2_1: port@1 {@@ -57,19 +57,20 @@ Example: }; i2c5: i2c@4807c000 { - ar0330@10 { - compatible = "ti,ar0330"; - reg = <0x10>; + clock-frequency = <400000>; - port { - #address-cells = <1>; - #size-cells = <0>; + camera-sensor@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; + + clocks = <&clk_fixed>; + clock-names = "xclk"; - ar0330_1: endpoint { - reg = <0>; - clock-lanes = <1>; - data-lanes = <0 2 3 4>; - remote-endpoint = <&csi2_0>; + port { + csi2_cam0: endpoint { + remote-endpoint = <&csi2_phy0>; + clock-lanes = <0>; + data-lanes = <1 2>; }; }; };Signature · 1 line
2.17.1
PATCH v3 3/20 media: ti-vpe: cal: switch BIT_MASK to BIT
In reply to Benoit ParrotLooks like the preferred macro to define a single bit mask is BIT() and not BIT_MASK().
--- drivers/media/platform/ti-vpe/cal_regs.h | 194 +++++++++++------------ 1 file changed, 97 insertions(+), 97 deletions(-)
drivers/media/platform/ti-vpe/cal_regs.h +97 -97
@@ -110,7 +110,7 @@#define CAL_HL_HWINFO_NPPI_CONTEXTS_EIGHT 2#define CAL_HL_HWINFO_NPPI_CONTEXTS_RESERVED 3 -#define CAL_HL_SYSCONFIG_SOFTRESET_MASK BIT_MASK(0) +#define CAL_HL_SYSCONFIG_SOFTRESET_MASK BIT(0)#define CAL_HL_SYSCONFIG_SOFTRESET_DONE 0x0#define CAL_HL_SYSCONFIG_SOFTRESET_PENDING 0x1#define CAL_HL_SYSCONFIG_SOFTRESET_NOACTION 0x0
@@ -121,11 +121,11 @@#define CAL_HL_SYSCONFIG_IDLEMODE_SMART1 2#define CAL_HL_SYSCONFIG_IDLEMODE_SMART2 3 -#define CAL_HL_IRQ_EOI_LINE_NUMBER_MASK BIT_MASK(0) +#define CAL_HL_IRQ_EOI_LINE_NUMBER_MASK BIT(0)#define CAL_HL_IRQ_EOI_LINE_NUMBER_READ0 0#define CAL_HL_IRQ_EOI_LINE_NUMBER_EOI0 0 -#define CAL_HL_IRQ_MASK (m) BIT_MASK(m-1) +#define CAL_HL_IRQ_MASK (m) BIT(m-1)#define CAL_HL_IRQ_NOACTION 0x0#define CAL_HL_IRQ_ENABLE 0x1#define CAL_HL_IRQ_CLEAR 0x1
@@ -133,7 +133,7 @@#define CAL_HL_IRQ_ENABLED 0x1#define CAL_HL_IRQ_PENDING 0x1 -#define CAL_PIX_PROC_EN_MASK BIT_MASK(0) +#define CAL_PIX_PROC_EN_MASK BIT(0)#define CAL_PIX_PROC_EXTRACT_MASK GENMASK(4, 1)#define CAL_PIX_PROC_EXTRACT_B6 0x0#define CAL_PIX_PROC_EXTRACT_B7 0x1
@@ -179,7 +179,7 @@#define CAL_PIX_PROC_PACK_ARGB 0x6#define CAL_PIX_PROC_CPORT_MASK GENMASK(23, 19) -#define CAL_CTRL_POSTED_WRITES_MASK BIT_MASK(0) +#define CAL_CTRL_POSTED_WRITES_MASK BIT(0)#define CAL_CTRL_POSTED_WRITES_NONPOSTED 0#define CAL_CTRL_POSTED_WRITES 1#define CAL_CTRL_TAGCNT_MASK GENMASK(4, 1)
@@ -190,10 +190,10 @@#define CAL_CTRL_BURSTSIZE_BURST128 0x3#define CAL_CTRL_LL_FORCE_STATE_MASK GENMASK(12, 7)#define CAL_CTRL_MFLAGL_MASK GENMASK(20, 13) -#define CAL_CTRL_PWRSCPCLK_MASK BIT_MASK(21) +#define CAL_CTRL_PWRSCPCLK_MASK BIT(21)#define CAL_CTRL_PWRSCPCLK_AUTO 0#define CAL_CTRL_PWRSCPCLK_FORCE 1 -#define CAL_CTRL_RD_DMA_STALL_MASK BIT_MASK(22) +#define CAL_CTRL_RD_DMA_STALL_MASK BIT(22)#define CAL_CTRL_MFLAGH_MASK GENMASK(31, 24)#define CAL_CTRL1_PPI_GROUPING_MASK GENMASK(1, 0)
@@ -218,18 +218,18 @@#define CAL_VPORT_CTRL1_PCLK_MASK GENMASK(16, 0)#define CAL_VPORT_CTRL1_XBLK_MASK GENMASK(24, 17)#define CAL_VPORT_CTRL1_YBLK_MASK GENMASK(30, 25) -#define CAL_VPORT_CTRL1_WIDTH_MASK BIT_MASK(31) +#define CAL_VPORT_CTRL1_WIDTH_MASK BIT(31)#define CAL_VPORT_CTRL1_WIDTH_ONE 0#define CAL_VPORT_CTRL1_WIDTH_TWO 1#define CAL_VPORT_CTRL2_CPORT_MASK GENMASK(4, 0) -#define CAL_VPORT_CTRL2_FREERUNNING_MASK BIT_MASK(15) +#define CAL_VPORT_CTRL2_FREERUNNING_MASK BIT(15)#define CAL_VPORT_CTRL2_FREERUNNING_GATED 0#define CAL_VPORT_CTRL2_FREERUNNING_FREE 1 -#define CAL_VPORT_CTRL2_FS_RESETS_MASK BIT_MASK(16) +#define CAL_VPORT_CTRL2_FS_RESETS_MASK BIT(16)#define CAL_VPORT_CTRL2_FS_RESETS_NO 0#define CAL_VPORT_CTRL2_FS_RESETS_YES 1 -#define CAL_VPORT_CTRL2_FSM_RESET_MASK BIT_MASK(17) +#define CAL_VPORT_CTRL2_FSM_RESET_MASK BIT(17)#define CAL_VPORT_CTRL2_FSM_RESET_NOEFFECT 0#define CAL_VPORT_CTRL2_FSM_RESET 1#define CAL_VPORT_CTRL2_RDY_THR_MASK GENMASK(31, 18)
@@ -237,23 +237,23 @@#define CAL_BYS_CTRL1_PCLK_MASK GENMASK(16, 0)#define CAL_BYS_CTRL1_XBLK_MASK GENMASK(24, 17)#define CAL_BYS_CTRL1_YBLK_MASK GENMASK(30, 25) -#define CAL_BYS_CTRL1_BYSINEN_MASK BIT_MASK(31) +#define CAL_BYS_CTRL1_BYSINEN_MASK BIT(31)#define CAL_BYS_CTRL2_CPORTIN_MASK GENMASK(4, 0)#define CAL_BYS_CTRL2_CPORTOUT_MASK GENMASK(9, 5) -#define CAL_BYS_CTRL2_DUPLICATEDDATA_MASK BIT_MASK(10) +#define CAL_BYS_CTRL2_DUPLICATEDDATA_MASK BIT(10)#define CAL_BYS_CTRL2_DUPLICATEDDATA_NO 0#define CAL_BYS_CTRL2_DUPLICATEDDATA_YES 1 -#define CAL_BYS_CTRL2_FREERUNNING_MASK BIT_MASK(11) +#define CAL_BYS_CTRL2_FREERUNNING_MASK BIT(11)#define CAL_BYS_CTRL2_FREERUNNING_NO 0#define CAL_BYS_CTRL2_FREERUNNING_YES 1 -#define CAL_RD_DMA_CTRL_GO_MASK BIT_MASK(0) +#define CAL_RD_DMA_CTRL_GO_MASK BIT(0)#define CAL_RD_DMA_CTRL_GO_DIS 0#define CAL_RD_DMA_CTRL_GO_EN 1#define CAL_RD_DMA_CTRL_GO_IDLE 0#define CAL_RD_DMA_CTRL_GO_BUSY 1 -#define CAL_RD_DMA_CTRL_INIT_MASK BIT_MASK(1) +#define CAL_RD_DMA_CTRL_INIT_MASK BIT(1)#define CAL_RD_DMA_CTRL_BW_LIMITER_MASK GENMASK(10, 2)#define CAL_RD_DMA_CTRL_OCP_TAG_CNT_MASK GENMASK(14, 11)#define CAL_RD_DMA_CTRL_PCLK_MASK GENMASK(31, 15)
@@ -277,13 +277,13 @@#define CAL_RD_DMA_CTRL2_CIRC_MODE_SIXTEEN 3#define CAL_RD_DMA_CTRL2_CIRC_MODE_SIXTYFOUR 4#define CAL_RD_DMA_CTRL2_CIRC_MODE_RESERVED 5 -#define CAL_RD_DMA_CTRL2_ICM_CSTART_MASK BIT_MASK(3) +#define CAL_RD_DMA_CTRL2_ICM_CSTART_MASK BIT(3)#define CAL_RD_DMA_CTRL2_PATTERN_MASK GENMASK(5, 4)#define CAL_RD_DMA_CTRL2_PATTERN_LINEAR 0#define CAL_RD_DMA_CTRL2_PATTERN_YUV420 1#define CAL_RD_DMA_CTRL2_PATTERN_RD2SKIP2 2#define CAL_RD_DMA_CTRL2_PATTERN_RD2SKIP4 3 -#define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_MASK BIT_MASK(6) +#define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_MASK BIT(6)#define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_FREERUNNING 0#define CAL_RD_DMA_CTRL2_BYSOUT_LE_WAIT_WAITFORBYSOUT 1#define CAL_RD_DMA_CTRL2_CIRC_SIZE_MASK GENMASK(29, 16)
@@ -300,7 +300,7 @@#define CAL_WR_DMA_CTRL_PATTERN_WR2SKIP2 2#define CAL_WR_DMA_CTRL_PATTERN_WR2SKIP4 3#define CAL_WR_DMA_CTRL_PATTERN_RESERVED 1 -#define CAL_WR_DMA_CTRL_ICM_PSTART_MASK BIT_MASK(5) +#define CAL_WR_DMA_CTRL_ICM_PSTART_MASK BIT(5)#define CAL_WR_DMA_CTRL_DTAG_MASK GENMASK(8, 6)#define CAL_WR_DMA_CTRL_DTAG_ATT_HDR 0#define CAL_WR_DMA_CTRL_DTAG_ATT_DAT 1
@@ -311,7 +311,7 @@#define CAL_WR_DMA_CTRL_DTAG_D6 6#define CAL_WR_DMA_CTRL_DTAG_D7 7#define CAL_WR_DMA_CTRL_CPORT_MASK GENMASK(13, 9) -#define CAL_WR_DMA_CTRL_STALL_RD_MASK BIT_MASK(14) +#define CAL_WR_DMA_CTRL_STALL_RD_MASK BIT(14)#define CAL_WR_DMA_CTRL_YSIZE_MASK GENMASK(31, 18)#define CAL_WR_DMA_ADDR_MASK GENMASK(31, 4)
@@ -327,9 +327,9 @@#define CAL_WR_DMA_XSIZE_XSKIP_MASK GENMASK(15, 3)#define CAL_WR_DMA_XSIZE_MASK GENMASK(31, 19) -#define CAL_CSI2_PPI_CTRL_IF_EN_MASK BIT_MASK(0) -#define CAL_CSI2_PPI_CTRL_ECC_EN_MASK BIT_MASK(2) -#define CAL_CSI2_PPI_CTRL_FRAME_MASK BIT_MASK(3) +#define CAL_CSI2_PPI_CTRL_IF_EN_MASK BIT(0) +#define CAL_CSI2_PPI_CTRL_ECC_EN_MASK BIT(2) +#define CAL_CSI2_PPI_CTRL_FRAME_MASK BIT(3)#define CAL_CSI2_PPI_CTRL_FRAME_IMMEDIATE 0#define CAL_CSI2_PPI_CTRL_FRAME 1
@@ -340,18 +340,18 @@#define CAL_CSI2_COMPLEXIO_CFG_POSITION_2 2#define CAL_CSI2_COMPLEXIO_CFG_POSITION_1 1#define CAL_CSI2_COMPLEXIO_CFG_POSITION_NOT_USED 0 -#define CAL_CSI2_COMPLEXIO_CFG_CLOCK_POL_MASK BIT_MASK(3) +#define CAL_CSI2_COMPLEXIO_CFG_CLOCK_POL_MASK BIT(3)#define CAL_CSI2_COMPLEXIO_CFG_POL_PLUSMINUS 0#define CAL_CSI2_COMPLEXIO_CFG_POL_MINUSPLUS 1#define CAL_CSI2_COMPLEXIO_CFG_DATA1_POSITION_MASK GENMASK(6, 4) -#define CAL_CSI2_COMPLEXIO_CFG_DATA1_POL_MASK BIT_MASK(7) +#define CAL_CSI2_COMPLEXIO_CFG_DATA1_POL_MASK BIT(7)#define CAL_CSI2_COMPLEXIO_CFG_DATA2_POSITION_MASK GENMASK(10, 8) -#define CAL_CSI2_COMPLEXIO_CFG_DATA2_POL_MASK BIT_MASK(11) +#define CAL_CSI2_COMPLEXIO_CFG_DATA2_POL_MASK BIT(11)#define CAL_CSI2_COMPLEXIO_CFG_DATA3_POSITION_MASK GENMASK(14, 12) -#define CAL_CSI2_COMPLEXIO_CFG_DATA3_POL_MASK BIT_MASK(15) +#define CAL_CSI2_COMPLEXIO_CFG_DATA3_POL_MASK BIT(15)#define CAL_CSI2_COMPLEXIO_CFG_DATA4_POSITION_MASK GENMASK(18, 16) -#define CAL_CSI2_COMPLEXIO_CFG_DATA4_POL_MASK BIT_MASK(19) -#define CAL_CSI2_COMPLEXIO_CFG_PWR_AUTO_MASK BIT_MASK(24) +#define CAL_CSI2_COMPLEXIO_CFG_DATA4_POL_MASK BIT(19) +#define CAL_CSI2_COMPLEXIO_CFG_PWR_AUTO_MASK BIT(24)#define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_MASK GENMASK(26, 25)#define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_STATE_OFF 0#define CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_STATE_ON 1
@@ -360,83 +360,83 @@#define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_OFF 0#define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ON 1#define CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ULP 2 -#define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_MASK BIT_MASK(29) +#define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_MASK BIT(29)#define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETCOMPLETED 1#define CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETONGOING 0 -#define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK BIT_MASK(30) +#define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK BIT(30)#define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL 0#define CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_OPERATIONAL 1#define CAL_CSI2_SHORT_PACKET_MASK GENMASK(23, 0) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS1_MASK BIT_MASK(0) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS2_MASK BIT_MASK(1) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS3_MASK BIT_MASK(2) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS4_MASK BIT_MASK(3) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS5_MASK BIT_MASK(4) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS1_MASK BIT_MASK(5) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS2_MASK BIT_MASK(6) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS3_MASK BIT_MASK(7) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS4_MASK BIT_MASK(8) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS5_MASK BIT_MASK(9) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC1_MASK BIT_MASK(10) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC2_MASK BIT_MASK(11) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC3_MASK BIT_MASK(12) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC4_MASK BIT_MASK(13) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC5_MASK BIT_MASK(14) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL1_MASK BIT_MASK(15) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL2_MASK BIT_MASK(16) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL3_MASK BIT_MASK(17) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL4_MASK BIT_MASK(18) -#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL5_MASK BIT_MASK(19) -#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM1_MASK BIT_MASK(20) -#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM2_MASK BIT_MASK(21) -#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM3_MASK BIT_MASK(22) -#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM4_MASK BIT_MASK(23) -#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM5_MASK BIT_MASK(24) -#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMENTER_MASK BIT_MASK(25) -#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMEXIT_MASK BIT_MASK(26) -#define CAL_CSI2_COMPLEXIO_IRQ_FIFO_OVR_MASK BIT_MASK(27) -#define CAL_CSI2_COMPLEXIO_IRQ_SHORT_PACKET_MASK BIT_MASK(28) -#define CAL_CSI2_COMPLEXIO_IRQ_ECC_NO_CORRECTION_MASK BIT_MASK(30) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS1_MASK BIT(0) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS2_MASK BIT(1) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS3_MASK BIT(2) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS4_MASK BIT(3) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTHS5_MASK BIT(4) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS1_MASK BIT(5) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS2_MASK BIT(6) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS3_MASK BIT(7) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS4_MASK BIT(8) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRSOTSYNCHS5_MASK BIT(9) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC1_MASK BIT(10) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC2_MASK BIT(11) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC3_MASK BIT(12) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC4_MASK BIT(13) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRESC5_MASK BIT(14) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL1_MASK BIT(15) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL2_MASK BIT(16) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL3_MASK BIT(17) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL4_MASK BIT(18) +#define CAL_CSI2_COMPLEXIO_IRQ_ERRCONTROL5_MASK BIT(19) +#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM1_MASK BIT(20) +#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM2_MASK BIT(21) +#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM3_MASK BIT(22) +#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM4_MASK BIT(23) +#define CAL_CSI2_COMPLEXIO_IRQ_STATEULPM5_MASK BIT(24) +#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMENTER_MASK BIT(25) +#define CAL_CSI2_COMPLEXIO_IRQ_STATEALLULPMEXIT_MASK BIT(26) +#define CAL_CSI2_COMPLEXIO_IRQ_FIFO_OVR_MASK BIT(27) +#define CAL_CSI2_COMPLEXIO_IRQ_SHORT_PACKET_MASK BIT(28) +#define CAL_CSI2_COMPLEXIO_IRQ_ECC_NO_CORRECTION_MASK BIT(30)#define CAL_CSI2_TIMING_STOP_STATE_COUNTER_IO1_MASK GENMASK(12, 0) -#define CAL_CSI2_TIMING_STOP_STATE_X4_IO1_MASK BIT_MASK(13) -#define CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK BIT_MASK(14) -#define CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK BIT_MASK(15) - -#define CAL_CSI2_VC_IRQ_FS_IRQ_0_MASK BIT_MASK(0) -#define CAL_CSI2_VC_IRQ_FE_IRQ_0_MASK BIT_MASK(1) -#define CAL_CSI2_VC_IRQ_LS_IRQ_0_MASK BIT_MASK(2) -#define CAL_CSI2_VC_IRQ_LE_IRQ_0_MASK BIT_MASK(3) -#define CAL_CSI2_VC_IRQ_CS_IRQ_0_MASK BIT_MASK(4) -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_0_MASK BIT_MASK(5) -#define CAL_CSI2_VC_IRQ_FS_IRQ_1_MASK BIT_MASK(8) -#define CAL_CSI2_VC_IRQ_FE_IRQ_1_MASK BIT_MASK(9) -#define CAL_CSI2_VC_IRQ_LS_IRQ_1_MASK BIT_MASK(10) -#define CAL_CSI2_VC_IRQ_LE_IRQ_1_MASK BIT_MASK(11) -#define CAL_CSI2_VC_IRQ_CS_IRQ_1_MASK BIT_MASK(12) -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_1_MASK BIT_MASK(13) -#define CAL_CSI2_VC_IRQ_FS_IRQ_2_MASK BIT_MASK(16) -#define CAL_CSI2_VC_IRQ_FE_IRQ_2_MASK BIT_MASK(17) -#define CAL_CSI2_VC_IRQ_LS_IRQ_2_MASK BIT_MASK(18) -#define CAL_CSI2_VC_IRQ_LE_IRQ_2_MASK BIT_MASK(19) -#define CAL_CSI2_VC_IRQ_CS_IRQ_2_MASK BIT_MASK(20) -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_2_MASK BIT_MASK(21) -#define CAL_CSI2_VC_IRQ_FS_IRQ_3_MASK BIT_MASK(24) -#define CAL_CSI2_VC_IRQ_FE_IRQ_3_MASK BIT_MASK(25) -#define CAL_CSI2_VC_IRQ_LS_IRQ_3_MASK BIT_MASK(26) -#define CAL_CSI2_VC_IRQ_LE_IRQ_3_MASK BIT_MASK(27) -#define CAL_CSI2_VC_IRQ_CS_IRQ_3_MASK BIT_MASK(28) -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_3_MASK BIT_MASK(29) +#define CAL_CSI2_TIMING_STOP_STATE_X4_IO1_MASK BIT(13) +#define CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK BIT(14) +#define CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK BIT(15) + +#define CAL_CSI2_VC_IRQ_FS_IRQ_0_MASK BIT(0) +#define CAL_CSI2_VC_IRQ_FE_IRQ_0_MASK BIT(1) +#define CAL_CSI2_VC_IRQ_LS_IRQ_0_MASK BIT(2) +#define CAL_CSI2_VC_IRQ_LE_IRQ_0_MASK BIT(3) +#define CAL_CSI2_VC_IRQ_CS_IRQ_0_MASK BIT(4) +#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_0_MASK BIT(5) +#define CAL_CSI2_VC_IRQ_FS_IRQ_1_MASK BIT(8) +#define CAL_CSI2_VC_IRQ_FE_IRQ_1_MASK BIT(9) +#define CAL_CSI2_VC_IRQ_LS_IRQ_1_MASK BIT(10) +#define CAL_CSI2_VC_IRQ_LE_IRQ_1_MASK BIT(11) +#define CAL_CSI2_VC_IRQ_CS_IRQ_1_MASK BIT(12) +#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_1_MASK BIT(13) +#define CAL_CSI2_VC_IRQ_FS_IRQ_2_MASK BIT(16) +#define CAL_CSI2_VC_IRQ_FE_IRQ_2_MASK BIT(17) +#define CAL_CSI2_VC_IRQ_LS_IRQ_2_MASK BIT(18) +#define CAL_CSI2_VC_IRQ_LE_IRQ_2_MASK BIT(19) +#define CAL_CSI2_VC_IRQ_CS_IRQ_2_MASK BIT(20) +#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_2_MASK BIT(21) +#define CAL_CSI2_VC_IRQ_FS_IRQ_3_MASK BIT(24) +#define CAL_CSI2_VC_IRQ_FE_IRQ_3_MASK BIT(25) +#define CAL_CSI2_VC_IRQ_LS_IRQ_3_MASK BIT(26) +#define CAL_CSI2_VC_IRQ_LE_IRQ_3_MASK BIT(27) +#define CAL_CSI2_VC_IRQ_CS_IRQ_3_MASK BIT(28) +#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_3_MASK BIT(29)#define CAL_CSI2_CTX_DT_MASK GENMASK(5, 0)#define CAL_CSI2_CTX_VC_MASK GENMASK(7, 6)#define CAL_CSI2_CTX_CPORT_MASK GENMASK(12, 8) -#define CAL_CSI2_CTX_ATT_MASK BIT_MASK(13) +#define CAL_CSI2_CTX_ATT_MASK BIT(13)#define CAL_CSI2_CTX_ATT_PIX 0#define CAL_CSI2_CTX_ATT 1 -#define CAL_CSI2_CTX_PACK_MODE_MASK BIT_MASK(14) +#define CAL_CSI2_CTX_PACK_MODE_MASK BIT(14)#define CAL_CSI2_CTX_PACK_MODE_LINE 0#define CAL_CSI2_CTX_PACK_MODE_FRAME 1#define CAL_CSI2_CTX_LINES_MASK GENMASK(29, 16)
@@ -445,7 +445,7 @@#define CAL_CSI2_PHY_REG0_THS_SETTLE_MASK GENMASK(7, 0)#define CAL_CSI2_PHY_REG0_THS_TERM_MASK GENMASK(15, 8) -#define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_MASK BIT_MASK(24) +#define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_MASK BIT(24)#define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_DISABLE 1#define CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_ENABLE 0
@@ -453,7 +453,7 @@#define CAL_CSI2_PHY_REG1_CTRLCLK_DIV_FACTOR_MASK GENMASK(9, 8)#define CAL_CSI2_PHY_REG1_DPHY_HS_SYNC_PATTERN_MASK GENMASK(17, 10)#define CAL_CSI2_PHY_REG1_TCLK_TERM_MASK GENMASK(24, 18) -#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_MASK BIT_MASK(25) +#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_MASK BIT(25)#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_ERROR 1#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_SUCCESS 0#define CAL_CSI2_PHY_REG1_RESET_DONE_STATUS_MASK GENMASK(29, 28)
@@ -464,13 +464,13 @@#define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC1_MASK GENMASK(29, 28)#define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC0_MASK GENMASK(31, 30) -#define CM_CAMERRX_CTRL_CSI1_CTRLCLKEN_MASK BIT_MASK(0) +#define CM_CAMERRX_CTRL_CSI1_CTRLCLKEN_MASK BIT(0)#define CM_CAMERRX_CTRL_CSI1_CAMMODE_MASK GENMASK(2, 1)#define CM_CAMERRX_CTRL_CSI1_LANEENABLE_MASK GENMASK(4, 3) -#define CM_CAMERRX_CTRL_CSI1_MODE_MASK BIT_MASK(5) -#define CM_CAMERRX_CTRL_CSI0_CTRLCLKEN_MASK BIT_MASK(10) +#define CM_CAMERRX_CTRL_CSI1_MODE_MASK BIT(5) +#define CM_CAMERRX_CTRL_CSI0_CTRLCLKEN_MASK BIT(10)#define CM_CAMERRX_CTRL_CSI0_CAMMODE_MASK GENMASK(12, 11)#define CM_CAMERRX_CTRL_CSI0_LANEENABLE_MASK GENMASK(16, 13) -#define CM_CAMERRX_CTRL_CSI0_MODE_MASK BIT_MASK(17) +#define CM_CAMERRX_CTRL_CSI0_MODE_MASK BIT(17)#endif
Signature · 1 line
2.17.1
PATCH v3 4/20 media: ti-vpe: cal: Add per platform data support
In reply to Benoit ParrotFirst this patch adds a method to access the CTRL_CORE_CAMERRX_CONTROL register to use the syscon mechanism. For backward compatibility we also handle using the existing camerrx_control "reg" entry if a syscon node is not found.
In addition the register bit layout for the CTRL_CORE_CAMERRX_CONTROL changes depending on the device. In order to support this we need to use a register access scheme based on data configuration instead of using static macro.
In this case we make use of the regmap facility and create data set based on the various device and phy available.
--- drivers/media/platform/ti-vpe/cal.c | 282 +++++++++++++++++++++------- 1 file changed, 209 insertions(+), 73 deletions(-)
drivers/media/platform/ti-vpe/cal.c +209 -73
@@ -14,6 +14,8 @@#include <linux/delay.h> #include <linux/pm_runtime.h> #include <linux/slab.h> +#include <linux/mfd/syscon.h> +#include <linux/regmap.h> #include <linux/videodev2.h> #include <linux/of_device.h> #include <linux/of_graph.h>
@@ -220,20 +222,64 @@ struct cal_dmaqueue {int ini_jiffies; }; -struct cm_data { +struct cc_data {void __iomem *base;struct resource *res; -unsigned int camerrx_control; -struct platform_device *pdev; }; -struct cc_data { -void __iomem *base; -struct resource *res; +/* CTRL_CORE_CAMERRX_CONTROL register field id */ +enum cal_camerarx_field { +F_CTRLCLKEN , +F_CAMMODE , +F_LANEENABLE , +F_CSI_MODE , -struct platform_device *pdev; +F_MAX_FIELDS , +}; + +struct cal_csi2_phy { +struct regmap_field *fields[F_MAX_FIELDS ]; +struct reg_field *base_fields; +const int num_lanes; +}; + +struct cal_data { +const int num_csi2_phy; +struct cal_csi2_phy *csi2_phy_core; + +const unsigned int flags; +}; + +static struct reg_field dra72x_ctrl_core_csi0_reg_fields[F_MAX_FIELDS ] = { + [F_CTRLCLKEN ] =REG_FIELD (0 ,10 ,10 ), + [F_CAMMODE ] =REG_FIELD (0 ,11 ,12 ), + [F_LANEENABLE ] =REG_FIELD (0 ,13 ,16 ), + [F_CSI_MODE ] =REG_FIELD (0 ,17 ,17 ), +}; + +static struct reg_field dra72x_ctrl_core_csi1_reg_fields[F_MAX_FIELDS ] = { + [F_CTRLCLKEN ] =REG_FIELD (0 ,0 ,0 ), + [F_CAMMODE ] =REG_FIELD (0 ,1 ,2 ), + [F_LANEENABLE ] =REG_FIELD (0 ,3 ,4 ), + [F_CSI_MODE ] =REG_FIELD (0 ,5 ,5 ), +}; + +static struct cal_csi2_phy dra72x_cal_csi_phy[] = { + { + .base_fields = dra72x_ctrl_core_csi0_reg_fields, + .num_lanes =4 , + }, + { + .base_fields = dra72x_ctrl_core_csi1_reg_fields, + .num_lanes =2 , + }, +}; + +static const struct cal_data dra72x_cal_data = { + .csi2_phy_core = dra72x_cal_csi_phy, + .num_csi2_phy =ARRAY_SIZE (dra72x_cal_csi_phy), };/*
@@ -247,8 +293,15 @@ struct cal_dev {struct platform_device *pdev;struct v4l2_device v4l2_dev; +/* Controller flags for special cases */ +unsigned int flags; + +const struct cal_data *data; +/* Control Module handle */ -struct cm_data *cm; +struct regmap *syscon_camerrx; +u32 syscon_camerrx_offset; +/* Camera Core Module handle */ struct cc_data *cc[CAL_NUM_CSI2_PORTS ];
@@ -359,73 +412,113 @@ static inline void set_field(u32 *valp, u32 field, u32 mask) *valp = val; } -/* -* Control Module block access -*/ -static struct cm_data *cm_create (struct cal_dev *dev) +static u32 cal_data_get_phy_max_lanes (struct cal_ctx *ctx) { -struct platform_device *pdev = dev->pdev; -struct cm_data *cm; +struct cal_dev *dev = ctx->dev; +u32 phy_id = ctx->csi2_port -1 ; - cm =devm_kzalloc (&pdev->dev,sizeof (*cm),GFP_KERNEL ); -if (!cm) -return ERR_PTR (-ENOMEM ); +return dev->data->csi2_phy_core[phy_id].num_lanes; +} - cm->res =platform_get_resource_byname (pdev,IORESOURCE_MEM , -"camerrx_control" ); - cm->base =devm_ioremap_resource (&pdev->dev, cm->res); -if (IS_ERR (cm->base)) { +static u32 cal_data_get_num_csi2_phy (struct cal_dev *dev) +{ +return dev->data->num_csi2_phy; +} + +static int cal_camerarx_regmap_init (struct cal_dev *dev) +{ +struct reg_field *field; +struct cal_csi2_phy *phy; +int i, j; + +if (!dev->data) +return -EINVAL ; + +for (i =0 ; i <cal_data_get_num_csi2_phy (dev); i++) { + phy = &dev->data->csi2_phy_core[i]; +for (j =0 ; j <F_MAX_FIELDS ; j++) { + field = &phy->base_fields[j]; +/* +* Here we update the reg offset with the +* value found in DT +*/ + field->reg = dev->syscon_camerrx_offset; + phy->fields[j] = +devm_regmap_field_alloc (&dev->pdev->dev, + dev->syscon_camerrx, + *field); +if (IS_ERR (phy->fields[j])) { +cal_err (dev,"Unable to allocate regmap fields\n" ); +return PTR_ERR (phy->fields[j]); + } + } + } +return 0 ; +} + +static const struct regmap_config cal_regmap_config = { + .reg_bits =32 , + .val_bits =32 , + .reg_stride =4 , +}; + +static struct regmap *cal_get_camerarx_regmap (struct cal_dev *dev) +{ +struct platform_device *pdev = dev->pdev; +struct regmap *regmap; +void __iomem *base; +u32 reg_io_width; +struct regmap_config r_config = cal_regmap_config; +struct resource *res; + + res =platform_get_resource_byname (pdev,IORESOURCE_MEM , +"camerrx_control" ); + base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (base)) {cal_err (dev,"failed to ioremap\n" ); -return ERR_CAST (cm->base); +return ERR_CAST (base); }cal_dbg (1 , dev,"ioresource %s at %pa - %pa\n" , - cm->res->name, &cm->res->start, &cm->res->end); + res->name, &res->start, &res->end); -return cm; + reg_io_width =4 ; + r_config.reg_stride = reg_io_width; + r_config.val_bits = reg_io_width *8 ; + r_config.max_register =resource_size (res) - reg_io_width; + + regmap =regmap_init_mmio (NULL , base, &r_config); +if (IS_ERR (regmap)) +pr_err ("regmap init failed\n" ); + +return regmap; } +/* +* Control Module CAMERARX block access +*/ static void camerarx_phy_enable (struct cal_ctx *ctx) { -u32 val; - -if (!ctx->dev->cm->base) { -ctx_err (ctx,"cm not mapped\n" ); -return ; - } - - val =reg_read (ctx->dev->cm,CM_CTRL_CORE_CAMERRX_CONTROL ); -if (ctx->csi2_port ==1 ) { -set_field (&val,1 ,CM_CAMERRX_CTRL_CSI0_CTRLCLKEN_MASK ); -set_field (&val,0 ,CM_CAMERRX_CTRL_CSI0_CAMMODE_MASK ); -/* enable all lanes by default */ -set_field (&val,0xf ,CM_CAMERRX_CTRL_CSI0_LANEENABLE_MASK ); -set_field (&val,1 ,CM_CAMERRX_CTRL_CSI0_MODE_MASK ); - }else if (ctx->csi2_port ==2 ) { -set_field (&val,1 ,CM_CAMERRX_CTRL_CSI1_CTRLCLKEN_MASK ); -set_field (&val,0 ,CM_CAMERRX_CTRL_CSI1_CAMMODE_MASK ); -/* enable all lanes by default */ -set_field (&val,0x3 ,CM_CAMERRX_CTRL_CSI1_LANEENABLE_MASK ); -set_field (&val,1 ,CM_CAMERRX_CTRL_CSI1_MODE_MASK ); - } -reg_write (ctx->dev->cm,CM_CTRL_CORE_CAMERRX_CONTROL , val); +struct cal_csi2_phy *phy; +u32 phy_id = ctx->csi2_port -1 ; +u32 max_lanes; + + phy = &ctx->dev->data->csi2_phy_core[phy_id]; +regmap_field_write (phy->fields[F_CAMMODE ],0 ); +/* Always enable all lanes at the phy control level */ + max_lanes = (1 <<cal_data_get_phy_max_lanes (ctx)) -1 ; +regmap_field_write (phy->fields[F_LANEENABLE ], max_lanes); +regmap_field_write (phy->fields[F_CSI_MODE ],1 ); +regmap_field_write (phy->fields[F_CTRLCLKEN ],1 ); }static void camerarx_phy_disable (struct cal_ctx *ctx) { -u32 val; +struct cal_csi2_phy *phy; +u32 phy_id = ctx->csi2_port -1 ; -if (!ctx->dev->cm->base) { -ctx_err (ctx,"cm not mapped\n" ); -return ; - } - - val =reg_read (ctx->dev->cm,CM_CTRL_CORE_CAMERRX_CONTROL ); -if (ctx->csi2_port ==1 ) -set_field (&val,0x0 ,CM_CAMERRX_CTRL_CSI0_CTRLCLKEN_MASK ); -else if (ctx->csi2_port ==2 ) -set_field (&val,0x0 ,CM_CAMERRX_CTRL_CSI1_CTRLCLKEN_MASK ); -reg_write (ctx->dev->cm,CM_CTRL_CORE_CAMERRX_CONTROL , val); + phy = &ctx->dev->data->csi2_phy_core[phy_id]; +regmap_field_write (phy->fields[F_CTRLCLKEN ],0 ); }/*
@@ -508,12 +601,6 @@ static void cal_quickdump_regs(struct cal_dev *dev)resource_size (dev->ctx[1 ]->cc->res), false); } - -cal_info (dev,"CAMERRX_Control Registers @ %pa:\n" , - &dev->cm->res->start); -print_hex_dump (KERN_INFO ,"" ,DUMP_PREFIX_OFFSET ,16 ,4 , - (__force const void *)dev->cm->base, -resource_size (dev->cm->res), false); }/*
@@ -1804,10 +1891,15 @@ static struct cal_ctx *cal_create_instance(struct cal_dev *dev, int inst)return NULL ; } +static const struct of_device_id cal_of_match[]; +static int cal_probe (struct platform_device *pdev) {struct cal_dev *dev;struct cal_ctx *ctx; +struct device_node *parent = pdev->dev.of_node; +struct regmap *syscon_camerrx =NULL ; +u32 syscon_camerrx_offset =0 ;int ret;int irq;int i;
@@ -1816,6 +1908,14 @@ static int cal_probe(struct platform_device *pdev)if (!dev)return -ENOMEM ; + dev->data =of_device_get_match_data (&pdev->dev); +if (!dev->data) { +dev_err (&pdev->dev,"Could not get feature data based on compatible version\n" ); +return -ENODEV ; + } + + dev->flags = dev->data->flags; +/* set pseudo v4l2 device name so we can use v4l2_printk */ strscpy (dev->v4l2_dev.name,CAL_MODULE_NAME ,sizeof (dev->v4l2_dev.name));
@@ -1823,6 +1923,38 @@ static int cal_probe(struct platform_device *pdev)/* save pdev pointer */ dev->pdev = pdev; + syscon_camerrx =syscon_regmap_lookup_by_phandle (parent, +"ti,camerrx-control" ); + ret =of_property_read_u32_index (parent,"ti,camerrx-control" ,1 , + &syscon_camerrx_offset); +if (IS_ERR (syscon_camerrx)) + ret =PTR_ERR (syscon_camerrx); +if (ret) { +dev_warn (&pdev->dev,"failed to get ti,camerrx-control: %d\n" , + ret); + +/* +* Backward DTS compatibility. +* If syscon entry is not present then check if the +* camerrx_control resource is present. +*/ + syscon_camerrx =cal_get_camerarx_regmap (dev); +if (IS_ERR (syscon_camerrx)) { +dev_err (&pdev->dev,"failed to get camerrx_control regmap\n" ); +return PTR_ERR (syscon_camerrx); + } +/* In this case the base already point to the direct +* CM register so no need for an offset +*/ + syscon_camerrx_offset =0 ; + } + + dev->syscon_camerrx = syscon_camerrx; + dev->syscon_camerrx_offset = syscon_camerrx_offset; + ret =cal_camerarx_regmap_init (dev); +if (ret) +return ret; + dev->res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"cal_top" ); dev->base =devm_ioremap_resource (&pdev->dev, dev->res);
@@ -1841,23 +1973,24 @@ static int cal_probe(struct platform_device *pdev)platform_set_drvdata (pdev, dev); - dev->cm =cm_create (dev); -if (IS_ERR (dev->cm)) -return PTR_ERR (dev->cm); - dev->cc[0 ] =cc_create (dev,0 );if (IS_ERR (dev->cc[0 ]))return PTR_ERR (dev->cc[0 ]); - dev->cc[1 ] =cc_create (dev,1 ); -if (IS_ERR (dev->cc[1 ])) -return PTR_ERR (dev->cc[1 ]); +if (cal_data_get_num_csi2_phy (dev) >1 ) { + dev->cc[1 ] =cc_create (dev,1 ); +if (IS_ERR (dev->cc[1 ])) +return PTR_ERR (dev->cc[1 ]); + }else { + dev->cc[1 ] =NULL ; + } dev->ctx[0 ] =NULL ; dev->ctx[1 ] =NULL ; dev->ctx[0 ] =cal_create_instance (dev,0 ); - dev->ctx[1 ] =cal_create_instance (dev,1 ); +if (cal_data_get_num_csi2_phy (dev) >1 ) + dev->ctx[1 ] =cal_create_instance (dev,1 );if (!dev->ctx[0 ] && !dev->ctx[1 ]) {cal_err (dev,"Neither port is configured, no point in staying up\n" );return -ENODEV ;
@@ -1924,7 +2057,10 @@ static int cal_remove(struct platform_device *pdev)#if defined(CONFIG_OF )static const struct of_device_id cal_of_match[] = { - { .compatible ="ti,dra72-cal" , }, + { + .compatible ="ti,dra72-cal" , + .data = (void *)&dra72x_cal_data, + }, {}, };MODULE_DEVICE_TABLE (of, cal_of_match);
Signature · 1 line
2.17.1
PATCH v3 5/20 media: ti-vpe: cal: Enable DMABUF export
In reply to Benoit ParrotAllow CAL to be able to export DMA buffer.
--- drivers/media/platform/ti-vpe/cal.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/ti-vpe/cal.c +1 -0
@@ -1486,6 +1486,7 @@ static const struct v4l2_ioctl_ops cal_ioctl_ops = { .vidioc_querybuf = vb2_ioctl_querybuf, .vidioc_qbuf = vb2_ioctl_qbuf, .vidioc_dqbuf = vb2_ioctl_dqbuf, + .vidioc_expbuf = vb2_ioctl_expbuf, .vidioc_enum_input = cal_enum_input, .vidioc_g_input = cal_g_input, .vidioc_s_input = cal_s_input,
Signature · 1 line
2.17.1
PATCH v3 6/20 media: ti-vpe: cal: Restrict DMA to avoid memory corruption
In reply to Benoit ParrotFrom: Nikhil Devshatwar <[email protected]>
When setting DMA for video capture from CSI channel, if the DMA size is not given, it ends up writing as much data as sent by the camera.
This may lead to overwriting the buffers causing memory corruption. Observed green lines on the default framebuffer.
Restrict the DMA to maximum height as specified in the S_FMT ioctl.
--- drivers/media/platform/ti-vpe/cal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/platform/ti-vpe/cal.c +4 -2
@@ -767,12 +767,13 @@ static void pix_proc_config(struct cal_ctx *ctx) }static void cal_wr_dma_config (struct cal_ctx *ctx, -unsigned int width) +unsigned int width,unsigned int height) {u32 val; val =reg_read (ctx->dev,CAL_WR_DMA_CTRL (ctx->csi2_port));set_field (&val, ctx->csi2_port,CAL_WR_DMA_CTRL_CPORT_MASK ); +set_field (&val, height,CAL_WR_DMA_CTRL_YSIZE_MASK );set_field (&val,CAL_WR_DMA_CTRL_DTAG_PIX_DAT ,CAL_WR_DMA_CTRL_DTAG_MASK ); set_field(&val, CAL_WR_DMA_CTRL_MODE_CONST,
@@ -1395,7 +1396,8 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)csi2_lane_config (ctx);csi2_ctx_config (ctx);pix_proc_config (ctx); -cal_wr_dma_config (ctx, ctx->v_fmt.fmt.pix.bytesperline); +cal_wr_dma_config (ctx, ctx->v_fmt.fmt.pix.bytesperline, + ctx->v_fmt.fmt.pix.height);cal_wr_dma_addr (ctx, addr);csi2_ppi_enable (ctx);
Signature · 1 line
2.17.1
PATCH v3 7/20 dt-bindings: media: cal: update binding to add PHY LDO errata support
In reply to Benoit ParrotUpdate Device Tree bindings for the CAL driver to add support for the CSI2 PHY LDO errata workaround for pre-es2 devices.
--- Documentation/devicetree/bindings/media/ti-cal.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/media/ti-cal.txt +3 -1
@@ -7,7 +7,9 @@ processing capability to connect CSI2 image-sensor modules to the DRA72x device. Required properties: -- compatible: must be "ti,dra72-cal" +- compatible: + Should be "ti,dra72-cal", for DRA72 controllers + Should be "ti,dra72-pre-es2-cal", for DRA72 controllers pre ES2.0 - 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
Signature · 1 line
2.17.1
PATCH v3 8/20 media: ti-vpe: cal: add CSI2 PHY LDO errata support
In reply to Benoit ParrotApply Errata i913 every time the functional clock is enabled. This should take care of suspend/resume case as well.
--- drivers/media/platform/ti-vpe/cal.c | 57 +++++++++++++++++++++++- drivers/media/platform/ti-vpe/cal_regs.h | 27 +++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-)
drivers/media/platform/ti-vpe/cal.c +55 -2
@@ -282,6 +282,12 @@ static const struct cal_data dra72x_cal_data = { .num_csi2_phy = ARRAY_SIZE(dra72x_cal_csi_phy), }; +static const struct cal_data dra72x_es1_cal_data = { + .csi2_phy_core = dra72x_cal_csi_phy, + .num_csi2_phy =ARRAY_SIZE (dra72x_cal_csi_phy), + .flags =DRA72_CAL_PRE_ES2_LDO_DISABLE , +}; +/* * there is one cal_dev structure in the driver, it is shared by * all instances.
@@ -567,9 +573,52 @@ static void cal_get_hwinfo(struct cal_dev *dev) hwinfo); } -static inline int cal_runtime_get (struct cal_dev *dev) +/* +* Errata i913: CSI2 LDO Needs to be disabled when module is powered on +* +* Enabling CSI2 LDO shorts it to core supply. It is crucial the 2 CSI2 +* LDOs on the device are disabled if CSI-2 module is powered on +* (0x4845 B304 | 0x4845 B384 [28:27] = 0x1) or in ULPS (0x4845 B304 +* | 0x4845 B384 [28:27] = 0x2) mode. Common concerns include: high +* current draw on the module supply in active mode. +* +* Errata does not apply when CSI-2 module is powered off +* (0x4845 B304 | 0x4845 B384 [28:27] = 0x0). +* +* SW Workaround: +* Set the following register bits to disable the LDO, +* which is essentially CSI2 REG10 bit 6: +* +* Core 0: 0x4845 B828 = 0x0000 0040 +* Core 1: 0x4845 B928 = 0x0000 0040 +*/ +static void i913_errata (struct cal_dev *dev,unsigned int port) { -return pm_runtime_get_sync (&dev->pdev->dev); +u32 reg10 =reg_read (dev->cc[port],CAL_CSI2_PHY_REG10 ); + +set_field (®10,CAL_CSI2_PHY_REG0_HSCLOCKCONFIG_DISABLE , +CAL_CSI2_PHY_REG10_I933_LDO_DISABLE_MASK ); + +cal_dbg (1 , dev,"CSI2_%d_REG10 = 0x%08x\n" , port, reg10); +reg_write (dev->cc[port],CAL_CSI2_PHY_REG10 , reg10); +} + +static int cal_runtime_get (struct cal_dev *dev) +{ +int r; + + r =pm_runtime_get_sync (&dev->pdev->dev); + +if (dev->flags &DRA72_CAL_PRE_ES2_LDO_DISABLE ) { +/* +* Apply errata on both port eveytime we (re-)enable +* the clock +*/ +i913_errata (dev,0 ); +i913_errata (dev,1 ); + } + +return r; }static inline void cal_runtime_put (struct cal_dev *dev)
@@ -2064,6 +2113,10 @@ static const struct of_device_id cal_of_match[] = { .compatible = "ti,dra72-cal", .data = (void *)&dra72x_cal_data, }, + { + .compatible = "ti,dra72-pre-es2-cal", + .data = (void *)&dra72x_es1_cal_data, + }, {}, };MODULE_DEVICE_TABLE (of, cal_of_match);
drivers/media/platform/ti-vpe/cal_regs.h +27 -0
@@ -10,6 +10,30 @@#ifndef __TI_CAL_REGS_H#define __TI_CAL_REGS_H +/* +* struct cal_dev.flags possibilities +* +* DRA72_CAL_PRE_ES2_LDO_DISABLE: +* Errata i913: CSI2 LDO Needs to be disabled when module is powered on +* +* Enabling CSI2 LDO shorts it to core supply. It is crucial the 2 CSI2 +* LDOs on the device are disabled if CSI-2 module is powered on +* (0x4845 B304 | 0x4845 B384 [28:27] = 0x1) or in ULPS (0x4845 B304 +* | 0x4845 B384 [28:27] = 0x2) mode. Common concerns include: high +* current draw on the module supply in active mode. +* +* Errata does not apply when CSI-2 module is powered off +* (0x4845 B304 | 0x4845 B384 [28:27] = 0x0). +* +* SW Workaround: +* Set the following register bits to disable the LDO, +* which is essentially CSI2 REG10 bit 6: +* +* Core 0: 0x4845 B828 = 0x0000 0040 +* Core 1: 0x4845 B928 = 0x0000 0040 +*/ +#define DRA72_CAL_PRE_ES2_LDO_DISABLE BIT(0) +#define CAL_NUM_CSI2_PORTS 2/* CAL register offsets */
@@ -71,6 +95,7 @@#define CAL_CSI2_PHY_REG0 0x000#define CAL_CSI2_PHY_REG1 0x004#define CAL_CSI2_PHY_REG2 0x008 +#define CAL_CSI2_PHY_REG10 0x028/* CAL Control Module Core Camerrx Control register offsets */ #define CM_CTRL_CORE_CAMERRX_CONTROL 0x000
@@ -458,6 +483,8 @@#define CAL_CSI2_PHY_REG1_CLOCK_MISS_DETECTOR_STATUS_SUCCESS 0#define CAL_CSI2_PHY_REG1_RESET_DONE_STATUS_MASK GENMASK(29, 28) +#define CAL_CSI2_PHY_REG10_I933_LDO_DISABLE_MASK BIT(6) +#define CAL_CSI2_PHY_REG2_CCP2_SYNC_PATTERN_MASK GENMASK(23, 0)#define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC3_MASK GENMASK(25, 24)#define CAL_CSI2_PHY_REG2_TRIGGER_CMD_RXTRIGESC2_MASK GENMASK(27, 26)
Signature · 1 line
2.17.1
PATCH v3 9/20 media: ti-vpe: cal: Fix ths_term/ths_settle parameters
In reply to Benoit ParrotThe current method to calculate the ddr clk period is wrong. Therefore the ths_term calculation is incorrect. Also it was wrongly assumed that the ths_settle parameter was based on the control clock instead of the pixel clock.
Since the DPHY can tolerate quite a bit a of variation, capture was still mostly working with the 2 tested modes when the pixel clock was close to the control clock (i.e. 96 Mhz). But it would quickly stops working when using different modes or when customers used different sensors altogether.
Calculating the DDRClk period needs to take into account the pixel bit width and the number of active data lanes.
Based on the latest technical reference manual these parameters should now be calculated as follows:
THS_TERM: Programmed value = floor(20 ns/DDRClk period)THS_SETTLE: Programmed value = floor(105 ns/DDRClk period) + 4
Also originally 'depth' was used to represent the number of bits a pixel would use once stored in memory (i.e. the container size). To accurately calculate the THS_* parameters we need to use the actual number of bits per pixels coming in from the sensor. So we are renaming 'depth' to 'bpp' (bits per pixels) and update the format table to show the actual number of bits per pixel being received.
The "container" size will be derived from the "bpp" value.
--- drivers/media/platform/ti-vpe/cal.c | 98 +++++++++++++---------------- 1 file changed, 44 insertions(+), 54 deletions(-)
drivers/media/platform/ti-vpe/cal.c +44 -54
@@ -73,8 +73,6 @@ static const struct v4l2_fract#define CAL_NUM_INPUT 1#define CAL_NUM_CONTEXT 2 -#define bytes_per_line (pixel, bpp) (ALIGN(pixel * bpp, 16)) -#define reg_read (dev, offset) ioread32(dev->base + offset)#define reg_write (dev, offset, val) iowrite32(val, dev->base + offset)
@@ -93,102 +91,103 @@ static const struct v4l2_fractstruct cal_fmt {u32 fourcc;u32 code; -u8 depth; +/* Bits per pixel */ +u8 bpp; };static struct cal_fmt cal_formats[] = { { .fourcc =V4L2_PIX_FMT_YUYV , .code =MEDIA_BUS_FMT_YUYV8_2X8 , - .depth =16 , + .bpp =16 , }, { .fourcc =V4L2_PIX_FMT_UYVY , .code =MEDIA_BUS_FMT_UYVY8_2X8 , - .depth =16 , + .bpp =16 , }, { .fourcc =V4L2_PIX_FMT_YVYU , .code =MEDIA_BUS_FMT_YVYU8_2X8 , - .depth =16 , + .bpp =16 , }, { .fourcc =V4L2_PIX_FMT_VYUY , .code =MEDIA_BUS_FMT_VYUY8_2X8 , - .depth =16 , + .bpp =16 , }, { .fourcc =V4L2_PIX_FMT_RGB565 ,/* gggbbbbb rrrrrggg */ .code =MEDIA_BUS_FMT_RGB565_2X8_LE , - .depth =16 , + .bpp =16 , }, { .fourcc =V4L2_PIX_FMT_RGB565X ,/* rrrrrggg gggbbbbb */ .code =MEDIA_BUS_FMT_RGB565_2X8_BE , - .depth =16 , + .bpp =16 , }, { .fourcc =V4L2_PIX_FMT_RGB555 ,/* gggbbbbb arrrrrgg */ .code =MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE , - .depth =16 , + .bpp =16 , }, { .fourcc =V4L2_PIX_FMT_RGB555X ,/* arrrrrgg gggbbbbb */ .code =MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE , - .depth =16 , + .bpp =16 , }, { .fourcc =V4L2_PIX_FMT_RGB24 ,/* rgb */ .code =MEDIA_BUS_FMT_RGB888_2X12_LE , - .depth =24 , + .bpp =24 , }, { .fourcc =V4L2_PIX_FMT_BGR24 ,/* bgr */ .code =MEDIA_BUS_FMT_RGB888_2X12_BE , - .depth =24 , + .bpp =24 , }, { .fourcc =V4L2_PIX_FMT_RGB32 ,/* argb */ .code =MEDIA_BUS_FMT_ARGB8888_1X32 , - .depth =32 , + .bpp =32 , }, { .fourcc =V4L2_PIX_FMT_SBGGR8 , .code =MEDIA_BUS_FMT_SBGGR8_1X8 , - .depth =8 , + .bpp =8 , }, { .fourcc =V4L2_PIX_FMT_SGBRG8 , .code =MEDIA_BUS_FMT_SGBRG8_1X8 , - .depth =8 , + .bpp =8 , }, { .fourcc =V4L2_PIX_FMT_SGRBG8 , .code =MEDIA_BUS_FMT_SGRBG8_1X8 , - .depth =8 , + .bpp =8 , }, { .fourcc =V4L2_PIX_FMT_SRGGB8 , .code =MEDIA_BUS_FMT_SRGGB8_1X8 , - .depth =8 , + .bpp =8 , }, { .fourcc =V4L2_PIX_FMT_SBGGR10 , .code =MEDIA_BUS_FMT_SBGGR10_1X10 , - .depth =16 , + .bpp =10 , }, { .fourcc =V4L2_PIX_FMT_SGBRG10 , .code =MEDIA_BUS_FMT_SGBRG10_1X10 , - .depth =16 , + .bpp =10 , }, { .fourcc =V4L2_PIX_FMT_SGRBG10 , .code =MEDIA_BUS_FMT_SGRBG10_1X10 , - .depth =16 , + .bpp =10 , }, { .fourcc =V4L2_PIX_FMT_SRGGB10 , .code =MEDIA_BUS_FMT_SRGGB10_1X10 , - .depth =16 , + .bpp =10 , }, { .fourcc =V4L2_PIX_FMT_SBGGR12 , .code =MEDIA_BUS_FMT_SBGGR12_1X12 , - .depth =16 , + .bpp =12 , }, { .fourcc =V4L2_PIX_FMT_SGBRG12 , .code =MEDIA_BUS_FMT_SGBRG12_1X12 , - .depth =16 , + .bpp =12 , }, { .fourcc =V4L2_PIX_FMT_SGRBG12 , .code =MEDIA_BUS_FMT_SGRBG12_1X12 , - .depth =16 , + .bpp =12 , }, { .fourcc =V4L2_PIX_FMT_SRGGB12 , .code =MEDIA_BUS_FMT_SRGGB12_1X12 , - .depth =16 , + .bpp =12 , }, };
@@ -870,41 +869,28 @@ static void cal_wr_dma_addr(struct cal_ctx *ctx, unsigned int dmaaddr)#define TCLK_TERM 0#define TCLK_MISS 1#define TCLK_SETTLE 14 -#define THS_SETTLE 15static void csi2_phy_config (struct cal_ctx *ctx) {unsigned int reg0, reg1;unsigned int ths_term, ths_settle; -unsigned int ddrclkperiod_us; +unsigned int csi2_ddrclk_khz; +struct v4l2_fwnode_bus_mipi_csi2 *mipi_csi2 = + &ctx->endpoint.bus.mipi_csi2; +u32 num_lanes = mipi_csi2->num_data_lanes; -/* -* THS_TERM: Programmed value = floor(20 ns/DDRClk period) - 2. -*/ - ddrclkperiod_us = ctx->external_rate /2000000 ; - ddrclkperiod_us =1000000 / ddrclkperiod_us; -ctx_dbg (1 , ctx,"ddrclkperiod_us: %d\n" , ddrclkperiod_us); +/* DPHY timing configuration */ +/* CSI-2 is DDR and we only count used lanes. */ + csi2_ddrclk_khz = ctx->external_rate /1000 + / (2 * num_lanes) * ctx->fmt->bpp; +ctx_dbg (1 , ctx,"csi2_ddrclk_khz: %d\n" , csi2_ddrclk_khz); - ths_term =20000 / ddrclkperiod_us; - ths_term = (ths_term >=2 ) ? ths_term -2 : ths_term; +/* THS_TERM: Programmed value = floor(20 ns/DDRClk period) */ + ths_term =20 * csi2_ddrclk_khz /1000000 ;ctx_dbg (1 , ctx,"ths_term: %d (0x%02x)\n" , ths_term, ths_term); -/* -* THS_SETTLE: Programmed value = floor(176.3 ns/CtrlClk period) - 1. -* Since CtrlClk is fixed at 96Mhz then we get -* ths_settle = floor(176.3 / 10.416) - 1 = 15 -* If we ever switch to a dynamic clock then this code might be useful -* -* unsigned int ctrlclkperiod_us; -* ctrlclkperiod_us = 96000000 / 1000000; -* ctrlclkperiod_us = 1000000 / ctrlclkperiod_us; -* ctx_dbg(1, ctx, "ctrlclkperiod_us: %d\n", ctrlclkperiod_us); - -* ths_settle = 176300 / ctrlclkperiod_us; -* ths_settle = (ths_settle > 1) ? ths_settle - 1 : ths_settle; -*/ - - ths_settle =THS_SETTLE ; +/* THS_SETTLE: Programmed value = floor(105 ns/DDRClk period) + 4 */ + ths_settle = (105 * csi2_ddrclk_khz /1000000 ) +4 ;ctx_dbg (1 , ctx,"ths_settle: %d (0x%02x)\n" , ths_settle, ths_settle); reg0 =reg_read (ctx->cc,CAL_CSI2_PHY_REG0 );
@@ -1116,6 +1102,8 @@ static int cal_calc_format_size(struct cal_ctx *ctx,const struct cal_fmt *fmt, struct v4l2_format *f) { + u32 bpl; +if (!fmt) {ctx_dbg (3 , ctx,"No cal_fmt provided!\n" );return -EINVAL ;
@@ -1123,8 +1111,10 @@ static int cal_calc_format_size(struct cal_ctx *ctx,v4l_bound_align_image (&f->fmt.pix.width,48 ,MAX_WIDTH ,2 , &f->fmt.pix.height,32 ,MAX_HEIGHT ,0 ,0 ); - f->fmt.pix.bytesperline =bytes_per_line (f->fmt.pix.width, - fmt->depth >>3 ); + + bpl = (f->fmt.pix.width *ALIGN (fmt->bpp,8 )) >>3 ; + f->fmt.pix.bytesperline =ALIGN (bpl,16 ); + f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
Signature · 1 line
2.17.1
PATCH v3 10/20 media: ti-vpe: cal: Fix pixel processing parameters
In reply to Benoit ParrotThe pixel processing unit was hard coded to only handle 8 bits per pixel from input to output.
We now add handling for 10, 12 and 16 bits per pixel at the source and setting the in-memory size (i.e. container size) to 16 bits for these 3 cases.
--- drivers/media/platform/ti-vpe/cal.c | 41 ++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-)
drivers/media/platform/ti-vpe/cal.c +38 -3
@@ -800,13 +800,48 @@ static void csi2_ctx_config(struct cal_ctx *ctx)static void pix_proc_config (struct cal_ctx *ctx) { -u32 val; +u32 val, extract, pack; + +switch (ctx->fmt->bpp) { +case 8 : + extract =CAL_PIX_PROC_EXTRACT_B8 ; + pack =CAL_PIX_PROC_PACK_B8 ; +break ; +case 10 : + extract =CAL_PIX_PROC_EXTRACT_B10_MIPI ; + pack =CAL_PIX_PROC_PACK_B16 ; +break ; +case 12 : + extract =CAL_PIX_PROC_EXTRACT_B12_MIPI ; + pack =CAL_PIX_PROC_PACK_B16 ; +break ; +case 16 : + extract =CAL_PIX_PROC_EXTRACT_B16_LE ; + pack =CAL_PIX_PROC_PACK_B16 ; +break ; +default : +/* +* If you see this warning then it means that you added +* some new entry in the cal_formats[] array with a different +* bit per pixel values then the one supported below. +* Either add support for the new bpp value below or adjust +* the new entry to use one of the value below. +* +* Instead of failing here just use 8 bpp as a default. +*/ +dev_warn_once (&ctx->dev->pdev->dev, +"%s:%d:%s: bpp:%d unsupported! Overwritten with 8.\n" , + __FILE__, __LINE__, __func__, ctx->fmt->bpp); + extract =CAL_PIX_PROC_EXTRACT_B8 ; + pack =CAL_PIX_PROC_PACK_B8 ; +break ; + } val =reg_read (ctx->dev,CAL_PIX_PROC (ctx->csi2_port)); -set_field (&val,CAL_PIX_PROC_EXTRACT_B8 ,CAL_PIX_PROC_EXTRACT_MASK ); +set_field (&val, extract,CAL_PIX_PROC_EXTRACT_MASK );set_field (&val,CAL_PIX_PROC_DPCMD_BYPASS ,CAL_PIX_PROC_DPCMD_MASK );set_field (&val,CAL_PIX_PROC_DPCME_BYPASS ,CAL_PIX_PROC_DPCME_MASK ); -set_field (&val,CAL_PIX_PROC_PACK_B8 ,CAL_PIX_PROC_PACK_MASK ); +set_field (&val, pack,CAL_PIX_PROC_PACK_MASK );set_field (&val, ctx->csi2_port,CAL_PIX_PROC_CPORT_MASK );set_field (&val,CAL_GEN_ENABLE ,CAL_PIX_PROC_EN_MASK );reg_write (ctx->dev,CAL_PIX_PROC (ctx->csi2_port), val);
Signature · 1 line
2.17.1
PATCH v3 11/20 media: ti-vpe: cal: Align DPHY init sequence with docs
In reply to Benoit ParrotThe current CSI2 DPHY initialization sequence although functional does not match with the documented sequence in the Technical Reference Manual.
This may affect capture re-startability in stop/start situations.
--- drivers/media/platform/ti-vpe/cal.c | 199 ++++++++++++++++++++++++---- 1 file changed, 172 insertions(+), 27 deletions(-)
drivers/media/platform/ti-vpe/cal.c +172 -27
@@ -686,29 +686,76 @@ static void disable_irqs(struct cal_ctx *ctx)reg_write (ctx->dev,CAL_CSI2_VC_IRQENABLE (1 ),0 ); } -static void csi2_init (struct cal_ctx *ctx) +static void csi2_phy_config (struct cal_ctx *ctx); + +static void csi2_phy_init (struct cal_ctx *ctx) {int i;u32 val; +/* Steps +* 1. Configure D-PHY mode and enable required lanes +* 2. Reset complex IO - Wait for completion of reset +* Note if the external sensor is not sending byte clock, +* the reset will timeout +* 3 Program Stop States +* A. Program THS_TERM, THS_SETTLE, etc... Timings parameters +* in terms of DDR clock periods +* B. Enable stop state transition timeouts +* 4.Force FORCERXMODE +* D. Enable pull down using pad control +* E. Power up PHY +* F. Wait for power up completion +* G. Wait for all enabled lane to reach stop state +* H. Disable pull down using pad control +*/ + +/* 1. Configure D-PHY mode and enable required lanes */ +camerarx_phy_enable (ctx); + +/* 2. Reset complex IO - Do not wait for reset completion */ + val =reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port)); +set_field (&val,CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_OPERATIONAL , +CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK ); +reg_write (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port), val); +ctx_dbg (3 , ctx,"CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x De-assert Complex IO Reset\n" , + ctx->csi2_port, +reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port))); + +/* Dummy read to allow SCP to complete */ + val =reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port)); + +/* 3.A. Program Phy Timing Parameters */ +csi2_phy_config (ctx); + +/* 3.B. Program Stop States */ val =reg_read (ctx->dev,CAL_CSI2_TIMING (ctx->csi2_port)); -set_field (&val,CAL_GEN_ENABLE , -CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK );set_field (&val,CAL_GEN_ENABLE ,CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK );set_field (&val,CAL_GEN_DISABLE ,CAL_CSI2_TIMING_STOP_STATE_X4_IO1_MASK );set_field (&val,407 ,CAL_CSI2_TIMING_STOP_STATE_COUNTER_IO1_MASK );reg_write (ctx->dev,CAL_CSI2_TIMING (ctx->csi2_port), val); -ctx_dbg (3 , ctx,"CAL_CSI2_TIMING(%d) = 0x%08x\n" , ctx->csi2_port, +ctx_dbg (3 , ctx,"CAL_CSI2_TIMING(%d) = 0x%08x Stop States\n" , + ctx->csi2_port, +reg_read (ctx->dev,CAL_CSI2_TIMING (ctx->csi2_port))); + +/* 4. Force FORCERXMODE */ + val =reg_read (ctx->dev,CAL_CSI2_TIMING (ctx->csi2_port)); +set_field (&val,CAL_GEN_ENABLE , +CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK ); +reg_write (ctx->dev,CAL_CSI2_TIMING (ctx->csi2_port), val); +ctx_dbg (3 , ctx,"CAL_CSI2_TIMING(%d) = 0x%08x Force RXMODE\n" , + ctx->csi2_port,reg_read (ctx->dev,CAL_CSI2_TIMING (ctx->csi2_port))); +/* E. Power up the PHY using the complex IO */ val =reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port)); -set_field (&val,CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_OPERATIONAL , -CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK );set_field (&val,CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_ON ,CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_MASK );reg_write (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port), val); + +/* F. Wait for power up completion */ for (i =0 ; i <10 ; i++) { if (reg_read_field(ctx->dev, CAL_CSI2_COMPLEXIO_CFG(ctx->csi2_port),
@@ -717,18 +764,104 @@ static void csi2_init(struct cal_ctx *ctx)break ;usleep_range (1000 ,1100 ); } -ctx_dbg (3 , ctx,"CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x\n" , ctx->csi2_port, -reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port))); +ctx_dbg (3 , ctx,"CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x Powered UP %s\n" , + ctx->csi2_port, +reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port)), + (i >=10 ) ?"(timeout)" :"" ); +} - val =reg_read (ctx->dev,CAL_CTRL ); -set_field (&val,CAL_CTRL_BURSTSIZE_BURST128 ,CAL_CTRL_BURSTSIZE_MASK ); -set_field (&val,0xF ,CAL_CTRL_TAGCNT_MASK ); -set_field (&val,CAL_CTRL_POSTED_WRITES_NONPOSTED , -CAL_CTRL_POSTED_WRITES_MASK ); -set_field (&val,0xFF ,CAL_CTRL_MFLAGL_MASK ); -set_field (&val,0xFF ,CAL_CTRL_MFLAGH_MASK ); -reg_write (ctx->dev,CAL_CTRL , val); -ctx_dbg (3 , ctx,"CAL_CTRL = 0x%08x\n" ,reg_read (ctx->dev,CAL_CTRL )); +static void csi2_wait_for_phy (struct cal_ctx *ctx) +{ +int i; + +/* Steps +* 2. Wait for completion of reset +* Note if the external sensor is not sending byte clock, +* the reset will timeout +* 4.Force FORCERXMODE +* G. Wait for all enabled lane to reach stop state +* H. Disable pull down using pad control +*/ + +/* 2. Wait for reset completion */ +for (i =0 ; i <250 ; i++) { +if (reg_read_field (ctx->dev, +CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port), +CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_MASK ) == +CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETCOMPLETED ) +break ; +usleep_range (1000 ,1100 ); + } +ctx_dbg (3 , ctx,"CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x Complex IO Reset Done (%d) %s\n" , + ctx->csi2_port, +reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port)), i, + (i >=250 ) ?"(timeout)" :"" ); + +/* 4. G. Wait for all enabled lane to reach stop state */ +for (i =0 ; i <10 ; i++) { +if (reg_read_field (ctx->dev, +CAL_CSI2_TIMING (ctx->csi2_port), +CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK ) == +CAL_GEN_DISABLE ) +break ; +usleep_range (1000 ,1100 ); + } +ctx_dbg (3 , ctx,"CAL_CSI2_TIMING(%d) = 0x%08x Stop State Reached %s\n" , + ctx->csi2_port, +reg_read (ctx->dev,CAL_CSI2_TIMING (ctx->csi2_port)), + (i >=10 ) ?"(timeout)" :"" ); + +ctx_dbg (1 , ctx,"CSI2_%d_REG1 = 0x%08x (Bit(31,28) should be set!)\n" , + (ctx->csi2_port -1 ),reg_read (ctx->cc,CAL_CSI2_PHY_REG1 )); +} + +static void csi2_phy_deinit (struct cal_ctx *ctx) +{ +int i; +u32 val; + +/* Power down the PHY using the complex IO */ + val =reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port)); +set_field (&val,CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_STATE_OFF , +CAL_CSI2_COMPLEXIO_CFG_PWR_CMD_MASK ); +reg_write (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port), val); + +/* Wait for power down completion */ +for (i =0 ; i <10 ; i++) { +if (reg_read_field (ctx->dev, +CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port), +CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_MASK ) == +CAL_CSI2_COMPLEXIO_CFG_PWR_STATUS_STATE_OFF ) +break ; +usleep_range (1000 ,1100 ); + } +ctx_dbg (3 , ctx,"CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x Powered Down %s\n" , + ctx->csi2_port, +reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port)), + (i >=10 ) ?"(timeout)" :"" ); + +/* Assert Comple IO Reset */ + val =reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port)); +set_field (&val,CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL , +CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK ); +reg_write (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port), val); + +/* Wait for power down completion */ +for (i =0 ; i <10 ; i++) { +if (reg_read_field (ctx->dev, +CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port), +CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_MASK ) == +CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETONGOING ) +break ; +usleep_range (1000 ,1100 ); + } +ctx_dbg (3 , ctx,"CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x Complex IO in Reset (%d) %s\n" , + ctx->csi2_port, +reg_read (ctx->dev,CAL_CSI2_COMPLEXIO_CFG (ctx->csi2_port)), i, + (i >=10 ) ?"(timeout)" :"" ); + +/* Disable the phy */ +camerarx_phy_disable (ctx); }static void csi2_lane_config (struct cal_ctx *ctx)
@@ -891,6 +1024,16 @@ static void cal_wr_dma_config(struct cal_ctx *ctx,reg_write (ctx->dev,CAL_WR_DMA_XSIZE (ctx->csi2_port), val);ctx_dbg (3 , ctx,"CAL_WR_DMA_XSIZE(%d) = 0x%08x\n" , ctx->csi2_port,reg_read (ctx->dev,CAL_WR_DMA_XSIZE (ctx->csi2_port))); + + val =reg_read (ctx->dev,CAL_CTRL ); +set_field (&val,CAL_CTRL_BURSTSIZE_BURST128 ,CAL_CTRL_BURSTSIZE_MASK ); +set_field (&val,0xF ,CAL_CTRL_TAGCNT_MASK ); +set_field (&val,CAL_CTRL_POSTED_WRITES_NONPOSTED , +CAL_CTRL_POSTED_WRITES_MASK ); +set_field (&val,0xFF ,CAL_CTRL_MFLAGL_MASK ); +set_field (&val,0xFF ,CAL_CTRL_MFLAGH_MASK ); +reg_write (ctx->dev,CAL_CTRL , val); +ctx_dbg (3 , ctx,"CAL_CTRL = 0x%08x\n" ,reg_read (ctx->dev,CAL_CTRL )); }static void cal_wr_dma_addr (struct cal_ctx *ctx,unsigned int dmaaddr)
@@ -1463,17 +1606,14 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)cal_runtime_get (ctx->dev); -enable_irqs (ctx); -camerarx_phy_enable (ctx); -csi2_init (ctx); -csi2_phy_config (ctx); -csi2_lane_config (ctx);csi2_ctx_config (ctx);pix_proc_config (ctx);cal_wr_dma_config (ctx, ctx->v_fmt.fmt.pix.bytesperline, ctx->v_fmt.fmt.pix.height); -cal_wr_dma_addr (ctx, addr); -csi2_ppi_enable (ctx); +csi2_lane_config (ctx); + +enable_irqs (ctx); +csi2_phy_init (ctx); ret =v4l2_subdev_call (ctx->sensor, video, s_stream,1 );if (ret) {
@@ -1482,6 +1622,10 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count) goto err; } +csi2_wait_for_phy (ctx); +cal_wr_dma_addr (ctx, addr); +csi2_ppi_enable (ctx); +if (debug >=4 )cal_quickdump_regs (ctx->dev);
@@ -1502,11 +1646,12 @@ static void cal_stop_streaming(struct vb2_queue *vq)struct cal_buffer *buf, *tmp;unsigned long flags; -if (v4l2_subdev_call (ctx->sensor, video, s_stream,0 )) -ctx_err (ctx,"stream off failed in subdev\n" ); -csi2_ppi_disable (ctx);disable_irqs (ctx); +csi2_phy_deinit (ctx); + +if (v4l2_subdev_call (ctx->sensor, video, s_stream,0 )) +ctx_err (ctx,"stream off failed in subdev\n" );/* Release all active buffers */ spin_lock_irqsave (&ctx->slock, flags);
Signature · 1 line
2.17.1
PATCH v3 12/20 dt-bindings: media: cal: update binding to add DRA76x support
In reply to Benoit ParrotUpdate Device Tree bindings for the CAL driver to add DRA76x support.
--- Documentation/devicetree/bindings/media/ti-cal.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/media/ti-cal.txt +1 -0
@@ -10,6 +10,7 @@ Required properties: - compatible: Should be "ti,dra72-cal", for DRA72 controllers Should be "ti,dra72-pre-es2-cal", for DRA72 controllers pre ES2.0 + Should be "ti,dra76-cal", for DRA76 controllers - 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
Signature · 1 line
2.17.1
PATCH v3 13/20 media: ti-vpe: cal: Add DRA76x support
In reply to Benoit ParrotAdd the needed control module register bit layout to support the DRA76x family of devices.
--- drivers/media/platform/ti-vpe/cal.c | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/media/platform/ti-vpe/cal.c +34 -0
@@ -287,6 +287,36 @@ static const struct cal_data dra72x_es1_cal_data = { .flags = DRA72_CAL_PRE_ES2_LDO_DISABLE, }; +static struct reg_field dra76x_ctrl_core_csi0_reg_fields[F_MAX_FIELDS ] = { + [F_CTRLCLKEN ] =REG_FIELD (0 ,8 ,8 ), + [F_CAMMODE ] =REG_FIELD (0 ,9 ,10 ), + [F_CSI_MODE ] =REG_FIELD (0 ,11 ,11 ), + [F_LANEENABLE ] =REG_FIELD (0 ,27 ,31 ), +}; + +static struct reg_field dra76x_ctrl_core_csi1_reg_fields[F_MAX_FIELDS ] = { + [F_CTRLCLKEN ] =REG_FIELD (0 ,0 ,0 ), + [F_CAMMODE ] =REG_FIELD (0 ,1 ,2 ), + [F_CSI_MODE ] =REG_FIELD (0 ,3 ,3 ), + [F_LANEENABLE ] =REG_FIELD (0 ,24 ,26 ), +}; + +static struct cal_csi2_phy dra76x_cal_csi_phy[] = { + { + .base_fields = dra76x_ctrl_core_csi0_reg_fields, + .num_lanes =5 , + }, + { + .base_fields = dra76x_ctrl_core_csi1_reg_fields, + .num_lanes =3 , + }, +}; + +static const struct cal_data dra76x_cal_data = { + .csi2_phy_core = dra76x_cal_csi_phy, + .num_csi2_phy =ARRAY_SIZE (dra76x_cal_csi_phy), +}; +/* * there is one cal_dev structure in the driver, it is shared by * all instances.
@@ -2287,6 +2317,10 @@ static const struct of_device_id cal_of_match[] = { .compatible = "ti,dra72-pre-es2-cal", .data = (void *)&dra72x_es1_cal_data, }, + { + .compatible = "ti,dra76-cal", + .data = (void *)&dra76x_cal_data, + }, {}, };MODULE_DEVICE_TABLE (of, cal_of_match);
Signature · 1 line
2.17.1
PATCH v3 14/20 dt-bindings: media: cal: update binding to add AM654 support
In reply to Benoit ParrotUpdate Device Tree bindings for the CAL driver to add AM654 support.
--- Documentation/devicetree/bindings/media/ti-cal.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/media/ti-cal.txt +1 -0
@@ -11,6 +11,7 @@ Required properties: Should be "ti,dra72-cal", for DRA72 controllers Should be "ti,dra72-pre-es2-cal", for DRA72 controllers pre ES2.0 Should be "ti,dra76-cal", for DRA76 controllers + Should be "ti,am654-cal", for AM654 controllers - 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
Signature · 1 line
2.17.1
PATCH v3 15/20 media: ti-vpe: cal: Add AM654 support
In reply to Benoit ParrotAdd the needed control module register bit layout to support the AM654 family of devices.
--- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/ti-vpe/cal.c | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-)
drivers/media/platform/Kconfig +1 -1
@@ -151,7 +151,7 @@ source "drivers/media/platform/sunxi/Kconfig" config VIDEO_TI_CAL tristate "TI CAL (Camera Adaptation Layer) driver" depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - depends on SOC_DRA7XX || COMPILE_TEST + depends on SOC_DRA7XX || ARCH_K3 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_FWNODE help
drivers/media/platform/ti-vpe/cal.c +25 -1
@@ -317,6 +317,24 @@ static const struct cal_data dra76x_cal_data = { .num_csi2_phy = ARRAY_SIZE(dra76x_cal_csi_phy), }; +static struct reg_field am654_ctrl_core_csi0_reg_fields[F_MAX_FIELDS ] = { + [F_CTRLCLKEN ] =REG_FIELD (0 ,15 ,15 ), + [F_CAMMODE ] =REG_FIELD (0 ,24 ,25 ), + [F_LANEENABLE ] =REG_FIELD (0 ,0 ,4 ), +}; + +static struct cal_csi2_phy am654_cal_csi_phy[] = { + { + .base_fields = am654_ctrl_core_csi0_reg_fields, + .num_lanes =5 , + }, +}; + +static const struct cal_data am654_cal_data = { + .csi2_phy_core = am654_cal_csi_phy, + .num_csi2_phy =ARRAY_SIZE (am654_cal_csi_phy), +}; +/* * there is one cal_dev structure in the driver, it is shared by * all instances.
@@ -543,7 +561,9 @@ static void camerarx_phy_enable(struct cal_ctx *ctx)/* Always enable all lanes at the phy control level */ max_lanes = (1 <<cal_data_get_phy_max_lanes (ctx)) -1 ;regmap_field_write (phy->fields[F_LANEENABLE ], max_lanes); -regmap_field_write (phy->fields[F_CSI_MODE ],1 ); +/* F_CSI_MODE is not present on every architecture */ +if (phy->fields[F_CSI_MODE ]) +regmap_field_write (phy->fields[F_CSI_MODE ],1 );regmap_field_write (phy->fields[F_CTRLCLKEN ],1 ); }
@@ -2321,6 +2341,10 @@ static const struct of_device_id cal_of_match[] = { .compatible = "ti,dra76-cal", .data = (void *)&dra76x_cal_data, }, + { + .compatible = "ti,am654-cal", + .data = (void *)&am654_cal_data, + }, {}, };MODULE_DEVICE_TABLE (of, cal_of_match);
Signature · 1 line
2.17.1
PATCH v3 16/20 media: ti-vpe: cal: Add subdev s_power hooks
In reply to Benoit ParrotBecause V4L2 still uses a specific way to manage power state of devices that predates runtime PM, bridge driver should power on and off sub device explicitly.
--- drivers/media/platform/ti-vpe/cal.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/media/platform/ti-vpe/cal.c +12 -0
@@ -1654,6 +1654,12 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)if (ret <0 ) goto err; + ret =v4l2_subdev_call (ctx->sensor, core, s_power,1 ); +if (ret <0 && ret != -ENOIOCTLCMD && ret != -ENODEV ) { +ctx_err (ctx,"power on failed in subdev\n" ); + goto err; + } +cal_runtime_get (ctx->dev);csi2_ctx_config (ctx);
@@ -1667,6 +1673,7 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count) ret =v4l2_subdev_call (ctx->sensor, video, s_stream,1 );if (ret) { +v4l2_subdev_call (ctx->sensor, core, s_power,0 );ctx_err (ctx,"stream on failed in subdev\n" );cal_runtime_put (ctx->dev); goto err;
@@ -1695,6 +1702,7 @@ static void cal_stop_streaming(struct vb2_queue *vq)struct cal_dmaqueue *dma_q = &ctx->vidq;struct cal_buffer *buf, *tmp;unsigned long flags; +int ret;csi2_ppi_disable (ctx);disable_irqs (ctx);
@@ -1703,6 +1711,10 @@ static void cal_stop_streaming(struct vb2_queue *vq)if (v4l2_subdev_call (ctx->sensor, video, s_stream,0 ))ctx_err (ctx,"stream off failed in subdev\n" ); + ret =v4l2_subdev_call (ctx->sensor, core, s_power,0 ); +if (ret <0 && ret != -ENOIOCTLCMD && ret != -ENODEV ) +ctx_err (ctx,"power off failed in subdev\n" ); +/* Release all active buffers */ spin_lock_irqsave (&ctx->slock, flags);list_for_each_entry_safe (buf, tmp, &dma_q->active, list) {
Signature · 1 line
2.17.1
PATCH v3 17/20 media: ti-vpe: cal: Properly calculate max resolution boundary
In reply to Benoit ParrotCurrently we were using an arbitrarily small maximum resolution mostly based on available sensor capabilities. However the hardware DMA limits are much higher than the statically define maximum resolution we were using.
There we rework the boundary check code to handle the maximum width and height based on the maximum line width in bytes and re-calculating the pixel width based on the given pixel format.
--- drivers/media/platform/ti-vpe/cal.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/media/platform/ti-vpe/cal.c +11 -5
@@ -34,8 +34,8 @@#define CAL_MODULE_NAME "cal" -#define MAX_WIDTH 1920 -#define MAX_HEIGHT 1200 +#define MAX_WIDTH_BYTES (8192 * 8) +#define MAX_HEIGHT_LINES 16383#define CAL_VERSION "0.1.0"
@@ -1330,15 +1330,21 @@ static int cal_calc_format_size(struct cal_ctx *ctx,const struct cal_fmt *fmt, struct v4l2_format *f) { - u32 bpl; + u32 bpl, max_width;if (!fmt) {ctx_dbg (3 , ctx,"No cal_fmt provided!\n" );return -EINVAL ; } -v4l_bound_align_image (&f->fmt.pix.width,48 ,MAX_WIDTH ,2 , - &f->fmt.pix.height,32 ,MAX_HEIGHT ,0 ,0 ); +/* +* Maximum width is bound by the DMA max width in bytes. +* We need to recalculate the actual maxi width depending on the +* number of bytes per pixels required. +*/ + max_width =MAX_WIDTH_BYTES / (ALIGN (fmt->bpp,8 ) >>3 ); +v4l_bound_align_image (&f->fmt.pix.width,48 , max_width,2 , + &f->fmt.pix.height,32 ,MAX_HEIGHT_LINES ,0 ,0 ); bpl = (f->fmt.pix.width *ALIGN (fmt->bpp,8 )) >>3 ; f->fmt.pix.bytesperline =ALIGN (bpl,16 );
Signature · 1 line
2.17.1
PATCH v3 18/20 media: ti-vpe: cal: Fix a WARN issued when start streaming fails
In reply to Benoit ParrotWhen start_streaming fails after the buffers have been queued we have to make sure all buffers are returned to user-space properly otherwise a v4l2 level WARN is generated.
--- drivers/media/platform/ti-vpe/cal.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/platform/ti-vpe/cal.c +5 -0
@@ -1695,10 +1695,15 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)return 0 ; err: +spin_lock_irqsave (&ctx->slock, flags); +vb2_buffer_done (&ctx->cur_frm->vb.vb2_buf,VB2_BUF_STATE_QUEUED ); + ctx->cur_frm =NULL ; + ctx->next_frm =NULL ;list_for_each_entry_safe (buf, tmp, &dma_q->active, list) {list_del (&buf->list);vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_QUEUED ); } +spin_unlock_irqrestore (&ctx->slock, flags);return ret; }
Signature · 1 line
2.17.1
PATCH v3 19/20 media: ti-vpe: cal: fix enum_mbus_code/frame_size subdev arguments
In reply to Benoit ParrotMake sure that both enum_mbus_code() and enum_framesize() properly populate the .which parameter member, otherwise -EINVAL is return causing the subdev asynchronous registration handshake to fail.
--- drivers/media/platform/ti-vpe/cal.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/ti-vpe/cal.c +2 -0
@@ -1493,6 +1493,7 @@ static int cal_enum_framesizes(struct file *file, void *fh, fse.index = fsize->index; fse.pad =0 ; fse.code = fmt->code; + fse.which =V4L2_SUBDEV_FORMAT_ACTIVE ; ret =v4l2_subdev_call (ctx->sensor, pad, enum_frame_size,NULL , &fse);if (ret)
@@ -1833,6 +1834,7 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier,memset (&mbus_code,0 ,sizeof (mbus_code)); mbus_code.index = j; + mbus_code.which =V4L2_SUBDEV_FORMAT_ACTIVE ; ret =v4l2_subdev_call (subdev, pad, enum_mbus_code,NULL , &mbus_code);if (ret)
Signature · 1 line
2.17.1
PATCH v3 20/20 dt-bindings: media: cal: convert binding to yaml
In reply to Benoit ParrotConvert ti-cal.txt to ti,cal.yaml.
Add ti,cal.yaml to the MAINTAINERS file.
--- .../devicetree/bindings/media/ti,cal.yaml | 202 ++++++++++++++++++ .../devicetree/bindings/media/ti-cal.txt | 81 ------- MAINTAINERS | 1 + 3 files changed, 203 insertions(+), 81 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/ti,cal.yaml delete mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt
Documentation/devicetree/bindings/media/ti,cal.yaml new file +202 -0
@@ -0,0 +1,202 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/ti,cal.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments DRA72x CAMERA ADAPTATION LAYER (CAL) Device Tree Bindings + +maintainers: + - Benoit Parrot <[email protected]> + +description: |- + The Camera Adaptation Layer (CAL) is a key component for image capture + applications. The capture module provides the system interface and the + processing capability to connect CSI2 image-sensor modules to the + DRA72x device. + + 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 + refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + +properties: + compatible: + enum: + # for DRA72 controllers + - ti,dra72-cal + # for DRA72 controllers pre ES2.0 + - ti,dra72-pre-es2-cal + # for DRA76 controllers + - ti,dra76-cal + # for AM654 controllers + - ti,am654-cal + + reg: + minItems: 2 + items: + - description: The CAL main register region + - description: The RX Core0 (DPHY0) register region + - description: The RX Core1 (DPHY1) register region + + reg-names: + minItems: 2 + items: + - const: cal_top + - const: cal_rx_core0 + - const: cal_rx_core1 + + interrupts: + maxItems: 1 + + ti,camerrx-control: + $ref: "/schemas/types.yaml#/definitions/phandle-array" + description: + phandle to the device control module and offset to the + control_camerarx_core register + + clocks: + maxItems: 1 + + clock-names: + const: fck + + power-domains: + description: + List of phandle and PM domain specifier as documented in + Documentation/devicetree/bindings/power/power_domain.txt + maxItems: 1 + + # See ./video-interfaces.txt for details + ports: + type: object + additionalProperties: false + + properties: + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + port@0: + type: object + additionalProperties: false + + properties: + reg: + const: 0 + description: CSI2 Port #0 + + patternProperties: + endpoint: + type: object + additionalProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + remote-endpoint: true + + required: + - reg + + port@1: + type: object + additionalProperties: false + + properties: + reg: + const: 1 + description: CSI2 Port #1 + + patternProperties: + endpoint: + type: object + additionalProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + remote-endpoint: true + + required: + - reg + + required: + - "#address-cells" + - "#size-cells" + - port@0 + +required: + - compatible + - reg + - reg-names + - interrupts + - ti,camerrx-control + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + + cal: cal@4845b000 { + compatible = "ti,dra72-cal"; + reg = <0x4845B000 0x400>, + <0x4845B800 0x40>, + <0x4845B900 0x40>; + reg-names = "cal_top", + "cal_rx_core0", + "cal_rx_core1"; + interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; + ti,camerrx-control = <&scm_conf 0xE94>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + csi2_0: port@0 { + reg = <0>; + csi2_phy0: endpoint { + remote-endpoint = <&csi2_cam0>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + }; + }; + + i2c5: i2c@4807c000 { + clock-frequency = <400000>; + #address-cells = <1>; + #size-cells = <0>; + + camera-sensor@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; + + clocks = <&clk_ov5640_fixed>; + clock-names = "xclk"; + + port { + csi2_cam0: endpoint { + remote-endpoint = <&csi2_phy0>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + }; + }; + +...
Documentation/devicetree/bindings/media/ti-cal.txt deleted +0 -81
81 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -16324,6 +16324,7 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ S: Maintained F: drivers/media/platform/ti-vpe/ F: Documentation/devicetree/bindings/media/ti,vpe.yaml + Documentation/devicetree/bindings/media/ti,cal.yaml TI WILINK WIRELESS DRIVERS L: [email protected]
Signature · 1 line
2.17.1
Re: [Patch v3 20/20] dt-bindings: media: cal: convert binding to yaml
+ Rob
Benoit Parrot <[email protected]> wrote on Tue [2019-Nov-12 08:31:52 -0600]:
Quoted 322 lines
Convert ti-cal.txt to ti,cal.yaml.
Add ti,cal.yaml to theMAINTAINERSfile.Signed-off-by Benoit Parrot <[email protected]>--- .../devicetree/bindings/media/ti,cal.yaml | 202 ++++++++++++++++++ .../devicetree/bindings/media/ti-cal.txt | 81 ------- MAINTAINERS | 1 + 3 files changed, 203 insertions(+), 81 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/ti,cal.yaml delete mode 100644 Documentation/devicetree/bindings/media/ti-cal.txtDocumentation/devicetree/bindings/media/ti,cal.yaml new file +202
-0@@ -0,0 +1,202 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/ti,cal.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments DRA72x CAMERA ADAPTATION LAYER (CAL) Device Tree Bindings + +maintainers: + - Benoit Parrot <[email protected]> + +description: |- + The Camera Adaptation Layer (CAL) is a key component for image capture + applications. The capture module provides the system interface and the + processing capability to connect CSI2 image-sensor modules to the + DRA72x device. + + 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 + refer to the bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + +properties: + compatible: + enum: + # for DRA72 controllers + - ti,dra72-cal + # for DRA72 controllers pre ES2.0 + - ti,dra72-pre-es2-cal + # for DRA76 controllers + - ti,dra76-cal + # for AM654 controllers + - ti,am654-cal + + reg: + minItems: 2 + items: + - description: The CAL main register region + - description: The RX Core0 (DPHY0) register region + - description: The RX Core1 (DPHY1) register region + + reg-names: + minItems: 2 + items: + - const: cal_top + - const: cal_rx_core0 + - const: cal_rx_core1 + + interrupts: + maxItems: 1 + + ti,camerrx-control: + $ref: "/schemas/types.yaml#/definitions/phandle-array" + description: + phandle to the device control module and offset to the + control_camerarx_core register + + clocks: + maxItems: 1 + + clock-names: + const: fck + + power-domains: + description: + List of phandle and PM domain specifier as documented in + Documentation/devicetree/bindings/power/power_domain.txt + maxItems: 1 + + # See ./video-interfaces.txt for details + ports: + type: object + additionalProperties: false + + properties: + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + port@0: + type: object + additionalProperties: false + + properties: + reg: + const: 0 + description: CSI2 Port #0 + + patternProperties: + endpoint: + type: object + additionalProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + remote-endpoint: true + + required: + - reg + + port@1: + type: object + additionalProperties: false + + properties: + reg: + const: 1 + description: CSI2 Port #1 + + patternProperties: + endpoint: + type: object + additionalProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + remote-endpoint: true + + required: + - reg + + required: + - "#address-cells" + - "#size-cells" + - port@0 + +required: + - compatible + - reg + - reg-names + - interrupts + - ti,camerrx-control + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + + cal: cal@4845b000 { + compatible = "ti,dra72-cal"; + reg = <0x4845B000 0x400>, + <0x4845B800 0x40>, + <0x4845B900 0x40>; + reg-names = "cal_top", + "cal_rx_core0", + "cal_rx_core1"; + interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; + ti,camerrx-control = <&scm_conf 0xE94>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + csi2_0: port@0 { + reg = <0>; + csi2_phy0: endpoint { + remote-endpoint = <&csi2_cam0>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + }; + }; + + i2c5: i2c@4807c000 { + clock-frequency = <400000>; + #address-cells = <1>; + #size-cells = <0>; + + camera-sensor@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; + + clocks = <&clk_ov5640_fixed>; + clock-names = "xclk"; + + port { + csi2_cam0: endpoint { + remote-endpoint = <&csi2_phy0>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + }; + }; + +...Documentation/devicetree/bindings/media/ti-cal.txt deleted +0
-81@@ -1,81 +0,0 @@ -Texas Instruments DRA72x CAMERA ADAPTATION LAYER (CAL) ------------------------------------------------------- - -The Camera Adaptation Layer (CAL) is a key component for image capture -applications. The capture module provides the system interface and the -processing capability to connect CSI2 image-sensor modules to the -DRA72x device. - -Required properties: -- compatible: - Should be "ti,dra72-cal", for DRA72 controllers - Should be "ti,dra72-pre-es2-cal", for DRA72 controllers pre ES2.0 - Should be "ti,dra76-cal", for DRA76 controllers - Should be "ti,am654-cal", for AM654 controllers -- 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 - 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 -refer to the bindings defined in -Documentation/devicetree/bindings/media/video-interfaces.txt. - -Example: - cal: cal@4845b000 { - compatible = "ti,dra72-cal"; - reg = <0x4845B000 0x400>, - <0x4845B800 0x40>, - <0x4845B900 0x40>; - reg-names = "cal_top", - "cal_rx_core0", - "cal_rx_core1"; - interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; - ti,camerrx-control = <&scm_conf 0xE94>; - #address-cells = <1>; - #size-cells = <0>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - csi2_0: port@0 { - reg = <0>; - csi2_phy0: endpoint { - remote-endpoint = <&csi2_cam0>; - clock-lanes = <0>; - data-lanes = <1 2>; - }; - }; - csi2_1: port@1 { - reg = <1>; - }; - }; - }; - - i2c5: i2c@4807c000 { - clock-frequency = <400000>; - - camera-sensor@3c { - compatible = "ovti,ov5640"; - reg = <0x3c>; - - clocks = <&clk_fixed>; - clock-names = "xclk"; - - port { - csi2_cam0: endpoint { - remote-endpoint = <&csi2_phy0>; - clock-lanes = <0>; - data-lanes = <1 2>; - }; - }; - }; - };MAINTAINERS +1
-0@@ -16324,6 +16324,7 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ S: Maintained F: drivers/media/platform/ti-vpe/ F: Documentation/devicetree/bindings/media/ti,vpe.yaml + Documentation/devicetree/bindings/media/ti,cal.yaml TI WILINK WIRELESS DRIVERS L: [email protected]Signature · 1 line
2.17.1