diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 18:04:33 +0100 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 23:42:32 +0100 |
| commit | f07e572f6447465d8938679533d604e402b0f066 (patch) | |
| tree | cb333bd2a67e59e7c07659514850a0fd55fc825e /target/linux/bcm27xx/patches-5.4/950-0302-staging-bcm2835-codec-Pass-driver-context-to-create-.patch | |
| parent | 5d3a6fd970619dfc55f8259035c3027d7613a2a6 (diff) | |
| download | upstream-f07e572f6447465d8938679533d604e402b0f066.tar.gz upstream-f07e572f6447465d8938679533d604e402b0f066.tar.bz2 upstream-f07e572f6447465d8938679533d604e402b0f066.zip | |
bcm27xx: import latest patches from the RPi foundation
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0302-staging-bcm2835-codec-Pass-driver-context-to-create-.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0302-staging-bcm2835-codec-Pass-driver-context-to-create-.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0302-staging-bcm2835-codec-Pass-driver-context-to-create-.patch b/target/linux/bcm27xx/patches-5.4/950-0302-staging-bcm2835-codec-Pass-driver-context-to-create-.patch new file mode 100644 index 0000000000..a0b86db2d6 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0302-staging-bcm2835-codec-Pass-driver-context-to-create-.patch @@ -0,0 +1,61 @@ +From aebdaf3bf7931e42b6787d1f1554de03e84422c7 Mon Sep 17 00:00:00 2001 +From: Kieran Bingham <kieran.bingham@ideasonboard.com> +Date: Wed, 20 Mar 2019 11:35:26 +0000 +Subject: [PATCH] staging: bcm2835-codec: Pass driver context to create + entities + +Pass the bcm2835_codec_driver driver context directly into the +bcm2835_codec_create() so that it can be used to store driver global +state. Pass the struct platform_device *pdev by adding it to the driver +global state. + +Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> +--- + .../bcm2835-codec/bcm2835-v4l2-codec.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -457,6 +457,8 @@ struct bcm2835_codec_ctx { + }; + + struct bcm2835_codec_driver { ++ struct platform_device *pdev; ++ + struct bcm2835_codec_dev *encode; + struct bcm2835_codec_dev *decode; + struct bcm2835_codec_dev *isp; +@@ -2587,10 +2589,11 @@ destroy_component: + return ret; + } + +-static int bcm2835_codec_create(struct platform_device *pdev, ++static int bcm2835_codec_create(struct bcm2835_codec_driver *drv, + struct bcm2835_codec_dev **new_dev, + enum bcm2835_codec_role role) + { ++ struct platform_device *pdev = drv->pdev; + struct bcm2835_codec_dev *dev; + struct video_device *vfd; + int video_nr; +@@ -2711,15 +2714,17 @@ static int bcm2835_codec_probe(struct pl + if (!drv) + return -ENOMEM; + +- ret = bcm2835_codec_create(pdev, &drv->decode, DECODE); ++ drv->pdev = pdev; ++ ++ ret = bcm2835_codec_create(drv, &drv->decode, DECODE); + if (ret) + goto out; + +- ret = bcm2835_codec_create(pdev, &drv->encode, ENCODE); ++ ret = bcm2835_codec_create(drv, &drv->encode, ENCODE); + if (ret) + goto out; + +- ret = bcm2835_codec_create(pdev, &drv->isp, ISP); ++ ret = bcm2835_codec_create(drv, &drv->isp, ISP); + if (ret) + goto out; + |