Skip to content

Commit 898f3b5

Browse files
committed
Merge branch 'bits/240-isp' into asahi-wip
2 parents 934212c + 4d83ec6 commit 898f3b5

22 files changed

Lines changed: 5118 additions & 0 deletions

drivers/media/platform/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ config VIDEO_MUX
6565
source "drivers/media/platform/allegro-dvt/Kconfig"
6666
source "drivers/media/platform/amlogic/Kconfig"
6767
source "drivers/media/platform/amphion/Kconfig"
68+
source "drivers/media/platform/apple/Kconfig"
6869
source "drivers/media/platform/arm/Kconfig"
6970
source "drivers/media/platform/aspeed/Kconfig"
7071
source "drivers/media/platform/atmel/Kconfig"

drivers/media/platform/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
obj-y += allegro-dvt/
99
obj-y += amlogic/
1010
obj-y += amphion/
11+
obj-y += apple/
1112
obj-y += arm/
1213
obj-y += aspeed/
1314
obj-y += atmel/
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
comment "Apple media platform drivers"
4+
5+
source "drivers/media/platform/apple/isp/Kconfig"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
obj-y += isp/
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.clang-format
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
config VIDEO_APPLE_ISP
4+
tristate "Apple Silicon Image Signal Processor driver"
5+
select VIDEOBUF2_CORE
6+
select VIDEOBUF2_V4L2
7+
select VIDEOBUF2_DMA_SG
8+
select APPLE_PMP_REPORT
9+
depends on ARCH_APPLE || COMPILE_TEST
10+
depends on OF_ADDRESS
11+
depends on V4L_PLATFORM_DRIVERS
12+
depends on VIDEO_DEV
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
apple-isp-y := isp-cam.o isp-cmd.o isp-drv.o isp-fw.o isp-iommu.o isp-ipc.o isp-v4l2.o
3+
obj-$(CONFIG_VIDEO_APPLE_ISP) += apple-isp.o

0 commit comments

Comments
 (0)