diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-03-02 13:11:44 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-05 21:05:45 +0100 |
| commit | 05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5 (patch) | |
| tree | 68e66de94e62af2e06719bd8e6b56f88ce80993a /target/linux/at91/patches-5.10/171-media-atmel-atmel-isc-add-support-for-version-regist.patch | |
| parent | ef4bf8b403205062ddb38ebe7b8c4951be346368 (diff) | |
| download | upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.gz upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.bz2 upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.zip | |
kernel: bump 5.10 to 5.10.103
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/at91/patches-5.10/171-media-atmel-atmel-isc-add-support-for-version-regist.patch')
| -rw-r--r-- | target/linux/at91/patches-5.10/171-media-atmel-atmel-isc-add-support-for-version-regist.patch | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/target/linux/at91/patches-5.10/171-media-atmel-atmel-isc-add-support-for-version-regist.patch b/target/linux/at91/patches-5.10/171-media-atmel-atmel-isc-add-support-for-version-regist.patch index 6eca9dbf91..b582945b99 100644 --- a/target/linux/at91/patches-5.10/171-media-atmel-atmel-isc-add-support-for-version-regist.patch +++ b/target/linux/at91/patches-5.10/171-media-atmel-atmel-isc-add-support-for-version-regist.patch @@ -15,8 +15,6 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> drivers/media/platform/atmel/atmel-sama5d2-isc.c | 5 +++++ 3 files changed, 12 insertions(+) -diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h -index 4940998c82a2..344668dcfcf4 100644 --- a/drivers/media/platform/atmel/atmel-isc-regs.h +++ b/drivers/media/platform/atmel/atmel-isc-regs.h @@ -295,6 +295,11 @@ @@ -31,8 +29,6 @@ index 4940998c82a2..344668dcfcf4 100644 /* Histogram Entry */ #define ISC_HIS_ENTRY 0x00000410 -diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h -index bea545327d3d..13ee19d99c2e 100644 --- a/drivers/media/platform/atmel/atmel-isc.h +++ b/drivers/media/platform/atmel/atmel-isc.h @@ -152,6 +152,7 @@ struct isc_ctrls { @@ -51,11 +47,9 @@ index bea545327d3d..13ee19d99c2e 100644 }; /* -diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c -index bfd56ac5c921..aebf38dde2d2 100644 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c -@@ -210,6 +210,7 @@ static int atmel_isc_probe(struct platform_device *pdev) +@@ -210,6 +210,7 @@ static int atmel_isc_probe(struct platfo struct isc_subdev_entity *subdev_entity; int irq; int ret; @@ -63,7 +57,7 @@ index bfd56ac5c921..aebf38dde2d2 100644 isc = devm_kzalloc(dev, sizeof(*isc), GFP_KERNEL); if (!isc) -@@ -258,6 +259,7 @@ static int atmel_isc_probe(struct platform_device *pdev) +@@ -258,6 +259,7 @@ static int atmel_isc_probe(struct platfo isc->offsets.rlp = ISC_SAMA5D2_RLP_OFFSET; isc->offsets.his = ISC_SAMA5D2_HIS_OFFSET; isc->offsets.dma = ISC_SAMA5D2_DMA_OFFSET; @@ -71,7 +65,7 @@ index bfd56ac5c921..aebf38dde2d2 100644 /* sama5d2-isc - 8 bits per beat */ isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8; -@@ -346,6 +348,9 @@ static int atmel_isc_probe(struct platform_device *pdev) +@@ -346,6 +348,9 @@ static int atmel_isc_probe(struct platfo pm_runtime_enable(dev); pm_request_idle(dev); @@ -81,6 +75,3 @@ index bfd56ac5c921..aebf38dde2d2 100644 return 0; cleanup_subdev: --- -2.32.0 - |