This adds initial support for SM8250 and its 4 VFEs and 6 CSIPHYs.
The only big change is the added camss-vfe-480.c to support the
Titan 480 VFE.
v2:
- Fixed some typos in commit messages (patches 02 and 08)
- patch 03 ("media: camss: csiphy-3ph: add support for SM8250 CSI DPHY"):
- moved definition of CAMSS_8250 to this patch,
- removed unused lane_enable variable
- added a default unreachable case to avoid a warning
- added a is_gen2 variable (minor rework)
- Undo DECODE_FORMAT_PAYLOAD_ONLY change, add comment instead (patch 04)
- "ops" reworks in addition to removing dead code (patch 12)
- renamed csid-170 to csid-gen2, added defines for offsets, add missing
camnoc_axi clock to sm8250 vfe resources (patch 16/17)
Jonathan Marek (17):
media: camss: csiphy-3ph: don't print HW version as an error
media: camss: csiphy-3ph: disable interrupts
media: camss: csiphy-3ph: add support for SM8250 CSI DPHY
media: camss: csid-170: fix non-10bit formats
media: camss: csid-170: don't enable unused irqs
media: camss: csid-170: remove stray comment
media: camss: csid-170: support more than one lite vfe
media: camss: csid-170: set the right HALT_CMD when disabled
media: camss: csid: allow csid to work without a regulator
media: camss: remove vdda-csiN from sdm845 resources
media: camss: fix VFE irq name
media: camss: remove some vfe ops and clean up dead vfe-170 code
media: camss: vfe-170: fix "VFE halt timeout" error
media: camss: Add initial support for VFE hardware version Titan 480
media: camss: add support for V4L2_PIX_FMT_GREY for sdm845 HW
media: camss: add support for SM8250 camss
media: dt-bindings: media: camss: Add qcom,sm8250-camss binding
.../bindings/media/qcom,sm8250-camss.yaml | 399 +++++++++++++
drivers/media/platform/qcom/camss/Makefile | 3 +-
.../{camss-csid-170.c => camss-csid-gen2.c} | 32 +-
.../media/platform/qcom/camss/camss-csid.c | 45 +-
.../media/platform/qcom/camss/camss-csid.h | 2 +-
.../qcom/camss/camss-csiphy-3ph-1-0.c | 184 ++++--
.../media/platform/qcom/camss/camss-csiphy.c | 9 +-
.../media/platform/qcom/camss/camss-vfe-170.c | 101 +---
.../media/platform/qcom/camss/camss-vfe-4-1.c | 25 +-
.../media/platform/qcom/camss/camss-vfe-4-7.c | 63 +-
.../media/platform/qcom/camss/camss-vfe-4-8.c | 65 +--
.../media/platform/qcom/camss/camss-vfe-480.c | 545 ++++++++++++++++++
.../platform/qcom/camss/camss-vfe-gen1.c | 94 +--
.../platform/qcom/camss/camss-vfe-gen1.h | 39 +-
drivers/media/platform/qcom/camss/camss-vfe.c | 29 +-
drivers/media/platform/qcom/camss/camss-vfe.h | 17 +-
.../media/platform/qcom/camss/camss-video.c | 5 +-
drivers/media/platform/qcom/camss/camss.c | 205 ++++++-
drivers/media/platform/qcom/camss/camss.h | 1 +
19 files changed, 1523 insertions(+), 340 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml
rename drivers/media/platform/qcom/camss/{camss-csid-170.c => camss-csid-gen2.c} (95%)
create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-480.c
--
2.26.1
This isn't used and only works because devm_regulator_get() returns a dummy
regulator.
Signed-off-by: Jonathan Marek <[email protected]>
Reviewed-by: Robert Foss <[email protected]>
---
drivers/media/platform/qcom/camss/camss.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index ef100d5f77636..c08d6d6f6f90d 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -542,7 +542,7 @@ static const struct resources csiphy_res_845[] = {
static const struct resources csid_res_845[] = {
/* CSID0 */
{
- .regulator = { "vdda-csi0" },
+ .regulator = { NULL },
.clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
"soc_ahb", "vfe0", "vfe0_src",
"vfe0_cphy_rx", "csi0",
@@ -562,7 +562,7 @@ static const struct resources csid_res_845[] = {
/* CSID1 */
{
- .regulator = { "vdda-csi1" },
+ .regulator = { NULL },
.clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
"soc_ahb", "vfe1", "vfe1_src",
"vfe1_cphy_rx", "csi1",
@@ -582,7 +582,7 @@ static const struct resources csid_res_845[] = {
/* CSID2 */
{
- .regulator = { "vdda-csi2" },
+ .regulator = { NULL },
.clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
"soc_ahb", "vfe_lite", "vfe_lite_src",
"vfe_lite_cphy_rx", "csi2",
--
2.26.1
Hi Jonathan,
I've given this patchset a try on RB3 board (SDM845) with ov8856 camera sensor - works OK,
no regressions.
Thanks,
Andrey
On 09.06.2021 01:34, Jonathan Marek wrote:
> This adds initial support for SM8250 and its 4 VFEs and 6 CSIPHYs.
> The only big change is the added camss-vfe-480.c to support the
> Titan 480 VFE.
>
> v2:
> - Fixed some typos in commit messages (patches 02 and 08)
> - patch 03 ("media: camss: csiphy-3ph: add support for SM8250 CSI DPHY"):
> - moved definition of CAMSS_8250 to this patch,
> - removed unused lane_enable variable
> - added a default unreachable case to avoid a warning
> - added a is_gen2 variable (minor rework)
> - Undo DECODE_FORMAT_PAYLOAD_ONLY change, add comment instead (patch 04)
> - "ops" reworks in addition to removing dead code (patch 12)
> - renamed csid-170 to csid-gen2, added defines for offsets, add missing
> camnoc_axi clock to sm8250 vfe resources (patch 16/17)
>
> Jonathan Marek (17):
> media: camss: csiphy-3ph: don't print HW version as an error
> media: camss: csiphy-3ph: disable interrupts
> media: camss: csiphy-3ph: add support for SM8250 CSI DPHY
> media: camss: csid-170: fix non-10bit formats
> media: camss: csid-170: don't enable unused irqs
> media: camss: csid-170: remove stray comment
> media: camss: csid-170: support more than one lite vfe
> media: camss: csid-170: set the right HALT_CMD when disabled
> media: camss: csid: allow csid to work without a regulator
> media: camss: remove vdda-csiN from sdm845 resources
> media: camss: fix VFE irq name
> media: camss: remove some vfe ops and clean up dead vfe-170 code
> media: camss: vfe-170: fix "VFE halt timeout" error
> media: camss: Add initial support for VFE hardware version Titan 480
> media: camss: add support for V4L2_PIX_FMT_GREY for sdm845 HW
> media: camss: add support for SM8250 camss
> media: dt-bindings: media: camss: Add qcom,sm8250-camss binding
>
> .../bindings/media/qcom,sm8250-camss.yaml | 399 +++++++++++++
> drivers/media/platform/qcom/camss/Makefile | 3 +-
> .../{camss-csid-170.c => camss-csid-gen2.c} | 32 +-
> .../media/platform/qcom/camss/camss-csid.c | 45 +-
> .../media/platform/qcom/camss/camss-csid.h | 2 +-
> .../qcom/camss/camss-csiphy-3ph-1-0.c | 184 ++++--
> .../media/platform/qcom/camss/camss-csiphy.c | 9 +-
> .../media/platform/qcom/camss/camss-vfe-170.c | 101 +---
> .../media/platform/qcom/camss/camss-vfe-4-1.c | 25 +-
> .../media/platform/qcom/camss/camss-vfe-4-7.c | 63 +-
> .../media/platform/qcom/camss/camss-vfe-4-8.c | 65 +--
> .../media/platform/qcom/camss/camss-vfe-480.c | 545 ++++++++++++++++++
> .../platform/qcom/camss/camss-vfe-gen1.c | 94 +--
> .../platform/qcom/camss/camss-vfe-gen1.h | 39 +-
> drivers/media/platform/qcom/camss/camss-vfe.c | 29 +-
> drivers/media/platform/qcom/camss/camss-vfe.h | 17 +-
> .../media/platform/qcom/camss/camss-video.c | 5 +-
> drivers/media/platform/qcom/camss/camss.c | 205 ++++++-
> drivers/media/platform/qcom/camss/camss.h | 1 +
> 19 files changed, 1523 insertions(+), 340 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml
> rename drivers/media/platform/qcom/camss/{camss-csid-170.c => camss-csid-gen2.c} (95%)
> create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-480.c
>