Skip to content

Unicam FS/FE timing GPIO #6088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 2 commits into from
Apr 19, 2024
Merged

Unicam FS/FE timing GPIO #6088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb859d9
media: bcm2835-unicam: Add option for a GPIO to reflect FS/FE timing
6by9 Apr 3, 2024
13da11a
dt: Add camX_sync option to configure a GPIO following cam FS/FE
6by9 Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,19 @@
drm_fb0_vc4 = <&aliases>, "drm-fb0=",&vc4;
drm_fb1_vc4 = <&aliases>, "drm-fb1=",&vc4;
drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4;

cam1_sync = <&csi1>, "sync-gpios:0=", <&gpio>,
<&csi1>, "sync-gpios:4",
<&csi1>, "sync-gpios:8=0", <GPIO_ACTIVE_HIGH>;
cam1_sync_inverted = <&csi1>, "sync-gpios:0=", <&gpio>,
<&csi1>, "sync-gpios:4",
<&csi1>, "sync-gpios:8=0", <GPIO_ACTIVE_LOW>;
cam0_sync = <&csi0>, "sync-gpios:0=", <&gpio>,
<&csi0>, "sync-gpios:4",
<&csi0>, "sync-gpios:8=0", <GPIO_ACTIVE_HIGH>;
cam0_sync_inverted = <&csi0>, "sync-gpios:0=", <&gpio>,
<&csi0>, "sync-gpios:4",
<&csi0>, "sync-gpios:8=0", <GPIO_ACTIVE_LOW>;
};
};

Expand Down
12 changes: 12 additions & 0 deletions arch/arm/boot/dts/overlays/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,18 @@ Params:
Default of GPIO expander 5 on CM4, but override
switches to normal GPIO.

cam0_sync Enable a GPIO to reflect frame sync from CSI0,
going high on frame start, and low on frame end.

cam0_sync_inverted Enable a GPIO to reflect frame sync from CSI0
going low on frame start, and high on frame end.

cam1_sync Enable a GPIO to reflect frame sync from CSI1,
going high on frame start, and low on frame end.

cam1_sync_inverted Enable a GPIO to reflect frame sync from CSI1
going low on frame start, and high on frame end.

cooling_fan Enables the Pi 5 cooling fan (enabled
automatically by the firmware)

Expand Down
12 changes: 12 additions & 0 deletions drivers/media/platform/bcm2835/bcm2835-unicam.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/err.h>
#include <linux/gpio/consumer.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
Expand Down Expand Up @@ -543,6 +544,8 @@ struct unicam_device {
struct v4l2_device v4l2_dev;
struct media_device mdev;

struct gpio_desc *sync_gpio;

/* parent device */
struct platform_device *pdev;
/* subdevice async Notifier */
Expand Down Expand Up @@ -943,6 +946,8 @@ static irqreturn_t unicam_isr(int irq, void *dev)
if (fe) {
bool inc_seq = unicam->frame_started;

if (unicam->sync_gpio)
gpiod_set_value(unicam->sync_gpio, 0);
/*
* Ensure we have swapped buffers already as we can't
* stop the peripheral. If no buffer is available, use a
Expand Down Expand Up @@ -1003,6 +1008,10 @@ static irqreturn_t unicam_isr(int irq, void *dev)
* aka frame start.
*/
ts = ktime_get_ns();

if (unicam->sync_gpio)
gpiod_set_value(unicam->sync_gpio, 1);

for (i = 0; i < ARRAY_SIZE(unicam->node); i++) {
if (!unicam->node[i].streaming)
continue;
Expand Down Expand Up @@ -3407,6 +3416,9 @@ static int unicam_probe(struct platform_device *pdev)
goto err_unicam_put;
}

unicam->sync_gpio = devm_gpiod_get_optional(&pdev->dev, "sync",
GPIOD_OUT_LOW);

ret = platform_get_irq(pdev, 0);
if (ret <= 0) {
dev_err(&pdev->dev, "No IRQ resource\n");
Expand Down