From patchwork Wed Apr 14 07:54:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1466045 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FKvtJ207Fz9sWW; Wed, 14 Apr 2021 17:56:08 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lWaNY-0007OU-P2; Wed, 14 Apr 2021 07:56:04 +0000 Received: from mail-pg1-f169.google.com ([209.85.215.169]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lWaMD-00077i-BR for kernel-team@lists.ubuntu.com; Wed, 14 Apr 2021 07:54:41 +0000 Received: by mail-pg1-f169.google.com with SMTP id f29so13826271pgm.8 for ; Wed, 14 Apr 2021 00:54:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fbm5x8rUw4YNM1xmZ5yww3AqxFHvL3A68Xq9w2jPUxw=; b=qkYj1lnT4MJlpVoMl1iOcjcV0w56ETj0M9u1ME6TnNoDYoq+U/fCf4SLCewK+1pHBG 6hA50Rhx86jrUaAizOJgvQgSZLWbdAK4gzASZ2e8rXrSMTXthSkt97xOw4O3w/1YYrzg NWQ/mUgOkdSTmOT309k1yjYxb4dXLYNbFsFIW5VFNXlPLgzJiCOK738PAcBurJoEEDk9 SkP/C2ngfNToDmPVn3e4q1sb8PwmKoQG7IfX3vUgsxYvw4voVkiyR1YVJVfTJ+HcA8ns qIP9rYVOQhjogKWEJlKXv6unBWZVu+gMN0d+yaZGRly4eLZpiCDc1fhQNCGArWBxjmr8 86Tw== X-Gm-Message-State: AOAM533C6HtG2geJXlhfIbQaXIbSp4FWsHyWAqIh5Rjp1AJPQwFjOl8V fzHWqlsUTBf2MwsCNiBZo5OT8e78ehhLDQ== X-Google-Smtp-Source: ABdhPJy8VYmY5YcoKkqobLde5n3B9yIoPMzhFjuxoJPrG7YD7JwAnznHT19Z018LFX3xWNHIqTdlbg== X-Received: by 2002:a63:1646:: with SMTP id 6mr37406617pgw.321.1618386879206; Wed, 14 Apr 2021 00:54:39 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id g8sm14197418pfr.106.2021.04.14.00.54.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 00:54:38 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH v3 8/9][SRU][OEM-5.10] UBUNTU: SAUCE: integrate IPU6 builds Date: Wed, 14 Apr 2021 15:54:11 +0800 Message-Id: <20210414075412.2288687-9-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210414075412.2288687-1-vicamo.yang@canonical.com> References: <20210414075412.2288687-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.169; envelope-from=vicamo@gmail.com; helo=mail-pg1-f169.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wang Yating BugLink: https://bugs.launchpad.net/bugs/1921345 Signed-off-by: You-Sheng Yang --- drivers/media/i2c/Kconfig | 41 +++++++++++++++++++++++++++++++++ drivers/media/i2c/Makefile | 4 ++++ drivers/media/pci/intel/Kconfig | 11 --------- drivers/usb/Kconfig | 2 ++ drivers/usb/Makefile | 2 ++ 5 files changed, 49 insertions(+), 11 deletions(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 878f66ef2719..071e120314cf 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -1245,6 +1245,47 @@ config VIDEO_S5C73M3 This is a V4L2 sensor driver for Samsung S5C73M3 8 Mpixel camera. +config POWER_CTRL_LOGIC + tristate "power control logic driver" + depends on GPIO_ACPI + help + This is a power control logic driver for sensor, the design + depends on camera sensor connections. + This driver controls power by getting and using managed GPIO + pins from ACPI config for sensors, such as HM11B1, OV01A1S. + + To compile this driver as a module, choose M here: the + module will be called power_ctrl_logic. + +config VIDEO_OV01A1S + tristate "OmniVision OV01A1S sensor support" + depends on POWER_CTRL_LOGIC + depends on VIDEO_V4L2 && I2C + depends on ACPI || COMPILE_TEST + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select V4L2_FWNODE + help + This is a Video4Linux2 sensor driver for the OmniVision + OV01A1S camera. + + To compile this driver as a module, choose M here: the + module will be called ov01a1s. + +config VIDEO_HM11B1 + tristate "Himax HM11B1 sensor support" + depends on POWER_CTRL_LOGIC + depends on VIDEO_V4L2 && I2C + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select V4L2_FWNODE + help + This is a Video4Linux2 sensor driver for the Himax + HM11B1 camera. + + To compile this driver as a module, choose M here: the + module will be called hm11b1. + endmenu menu "Lens drivers" diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index f0a77473979d..d1f9f495e831 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -125,3 +125,7 @@ obj-$(CONFIG_VIDEO_RDACM20) += rdacm20-camera_module.o obj-$(CONFIG_VIDEO_ST_MIPID02) += st-mipid02.o obj-$(CONFIG_SDR_MAX2175) += max2175.o + +obj-$(CONFIG_VIDEO_HM11B1) += hm11b1.o +obj-$(CONFIG_VIDEO_OV01A1S) += ov01a1s.o +obj-$(CONFIG_POWER_CTRL_LOGIC) += power_ctrl_logic.o diff --git a/drivers/media/pci/intel/Kconfig b/drivers/media/pci/intel/Kconfig index 9017ccfc7a55..defdca369fb5 100644 --- a/drivers/media/pci/intel/Kconfig +++ b/drivers/media/pci/intel/Kconfig @@ -18,15 +18,4 @@ config VIDEO_INTEL_IPU6 To compile this driver, say Y here! It contains 3 modules - intel_ipu6, intel_ipu6_isys and intel_ipu6_psys. -config VIDEO_INTEL_IPU_TPG - bool "Compile for TPG driver" - depends on VIDEO_INTEL_IPU6 - help - If selected, TPG device nodes would be created. - - Recommended for driver developers only. - - If you want to the TPG devices exposed to user as media entity, - you must select this option, otherwise no. - source "drivers/media/pci/intel/ipu3/Kconfig" diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 26475b409b53..b20e92952ed2 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -174,4 +174,6 @@ source "drivers/usb/typec/Kconfig" source "drivers/usb/roles/Kconfig" +source "drivers/usb/intel_ulpss/Kconfig" + endif # USB_SUPPORT diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 1c1c1d659394..733a1e9973b1 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -66,3 +66,5 @@ obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_TYPEC) += typec/ obj-$(CONFIG_USB_ROLE_SWITCH) += roles/ + +obj-$(CONFIG_INTEL_LPSS_USB) += intel_ulpss/