From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755242AbeARI4o (ORCPT ); Thu, 18 Jan 2018 03:56:44 -0500 Received: from mail-cys01nam02on0138.outbound.protection.outlook.com ([104.47.37.138]:62435 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754996AbeARI4l (ORCPT ); Thu, 18 Jan 2018 03:56:41 -0500 Authentication-Results: spf=pass (sender IP is 117.103.190.44) smtp.mailfrom=sony.com; linux-foundation.org; dkim=none (message not signed) header.d=none;linux-foundation.org; dmarc=bestguesspass action=none header.from=sony.com; From: To: , , , CC: , , , , , , , Subject: [PATCH v5 12/12] [media] cxd2880: Add all Makefile, Kconfig files and Update MAINTAINERS file for the driver Date: Thu, 18 Jan 2018 17:59:42 +0900 Message-ID: <20180118085942.21969-1-Yasunari.Takiguchi@sony.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180118084016.20689-1-Yasunari.Takiguchi@sony.com> References: <20180118084016.20689-1-Yasunari.Takiguchi@sony.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [43.25.41.74] X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:117.103.190.44;IPV:NLI;CTRY:JP;EFV:NLI;SFV:NSPM;SFS:(10019020)(376002)(346002)(39860400002)(39380400002)(396003)(2980300002)(438002)(189003)(199004)(7736002)(7636002)(1076002)(2950100002)(6116002)(59450400001)(2876002)(8676002)(6306002)(106466001)(50226002)(5660300001)(10710500007)(956003)(2420400007)(15650500001)(16526018)(356003)(110136005)(48376002)(50466002)(106002)(8936002)(316002)(966005)(3846002)(49486002)(36756003)(512794004)(26005)(6666003)(47776003)(478600001)(86152003)(72206003)(39060400002)(54906003)(51416003)(16586007)(107886003)(53376002)(2906002)(76176011)(4326008)(246002)(305945005)(2201001)(66066001)(86362001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR1301MB2028;H:jp.sony.com;FPR:;SPF:Pass;PTR:jpyokxeg104.jp.sony.com;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1NAM02FT022;1:4BbRHJtPHUYJWgG4vUhtIjVWRhfyA3VKxSx9rhnlsrskJq3/AacQIYjNB4xVBhqdmFMP8zvqU6lETU4lOqtu+y7wIfUM4H6PXXm4vGKXfvz8G5skRgyFkzbsEJlLO1VY X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2662248c-2157-4d32-5f7d-08d55e51439e X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(2017052603307)(7193020);SRVR:DM5PR1301MB2028; X-Microsoft-Exchange-Diagnostics: 1;DM5PR1301MB2028;3:ZPHfpwoF2wcw0N+1MS2V1zk47y9UTkuAv55CF9z/2BD156XjamDlLGFbQspdR2vc8PQhvU5OcWg5l4Gvdtvh1FNvt9PgR+JWxpOVAkhXwe3RJujv66i3GKhsBFhEgpqiDlARDV8Ja7NxMt0bzstU2bRyWTsM2vX6/0ZrzQH0+MO1VS3UiF9lrWww+nB28yWwgHW2zDby1xDwh1gvgFV/BvlPy+MdKs2NO4zY+67+Bz5XiD2nBRl7RBN/GIFIxL3A71hwSILraQR0F+sQlcwkfJM/u5GuWqKFsZKGw2ZrustJO01rsL+DeMyTHKmV6k084ekzR0mlcJPRsaO7iL9AyRmOstkaGRC3zGaXMXdAAeg=;25:ZwieP/mkvvlZXxa0y62WIagn3M/vFHApiLwZ27c1CniLKPk81FimK5okjq0jSIpDilQtTQkVNXy48AByZF0WCCp84k5+wssUHqViDA+9TbfC6UzzGbRDqE3XbauCUrRPurR25W/S/iC0zHOOoSAFJteNs+XCy2DfeQsLZt8proriYncPgVjOBZRUV+8d0Cj3pdVgSo9/bf2Xlz2lcoFXdWsHsuwSS7C1+4kHX5uMWaLoKFfllStceLKw4ypuAt2Ld4yW27iI4jMQLXYVENs6HveOyT5jhofQ3Dz3RjFVifPA92FvgWkH9UkIOZEndcci4fWkKdiUlYgLmavQSh8iaQ== X-MS-TrafficTypeDiagnostic: DM5PR1301MB2028: X-Microsoft-Exchange-Diagnostics: 1;DM5PR1301MB2028;31:4aZAq6qrEvfUBcqaydVBt/dsU1Zn6omtDDcAQC4K12Myf5WgLB1sK0w2r1ViI9nc6aVxTkxQMJdwpL7S2DeJSPiUnGffYi1MwMe2rawLzRdDYL9nYthY5SMkZdL1J0KMsqZ0E88JEZKisLnOVnCC6z5ApQrFFzyqwN9zoFlDpuLEU7ZanW9LiD9oRKcpYAXm+/n7xx1335GvMRJPWsE1jWdZWgS8gP5fFYT8T9WmIU0=;20:vRJZlYHGxw1t9sxvajMXUrgw+qbhzO/nl4Tqu3MJIMTXQA3uCVkqQDw2jBq7Js9sN/YXeuTgMAkhzreYrPQjZSIpF6Z+qlL4ILiWUWzBT/e2eRdBcEhZiKq7Z9mCE8ACb14eDShNypMM93r68NOkrjOk8vL6vvkH2vO7c5MUO8l4M12j3mA/8aW/pShGglOVVq74cz7L9J/ecmdKrmuVqlp7G1QEK6frSRSOY5TTCuunFwNvxay2zikElMpw6fet7DO20UAnfq3kU3GYbzFyCQaBf9BHRJMdKpbHlL2QiGv1qdouc9vEwflyIugypriUDcpNC/F84JKf+9O6LJTM8Z6NcBsy9AwZdOJz1pJVxkuNixBK/5h2YLTH4RPcVqO+/Wk+gDOTFBvDxmTGTXE7HL5zqrLZezCPvnoUNv1xDx+dWUGEsJ9PziGTixnbeSmki06t3BPserbrRMJjH4I7oeON5XmHbgZSGa30iV3QgmzuuIL3BLBuul81FOq/iGuH X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(182409339516656)(9452136761055)(85827821059158); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040470)(2401047)(5005006)(8121501046)(10201501046)(3231023)(11241501184)(2400059)(944501161)(93006095)(93004095)(3002001)(6055026)(6041268)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR1301MB2028;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:DM5PR1301MB2028; X-Microsoft-Exchange-Diagnostics: 1;DM5PR1301MB2028;4:apf4UxBSQqUU3oJNuzuvMWHoppN4LtGd/UVQvT4+MID2vlqth8dtSpzWQPEgHgfKmf5t7YgWG7HM+I/pX4hJOAmqWclBlDldBQqF+zIekcVhJA21U66Pl/HG8RBRdE6D9juwlNftsKYcIU3/r11/hYI6JdYOD998PnTaYhia6iQXGkOrpYw6b5Wli0H0jYyxwjfRNxqAqcbmQh4uPuxZIjaBd3Mdew49035oylyxiWyiL56T/dR6HcYpk6PpG4h+SIO13LPN1//hHgh5YP4hWlRRMSnBLffzMVF81bBGmp9n9Z6jUIyyiRKIePGiKBCqJf1XPCicU0gyK4569v/gbY3R3TdDPaSGX+hs1wMB4H9LjXfokzCrhr9P+9KyofzW X-Forefront-PRVS: 05568D1FF7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR1301MB2028;23:ESHrTchyK3aNsMWXiNHRLAu/M/MfT/ELE5LcIM5?= =?us-ascii?Q?gMK5pYry/TPFoEw1pMzZ9J3BUy4/iBP1h1XsY2iNOi1tivFyIvSfajgr3u7E?= =?us-ascii?Q?LbGGRoArKTo1W+N6nsb18nqK4lDEaesfCyMq5wFISFZseytXGKzc3JkHjEND?= =?us-ascii?Q?IamtjCyLXLBRU5xTp/44VIUIc0WzUzxkm5/gmG/Jkq2jkT1zDH7TVcQizUpf?= =?us-ascii?Q?klNZsKYcAzzI1F8W+M/kNVvEDn2hzhnRGnTtsWPUbmGMLdUZ8CcQH7jIPNud?= =?us-ascii?Q?we9EiOM4B3TpltMU+9weOcLMk9Q/DrXIhN4xBhabguzm0tieHufP5pHlW2bv?= =?us-ascii?Q?dzmuSxyvivduuqVDLO3YKEwnVkLNh0Zfetak43Iv2+4IEXGuQtuqJJyuuX5o?= =?us-ascii?Q?WcsR01pqArGxkkIyGGCMSnGjwwSMMNgUuMCDGDhy4/Bs4bfybMtOxFx3IJSl?= =?us-ascii?Q?1QuT2l5s5535H5Pgp+MUgrqfa7Z/D4mHdJzjhTq+3L4vvxdZi7e2nrIPunnw?= =?us-ascii?Q?HcFMhEI5JTLxDmKwOPDXLBgOM+mYIX8y8AogpH9LtRw6cRvcY+QRbQ4tmleK?= =?us-ascii?Q?VwAz3iljavbOiEZfNQ0PXd+/fAou/YwG9SRx+HegtD+0dt5nkqO8qUZ1BM8n?= =?us-ascii?Q?hRtma1m1PLNz0r5UYCKNWsPK7M8zWRAGqcRsUmpGziPQWYlJaTr8fWLqTeCW?= =?us-ascii?Q?IZevJai4UJyj18ddeLrwofAT5j7VFIbrnaD/b5AMrzoxSri6UPi+qaI/nRRY?= =?us-ascii?Q?VRjulXG+V58Blyukw+nJCQoIYmfkcm+Qdj/pEaxzuXRZ4XEOEqv1Ii3G6Vmz?= =?us-ascii?Q?0ZaIqOpxlE0AAcB051SoyAXJ94UXTbAE8NYC+Y3VSawKFy2bWKmL/cH1Qdqj?= =?us-ascii?Q?9I1iPAUk+6R9BzNf5adt4gYODmpNRUFw3V81XHYQSSf2En83jdcgymijqYnF?= =?us-ascii?Q?/xdik5verZLWHUPTlN1pQ9yA6HTHZmOXrSC6OMwzEW9h0NN5ool4AkhQij+h?= =?us-ascii?Q?s9NQDr+sCYg0AImj2QBVa7iJVrapTRLci9o/H5oXe1VsOryJIMd5SJZavAwz?= =?us-ascii?Q?SPR8si5Xepzp647/truMnU9d3PJkAN+2ngbgU4QCmSBjAwQnD4wETOrLhzFq?= =?us-ascii?Q?l2sVQ5fxc9Pzyt1nVbiODhk+EUY9otw9LcwOU9VusRRzDFeFq7CNHhsxnIHH?= =?us-ascii?Q?rahu9q4wW72MwdZUjTI/O4RRKtRVySH6FHD+U+Nda+MrS5RDegcQfJwDDnIF?= =?us-ascii?Q?Fytjom+rdjVV/XTWd5TNIybMWseD2Ec9cjd6d7oxgCwT6uGDbASBZDerb9pu?= =?us-ascii?Q?OIDtKlb+G6mMg268ZitBHq7356hEaHIBwqe31raPAlbIz?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR1301MB2028;6:hKrsG38SjWmykkZuPIm51+AnTsseptjjSti1aYgTEDRYWoYAHBNH0W9l4sVrOWlj3r1AzHAOUa4FuYZRr4DyeMqGgydxS0kNDUudWTNytyd9PysKmKYQhmoEU106wqNiUBN/6XpTTgsoYGuYKpvbv8/EfZE+rlDtuGcZHc0Qz5bCXnOdmPlaH/33U0drKntUUNjhqu+Vv6Qt13nWNOBh8D2k0egt9YNc90WTdMAmTYmbOmHM9x87KQv9nTsOf+H/xD1dUyUt2ozU0OF0IOL7+tpzGcX2mhg+2iQ1I3WhS0kdBrLfC2zteMAoYWPAZu8Ez+sGsJ1XFE5NY0f5yLhP7FaPh+ajFpeNZ/fg3ZLYP3M=;5:XzoVTnxhIU8ByqvCphOi5J5J33I0ijG7c8p0Ft0IotohyG7dzx91IF6pCpFRzAx/ngYKl1f0nd6n88lax1P75VPBYog/6NnfSAu5AS3GBa/cfuMEe3PcGjET5JJsmMe+wCckE4ZYt5OQ+9izoU/xyjNjo6ayw6fbAhRa6GelstQ=;24:E4bBFMRmy2vGUYlEy0XxI4w/QEqjjahT0QzEi5UK2lfyLPyRO3eKs45DGx+avi+zOkRBn+20y3g/J3ZhKCXWAqUesky/GVwpK5JCae8fSbY=;7:QlqZc8kbqdyeXAm77btI7AuZupt/15NSyZ9VnlPnk3J5PJXGgHqKMoj8Mlqf0weEoAjr68pJLyzyyRh2j+5bcPGyqWUKaDVjATQFUoW2+PlXJqImcIhbOs4MuwvrHZW44xs3ALj4JuLms2wTLdziu2TtGH4/BXfzxLKx9ZKMBW2ipcTm1g1QCJQdVImps9VpH1oGdHA7MPkd0e1CW7IYtQ4ww+zVtxAs4pbg3/c9gLALpod8xJV55zxIi8DZiL/l SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: sony.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 08:55:45.7451 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2662248c-2157-4d32-5f7d-08d55e51439e X-MS-Exchange-CrossTenant-Id: 66c65d8a-9158-4521-a2d8-664963db48e4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=66c65d8a-9158-4521-a2d8-664963db48e4;Ip=[117.103.190.44];Helo=[jp.sony.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1301MB2028 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yasunari Takiguchi This is the Makefile, Kconfig files of driver and MAINTAINERS file update about the driver for the Sony CXD2880 DVB-T2/T tuner + demodulator. Signed-off-by: Yasunari Takiguchi Signed-off-by: Masayuki Yamamoto Signed-off-by: Hideki Nozawa Signed-off-by: Kota Yonezawa Signed-off-by: Toshihiko Matsumoto Signed-off-by: Satoshi Watanabe --- [Change list] Changes in V5 drivers/media/dvb-frontends/cxd2880/Makefile -Using SPDX-License-Identifier -removed cxd2880_stopwatch_port.o drivers/media/dvb-frontends/cxd2880/Kconfig -Using SPDX-License-Identifier Changes in V4 We put [PATCH v3 12/14], [PATCH v3 13/14] and [PATCH v3 14/14] in [PATCH v4 12/12]. drivers/media/dvb-frontends/cxd2880/Makefile -removed cxd2880_integ_dvbt2.o and cxd2880_integ_dvbt.o Changes in V3 drivers/media/dvb-frontends/cxd2880/Makefile -removed cxd2880_math.o MAINTAINERS | 9 +++++++++ drivers/media/dvb-frontends/Kconfig | 2 ++ drivers/media/dvb-frontends/Makefile | 1 + drivers/media/dvb-frontends/cxd2880/Kconfig | 8 ++++++++ drivers/media/dvb-frontends/cxd2880/Makefile | 19 +++++++++++++++++++ drivers/media/spi/Kconfig | 14 ++++++++++++++ drivers/media/spi/Makefile | 5 +++++ 7 files changed, 58 insertions(+) create mode 100644 drivers/media/dvb-frontends/cxd2880/Kconfig create mode 100644 drivers/media/dvb-frontends/cxd2880/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index 18994806e441..fcdbd7874ffb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8549,6 +8549,15 @@ T: git git://linuxtv.org/media_tree.git S: Supported F: drivers/media/dvb-frontends/cxd2841er* +MEDIA DRIVERS FOR CXD2880 +M: Yasunari Takiguchi +L: linux-media@vger.kernel.org +W: http://linuxtv.org/ +T: git git://linuxtv.org/media_tree.git +S: Supported +F: drivers/media/dvb-frontends/cxd2880/* +F: drivers/media/spi/cxd2880* + MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES M: Daniel Scheller L: linux-media@vger.kernel.org diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig index d17722eb4456..7fb626c00a39 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig @@ -546,6 +546,8 @@ config DVB_GP8PSK_FE depends on DVB_CORE default DVB_USB_GP8PSK +source "drivers/media/dvb-frontends/cxd2880/Kconfig" + comment "DVB-C (cable) frontends" depends on DVB_CORE diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile index d025eb373842..7c7aca05678a 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile @@ -130,3 +130,4 @@ obj-$(CONFIG_DVB_HORUS3A) += horus3a.o obj-$(CONFIG_DVB_ASCOT2E) += ascot2e.o obj-$(CONFIG_DVB_HELENE) += helene.o obj-$(CONFIG_DVB_ZD1301_DEMOD) += zd1301_demod.o +obj-$(CONFIG_DVB_CXD2880) += cxd2880/ diff --git a/drivers/media/dvb-frontends/cxd2880/Kconfig b/drivers/media/dvb-frontends/cxd2880/Kconfig new file mode 100644 index 000000000000..9d989676e800 --- /dev/null +++ b/drivers/media/dvb-frontends/cxd2880/Kconfig @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 + +config DVB_CXD2880 + tristate "Sony CXD2880 DVB-T2/T tuner + demodulator" + depends on DVB_CORE && SPI + default m if !MEDIA_SUBDRV_AUTOSELECT + help + Say Y when you want to support this frontend. \ No newline at end of file diff --git a/drivers/media/dvb-frontends/cxd2880/Makefile b/drivers/media/dvb-frontends/cxd2880/Makefile new file mode 100644 index 000000000000..65a5d37f28cc --- /dev/null +++ b/drivers/media/dvb-frontends/cxd2880/Makefile @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0 + +cxd2880-objs := cxd2880_common.o \ + cxd2880_devio_spi.o \ + cxd2880_integ.o \ + cxd2880_io.o \ + cxd2880_spi_device.o \ + cxd2880_tnrdmd.o \ + cxd2880_tnrdmd_dvbt2.o \ + cxd2880_tnrdmd_dvbt2_mon.o \ + cxd2880_tnrdmd_dvbt.o \ + cxd2880_tnrdmd_dvbt_mon.o\ + cxd2880_tnrdmd_mon.o\ + cxd2880_top.o + +obj-$(CONFIG_DVB_CXD2880) += cxd2880.o + +ccflags-y += -Idrivers/media/dvb-core +ccflags-y += -Idrivers/media/dvb-frontends diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig index a21f5a39a440..b07ac86fc53c 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -12,3 +12,17 @@ config VIDEO_GS1662 endmenu endif + +if SPI +menu "Media SPI Adapters" + +config CXD2880_SPI_DRV + tristate "Sony CXD2880 SPI support" + depends on DVB_CORE && SPI + default m if !MEDIA_SUBDRV_AUTOSELECT + help + Choose if you would like to have SPI interface support for Sony CXD2880. + +endmenu + +endif diff --git a/drivers/media/spi/Makefile b/drivers/media/spi/Makefile index ea64013d16cc..9e536777a330 100644 --- a/drivers/media/spi/Makefile +++ b/drivers/media/spi/Makefile @@ -1 +1,6 @@ obj-$(CONFIG_VIDEO_GS1662) += gs1662.o +obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o + +ccflags-y += -Idrivers/media/dvb-core +ccflags-y += -Idrivers/media/dvb-frontends +ccflags-y += -Idrivers/media/dvb-frontends/cxd2880 -- 2.15.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: [PATCH v5 12/12] [media] cxd2880: Add all Makefile, Kconfig files and Update MAINTAINERS file for the driver Date: Thu, 18 Jan 2018 17:59:42 +0900 Message-ID: <20180118085942.21969-1-Yasunari.Takiguchi@sony.com> References: <20180118084016.20689-1-Yasunari.Takiguchi@sony.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20180118084016.20689-1-Yasunari.Takiguchi@sony.com> Sender: linux-kernel-owner@vger.kernel.org To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-media@vger.kernel.org Cc: tbird20d@gmail.com, frowand.list@gmail.com, Yasunari.Takiguchi@sony.com, Masayuki.Yamamoto@sony.com, Hideki.Nozawa@sony.com, Kota.Yonezawa@sony.com, Toshihiko.Matsumoto@sony.com, Satoshi.C.Watanabe@sony.com List-Id: devicetree@vger.kernel.org From: Yasunari Takiguchi This is the Makefile, Kconfig files of driver and MAINTAINERS file update about the driver for the Sony CXD2880 DVB-T2/T tuner + demodulator. Signed-off-by: Yasunari Takiguchi Signed-off-by: Masayuki Yamamoto Signed-off-by: Hideki Nozawa Signed-off-by: Kota Yonezawa Signed-off-by: Toshihiko Matsumoto Signed-off-by: Satoshi Watanabe --- [Change list] Changes in V5 drivers/media/dvb-frontends/cxd2880/Makefile -Using SPDX-License-Identifier -removed cxd2880_stopwatch_port.o drivers/media/dvb-frontends/cxd2880/Kconfig -Using SPDX-License-Identifier Changes in V4 We put [PATCH v3 12/14], [PATCH v3 13/14] and [PATCH v3 14/14] in [PATCH v4 12/12]. drivers/media/dvb-frontends/cxd2880/Makefile -removed cxd2880_integ_dvbt2.o and cxd2880_integ_dvbt.o Changes in V3 drivers/media/dvb-frontends/cxd2880/Makefile -removed cxd2880_math.o MAINTAINERS | 9 +++++++++ drivers/media/dvb-frontends/Kconfig | 2 ++ drivers/media/dvb-frontends/Makefile | 1 + drivers/media/dvb-frontends/cxd2880/Kconfig | 8 ++++++++ drivers/media/dvb-frontends/cxd2880/Makefile | 19 +++++++++++++++++++ drivers/media/spi/Kconfig | 14 ++++++++++++++ drivers/media/spi/Makefile | 5 +++++ 7 files changed, 58 insertions(+) create mode 100644 drivers/media/dvb-frontends/cxd2880/Kconfig create mode 100644 drivers/media/dvb-frontends/cxd2880/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index 18994806e441..fcdbd7874ffb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8549,6 +8549,15 @@ T: git git://linuxtv.org/media_tree.git S: Supported F: drivers/media/dvb-frontends/cxd2841er* +MEDIA DRIVERS FOR CXD2880 +M: Yasunari Takiguchi +L: linux-media@vger.kernel.org +W: http://linuxtv.org/ +T: git git://linuxtv.org/media_tree.git +S: Supported +F: drivers/media/dvb-frontends/cxd2880/* +F: drivers/media/spi/cxd2880* + MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES M: Daniel Scheller L: linux-media@vger.kernel.org diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig index d17722eb4456..7fb626c00a39 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig @@ -546,6 +546,8 @@ config DVB_GP8PSK_FE depends on DVB_CORE default DVB_USB_GP8PSK +source "drivers/media/dvb-frontends/cxd2880/Kconfig" + comment "DVB-C (cable) frontends" depends on DVB_CORE diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile index d025eb373842..7c7aca05678a 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile @@ -130,3 +130,4 @@ obj-$(CONFIG_DVB_HORUS3A) += horus3a.o obj-$(CONFIG_DVB_ASCOT2E) += ascot2e.o obj-$(CONFIG_DVB_HELENE) += helene.o obj-$(CONFIG_DVB_ZD1301_DEMOD) += zd1301_demod.o +obj-$(CONFIG_DVB_CXD2880) += cxd2880/ diff --git a/drivers/media/dvb-frontends/cxd2880/Kconfig b/drivers/media/dvb-frontends/cxd2880/Kconfig new file mode 100644 index 000000000000..9d989676e800 --- /dev/null +++ b/drivers/media/dvb-frontends/cxd2880/Kconfig @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 + +config DVB_CXD2880 + tristate "Sony CXD2880 DVB-T2/T tuner + demodulator" + depends on DVB_CORE && SPI + default m if !MEDIA_SUBDRV_AUTOSELECT + help + Say Y when you want to support this frontend. \ No newline at end of file diff --git a/drivers/media/dvb-frontends/cxd2880/Makefile b/drivers/media/dvb-frontends/cxd2880/Makefile new file mode 100644 index 000000000000..65a5d37f28cc --- /dev/null +++ b/drivers/media/dvb-frontends/cxd2880/Makefile @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0 + +cxd2880-objs := cxd2880_common.o \ + cxd2880_devio_spi.o \ + cxd2880_integ.o \ + cxd2880_io.o \ + cxd2880_spi_device.o \ + cxd2880_tnrdmd.o \ + cxd2880_tnrdmd_dvbt2.o \ + cxd2880_tnrdmd_dvbt2_mon.o \ + cxd2880_tnrdmd_dvbt.o \ + cxd2880_tnrdmd_dvbt_mon.o\ + cxd2880_tnrdmd_mon.o\ + cxd2880_top.o + +obj-$(CONFIG_DVB_CXD2880) += cxd2880.o + +ccflags-y += -Idrivers/media/dvb-core +ccflags-y += -Idrivers/media/dvb-frontends diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig index a21f5a39a440..b07ac86fc53c 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -12,3 +12,17 @@ config VIDEO_GS1662 endmenu endif + +if SPI +menu "Media SPI Adapters" + +config CXD2880_SPI_DRV + tristate "Sony CXD2880 SPI support" + depends on DVB_CORE && SPI + default m if !MEDIA_SUBDRV_AUTOSELECT + help + Choose if you would like to have SPI interface support for Sony CXD2880. + +endmenu + +endif diff --git a/drivers/media/spi/Makefile b/drivers/media/spi/Makefile index ea64013d16cc..9e536777a330 100644 --- a/drivers/media/spi/Makefile +++ b/drivers/media/spi/Makefile @@ -1 +1,6 @@ obj-$(CONFIG_VIDEO_GS1662) += gs1662.o +obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o + +ccflags-y += -Idrivers/media/dvb-core +ccflags-y += -Idrivers/media/dvb-frontends +ccflags-y += -Idrivers/media/dvb-frontends/cxd2880 -- 2.15.1