From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5CF0C433DB for ; Mon, 1 Mar 2021 10:26:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6337960232 for ; Mon, 1 Mar 2021 10:26:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234070AbhCAK0U (ORCPT ); Mon, 1 Mar 2021 05:26:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234123AbhCAKYX (ORCPT ); Mon, 1 Mar 2021 05:24:23 -0500 Received: from gofer.mess.org (gofer.mess.org [IPv6:2a02:8011:d000:212::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2095C06174A; Mon, 1 Mar 2021 02:23:42 -0800 (PST) Received: by gofer.mess.org (Postfix, from userid 1000) id 81340C6367; Mon, 1 Mar 2021 10:23:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mess.org; s=2020; t=1614594218; bh=am147Tq+Oek5Pv+q8gEhQQbv5ON/ZydsZvZMt6S0vIg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TIV+m7ReoBRp5r9rdxH3X/Ub7JbkrPFGIeRVIm8XypsdkO41Ll3am4GmMeUdOWL/t aN46x7GYCTxLkaX9XZRLVQrZKQ7S1CseXq8L+0faSli2HaERzNxER0ZjH5dRvbDDTX PEd8vyLNmLxIy2Fvb220If4lcrBIFtatks9bE1idGt+SZI5BNj4NSa17gkRpoSJ+CS piuNTS3auU55kvNys/AB5c7gmU0ZSZ7c8MidMTs/i4PH8CQ7bpT40HBI71T+xCCLKP 2mPKu+FluZJ8tOOEn/oMrmrZFaeaB4KqHVsoywOLCXiDqr8PioS8S/btrJaWA1N6rZ eQn45C6rDPKtQ== Date: Mon, 1 Mar 2021 10:23:38 +0000 From: Sean Young To: Arnd Bergmann Cc: =?iso-8859-1?Q?M=E5ns_Rullg=E5rd?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Arnd Bergmann , Marc Gonzalez Subject: Re: [PATCH 1/2] media: rc: remove tango ir driver Message-ID: <20210301102338.GA25633@gofer.mess.org> References: <20210120142542.4100741-1-arnd@kernel.org> <20210120142542.4100741-2-arnd@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Arnd, On Thu, Jan 21, 2021 at 01:57:28PM +0000, Måns Rullgård wrote: > Arnd Bergmann writes: > > > From: Arnd Bergmann > > > > The tango platform is getting removed, so the driver is no > > longer needed. > > > > Cc: Marc Gonzalez > > Cc: Mans Rullgard > > Signed-off-by: Arnd Bergmann > > --- > > drivers/media/rc/Kconfig | 10 -- > > drivers/media/rc/Makefile | 1 - > > drivers/media/rc/tango-ir.c | 267 ------------------------------------ > > 3 files changed, 278 deletions(-) > > delete mode 100644 drivers/media/rc/tango-ir.c > > The DT binding can go too. Please can we have a patch which also removes all of: Documentation/devicetree/bindings/media/tango-ir.txt drivers/media/rc/keymaps/rc-tango.c Any references to RC_MAP_TANGO and rc-tango. Thanks Sean > > Otherwise: > > Acked-by: Mans Rullgard > > > > diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig > > index 2c0ee2e5b446..39bc75cc1848 100644 > > --- a/drivers/media/rc/Kconfig > > +++ b/drivers/media/rc/Kconfig > > @@ -497,16 +497,6 @@ config IR_SIR > > To compile this driver as a module, choose M here: the module will > > be called sir-ir. > > > > -config IR_TANGO > > - tristate "Sigma Designs SMP86xx IR decoder" > > - depends on RC_CORE > > - depends on ARCH_TANGO || COMPILE_TEST > > - help > > - Adds support for the HW IR decoder embedded on Sigma Designs > > - Tango-based systems (SMP86xx, SMP87xx). > > - The HW decoder supports NEC, RC-5, RC-6 IR protocols. > > - When compiled as a module, look for tango-ir. > > - > > config RC_XBOX_DVD > > tristate "Xbox DVD Movie Playback Kit" > > depends on RC_CORE > > diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile > > index 5bb2932ab119..f46a72071a7b 100644 > > --- a/drivers/media/rc/Makefile > > +++ b/drivers/media/rc/Makefile > > @@ -48,6 +48,5 @@ obj-$(CONFIG_IR_SERIAL) += serial_ir.o > > obj-$(CONFIG_IR_SIR) += sir_ir.o > > obj-$(CONFIG_IR_MTK) += mtk-cir.o > > obj-$(CONFIG_IR_ZX) += zx-irdec.o > > -obj-$(CONFIG_IR_TANGO) += tango-ir.o > > obj-$(CONFIG_RC_XBOX_DVD) += xbox_remote.o > > obj-$(CONFIG_IR_TOY) += ir_toy.o > > diff --git a/drivers/media/rc/tango-ir.c b/drivers/media/rc/tango-ir.c > > deleted file mode 100644 > > index b8eb5bc4d9be..000000000000 > > --- a/drivers/media/rc/tango-ir.c > > +++ /dev/null > > @@ -1,267 +0,0 @@ > > -// SPDX-License-Identifier: GPL-2.0-or-later > > -/* > > - * Copyright (C) 2015 Mans Rullgard > > - */ > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#define DRIVER_NAME "tango-ir" > > - > > -#define IR_NEC_CTRL 0x00 > > -#define IR_NEC_DATA 0x04 > > -#define IR_CTRL 0x08 > > -#define IR_RC5_CLK_DIV 0x0c > > -#define IR_RC5_DATA 0x10 > > -#define IR_INT 0x14 > > - > > -#define NEC_TIME_BASE 560 > > -#define RC5_TIME_BASE 1778 > > - > > -#define RC6_CTRL 0x00 > > -#define RC6_CLKDIV 0x04 > > -#define RC6_DATA0 0x08 > > -#define RC6_DATA1 0x0c > > -#define RC6_DATA2 0x10 > > -#define RC6_DATA3 0x14 > > -#define RC6_DATA4 0x18 > > - > > -#define RC6_CARRIER 36000 > > -#define RC6_TIME_BASE 16 > > - > > -#define NEC_CAP(n) ((n) << 24) > > -#define GPIO_SEL(n) ((n) << 16) > > -#define DISABLE_NEC (BIT(4) | BIT(8)) > > -#define ENABLE_RC5 (BIT(0) | BIT(9)) > > -#define ENABLE_RC6 (BIT(0) | BIT(7)) > > -#define ACK_IR_INT (BIT(0) | BIT(1)) > > -#define ACK_RC6_INT (BIT(31)) > > - > > -#define NEC_ANY (RC_PROTO_BIT_NEC | RC_PROTO_BIT_NECX | RC_PROTO_BIT_NEC32) > > - > > -struct tango_ir { > > - void __iomem *rc5_base; > > - void __iomem *rc6_base; > > - struct rc_dev *rc; > > - struct clk *clk; > > -}; > > - > > -static void tango_ir_handle_nec(struct tango_ir *ir) > > -{ > > - u32 v, code; > > - enum rc_proto proto; > > - > > - v = readl_relaxed(ir->rc5_base + IR_NEC_DATA); > > - if (!v) { > > - rc_repeat(ir->rc); > > - return; > > - } > > - > > - code = ir_nec_bytes_to_scancode(v, v >> 8, v >> 16, v >> 24, &proto); > > - rc_keydown(ir->rc, proto, code, 0); > > -} > > - > > -static void tango_ir_handle_rc5(struct tango_ir *ir) > > -{ > > - u32 data, field, toggle, addr, cmd, code; > > - > > - data = readl_relaxed(ir->rc5_base + IR_RC5_DATA); > > - if (data & BIT(31)) > > - return; > > - > > - field = data >> 12 & 1; > > - toggle = data >> 11 & 1; > > - addr = data >> 6 & 0x1f; > > - cmd = (data & 0x3f) | (field ^ 1) << 6; > > - > > - code = RC_SCANCODE_RC5(addr, cmd); > > - rc_keydown(ir->rc, RC_PROTO_RC5, code, toggle); > > -} > > - > > -static void tango_ir_handle_rc6(struct tango_ir *ir) > > -{ > > - u32 data0, data1, toggle, mode, addr, cmd, code; > > - > > - data0 = readl_relaxed(ir->rc6_base + RC6_DATA0); > > - data1 = readl_relaxed(ir->rc6_base + RC6_DATA1); > > - > > - mode = data0 >> 1 & 7; > > - if (mode != 0) > > - return; > > - > > - toggle = data0 & 1; > > - addr = data0 >> 16; > > - cmd = data1; > > - > > - code = RC_SCANCODE_RC6_0(addr, cmd); > > - rc_keydown(ir->rc, RC_PROTO_RC6_0, code, toggle); > > -} > > - > > -static irqreturn_t tango_ir_irq(int irq, void *dev_id) > > -{ > > - struct tango_ir *ir = dev_id; > > - unsigned int rc5_stat; > > - unsigned int rc6_stat; > > - > > - rc5_stat = readl_relaxed(ir->rc5_base + IR_INT); > > - writel_relaxed(rc5_stat, ir->rc5_base + IR_INT); > > - > > - rc6_stat = readl_relaxed(ir->rc6_base + RC6_CTRL); > > - writel_relaxed(rc6_stat, ir->rc6_base + RC6_CTRL); > > - > > - if (!(rc5_stat & 3) && !(rc6_stat & BIT(31))) > > - return IRQ_NONE; > > - > > - if (rc5_stat & BIT(0)) > > - tango_ir_handle_rc5(ir); > > - > > - if (rc5_stat & BIT(1)) > > - tango_ir_handle_nec(ir); > > - > > - if (rc6_stat & BIT(31)) > > - tango_ir_handle_rc6(ir); > > - > > - return IRQ_HANDLED; > > -} > > - > > -static int tango_change_protocol(struct rc_dev *dev, u64 *rc_type) > > -{ > > - struct tango_ir *ir = dev->priv; > > - u32 rc5_ctrl = DISABLE_NEC; > > - u32 rc6_ctrl = 0; > > - > > - if (*rc_type & NEC_ANY) > > - rc5_ctrl = 0; > > - > > - if (*rc_type & RC_PROTO_BIT_RC5) > > - rc5_ctrl |= ENABLE_RC5; > > - > > - if (*rc_type & RC_PROTO_BIT_RC6_0) > > - rc6_ctrl = ENABLE_RC6; > > - > > - writel_relaxed(rc5_ctrl, ir->rc5_base + IR_CTRL); > > - writel_relaxed(rc6_ctrl, ir->rc6_base + RC6_CTRL); > > - > > - return 0; > > -} > > - > > -static int tango_ir_probe(struct platform_device *pdev) > > -{ > > - const char *map_name = RC_MAP_TANGO; > > - struct device *dev = &pdev->dev; > > - struct rc_dev *rc; > > - struct tango_ir *ir; > > - u64 clkrate, clkdiv; > > - int irq, err; > > - u32 val; > > - > > - irq = platform_get_irq(pdev, 0); > > - if (irq <= 0) > > - return -EINVAL; > > - > > - ir = devm_kzalloc(dev, sizeof(*ir), GFP_KERNEL); > > - if (!ir) > > - return -ENOMEM; > > - > > - ir->rc5_base = devm_platform_ioremap_resource(pdev, 0); > > - if (IS_ERR(ir->rc5_base)) > > - return PTR_ERR(ir->rc5_base); > > - > > - ir->rc6_base = devm_platform_ioremap_resource(pdev, 1); > > - if (IS_ERR(ir->rc6_base)) > > - return PTR_ERR(ir->rc6_base); > > - > > - ir->clk = devm_clk_get(dev, NULL); > > - if (IS_ERR(ir->clk)) > > - return PTR_ERR(ir->clk); > > - > > - rc = devm_rc_allocate_device(dev, RC_DRIVER_SCANCODE); > > - if (!rc) > > - return -ENOMEM; > > - > > - of_property_read_string(dev->of_node, "linux,rc-map-name", &map_name); > > - > > - rc->device_name = DRIVER_NAME; > > - rc->driver_name = DRIVER_NAME; > > - rc->input_phys = DRIVER_NAME "/input0"; > > - rc->map_name = map_name; > > - rc->allowed_protocols = NEC_ANY | RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC6_0; > > - rc->change_protocol = tango_change_protocol; > > - rc->priv = ir; > > - ir->rc = rc; > > - > > - err = clk_prepare_enable(ir->clk); > > - if (err) > > - return err; > > - > > - clkrate = clk_get_rate(ir->clk); > > - > > - clkdiv = clkrate * NEC_TIME_BASE; > > - do_div(clkdiv, 1000000); > > - > > - val = NEC_CAP(31) | GPIO_SEL(12) | clkdiv; > > - writel_relaxed(val, ir->rc5_base + IR_NEC_CTRL); > > - > > - clkdiv = clkrate * RC5_TIME_BASE; > > - do_div(clkdiv, 1000000); > > - > > - writel_relaxed(DISABLE_NEC, ir->rc5_base + IR_CTRL); > > - writel_relaxed(clkdiv, ir->rc5_base + IR_RC5_CLK_DIV); > > - writel_relaxed(ACK_IR_INT, ir->rc5_base + IR_INT); > > - > > - clkdiv = clkrate * RC6_TIME_BASE; > > - do_div(clkdiv, RC6_CARRIER); > > - > > - writel_relaxed(ACK_RC6_INT, ir->rc6_base + RC6_CTRL); > > - writel_relaxed((clkdiv >> 2) << 18 | clkdiv, ir->rc6_base + RC6_CLKDIV); > > - > > - err = devm_request_irq(dev, irq, tango_ir_irq, IRQF_SHARED, > > - dev_name(dev), ir); > > - if (err) > > - goto err_clk; > > - > > - err = devm_rc_register_device(dev, rc); > > - if (err) > > - goto err_clk; > > - > > - platform_set_drvdata(pdev, ir); > > - return 0; > > - > > -err_clk: > > - clk_disable_unprepare(ir->clk); > > - return err; > > -} > > - > > -static int tango_ir_remove(struct platform_device *pdev) > > -{ > > - struct tango_ir *ir = platform_get_drvdata(pdev); > > - > > - clk_disable_unprepare(ir->clk); > > - return 0; > > -} > > - > > -static const struct of_device_id tango_ir_dt_ids[] = { > > - { .compatible = "sigma,smp8642-ir" }, > > - { } > > -}; > > -MODULE_DEVICE_TABLE(of, tango_ir_dt_ids); > > - > > -static struct platform_driver tango_ir_driver = { > > - .probe = tango_ir_probe, > > - .remove = tango_ir_remove, > > - .driver = { > > - .name = DRIVER_NAME, > > - .of_match_table = tango_ir_dt_ids, > > - }, > > -}; > > -module_platform_driver(tango_ir_driver); > > - > > -MODULE_DESCRIPTION("SMP86xx IR decoder driver"); > > -MODULE_AUTHOR("Mans Rullgard "); > > -MODULE_LICENSE("GPL"); > > -- > > > > 2.29.2 > > > > -- > Måns Rullgård From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACB45C433E6 for ; Mon, 1 Mar 2021 10:25:20 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 49B9D64DBD for ; Mon, 1 Mar 2021 10:25:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 49B9D64DBD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mess.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=lpQeBvQn6agozqjK+8JtMKR7iZ7Ds/U7cClRTtl4Vhs=; b=eGApui/i5dlq8HWhDSKRmj3XZ vkLbvNI28Yd6+bZHCJ8dLdSnnEu00cE/6hlDYAQESRMVyVd22GDB/hf2gjdHbZ4R0+zxGWPbTzuZ5 2kN1PRSBLRf8Z+8HLAAh8JJA0mBuTwsV5vI1Fe+DEzguE5+/P2jehie2MNcg+DVWaR4Cq4Bm36o5j iQ7KRdjefQPWUKWd7CHy8DkupGO53H60kn2vXN4cyAqRyMWk4jARiVyywrYdziTRPhhJiZpRJkAnA aiSom3FOQ3rGcX8nZuvc6InjG0QaA2b9yi6bNTFdsCEmuiWL1U8ZG2gvXJjD8euM458HOZ22Wabk0 y8KTewKCg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lGfiY-00005r-Jd; Mon, 01 Mar 2021 10:23:58 +0000 Received: from gofer.mess.org ([88.97.38.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lGfiV-0008SH-C1 for linux-arm-kernel@lists.infradead.org; Mon, 01 Mar 2021 10:23:56 +0000 Received: by gofer.mess.org (Postfix, from userid 1000) id 81340C6367; Mon, 1 Mar 2021 10:23:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mess.org; s=2020; t=1614594218; bh=am147Tq+Oek5Pv+q8gEhQQbv5ON/ZydsZvZMt6S0vIg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TIV+m7ReoBRp5r9rdxH3X/Ub7JbkrPFGIeRVIm8XypsdkO41Ll3am4GmMeUdOWL/t aN46x7GYCTxLkaX9XZRLVQrZKQ7S1CseXq8L+0faSli2HaERzNxER0ZjH5dRvbDDTX PEd8vyLNmLxIy2Fvb220If4lcrBIFtatks9bE1idGt+SZI5BNj4NSa17gkRpoSJ+CS piuNTS3auU55kvNys/AB5c7gmU0ZSZ7c8MidMTs/i4PH8CQ7bpT40HBI71T+xCCLKP 2mPKu+FluZJ8tOOEn/oMrmrZFaeaB4KqHVsoywOLCXiDqr8PioS8S/btrJaWA1N6rZ eQn45C6rDPKtQ== Date: Mon, 1 Mar 2021 10:23:38 +0000 From: Sean Young To: Arnd Bergmann Subject: Re: [PATCH 1/2] media: rc: remove tango ir driver Message-ID: <20210301102338.GA25633@gofer.mess.org> References: <20210120142542.4100741-1-arnd@kernel.org> <20210120142542.4100741-2-arnd@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210301_052355_795155_EC2FC07F X-CRM114-Status: GOOD ( 28.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?iso-8859-1?Q?M=E5ns_Rullg=E5rd?= , Arnd Bergmann , Marc Gonzalez , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Arnd, On Thu, Jan 21, 2021 at 01:57:28PM +0000, M=E5ns Rullg=E5rd wrote: > Arnd Bergmann writes: > = > > From: Arnd Bergmann > > > > The tango platform is getting removed, so the driver is no > > longer needed. > > > > Cc: Marc Gonzalez > > Cc: Mans Rullgard > > Signed-off-by: Arnd Bergmann > > --- > > drivers/media/rc/Kconfig | 10 -- > > drivers/media/rc/Makefile | 1 - > > drivers/media/rc/tango-ir.c | 267 ------------------------------------ > > 3 files changed, 278 deletions(-) > > delete mode 100644 drivers/media/rc/tango-ir.c > = > The DT binding can go too. Please can we have a patch which also removes all of: Documentation/devicetree/bindings/media/tango-ir.txt drivers/media/rc/keymaps/rc-tango.c Any references to RC_MAP_TANGO and rc-tango. Thanks Sean > = > Otherwise: > = > Acked-by: Mans Rullgard > = > = > > diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig > > index 2c0ee2e5b446..39bc75cc1848 100644 > > --- a/drivers/media/rc/Kconfig > > +++ b/drivers/media/rc/Kconfig > > @@ -497,16 +497,6 @@ config IR_SIR > > To compile this driver as a module, choose M here: the module will > > be called sir-ir. > > > > -config IR_TANGO > > - tristate "Sigma Designs SMP86xx IR decoder" > > - depends on RC_CORE > > - depends on ARCH_TANGO || COMPILE_TEST > > - help > > - Adds support for the HW IR decoder embedded on Sigma Designs > > - Tango-based systems (SMP86xx, SMP87xx). > > - The HW decoder supports NEC, RC-5, RC-6 IR protocols. > > - When compiled as a module, look for tango-ir. > > - > > config RC_XBOX_DVD > > tristate "Xbox DVD Movie Playback Kit" > > depends on RC_CORE > > diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile > > index 5bb2932ab119..f46a72071a7b 100644 > > --- a/drivers/media/rc/Makefile > > +++ b/drivers/media/rc/Makefile > > @@ -48,6 +48,5 @@ obj-$(CONFIG_IR_SERIAL) +=3D serial_ir.o > > obj-$(CONFIG_IR_SIR) +=3D sir_ir.o > > obj-$(CONFIG_IR_MTK) +=3D mtk-cir.o > > obj-$(CONFIG_IR_ZX) +=3D zx-irdec.o > > -obj-$(CONFIG_IR_TANGO) +=3D tango-ir.o > > obj-$(CONFIG_RC_XBOX_DVD) +=3D xbox_remote.o > > obj-$(CONFIG_IR_TOY) +=3D ir_toy.o > > diff --git a/drivers/media/rc/tango-ir.c b/drivers/media/rc/tango-ir.c > > deleted file mode 100644 > > index b8eb5bc4d9be..000000000000 > > --- a/drivers/media/rc/tango-ir.c > > +++ /dev/null > > @@ -1,267 +0,0 @@ > > -// SPDX-License-Identifier: GPL-2.0-or-later > > -/* > > - * Copyright (C) 2015 Mans Rullgard > > - */ > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#define DRIVER_NAME "tango-ir" > > - > > -#define IR_NEC_CTRL 0x00 > > -#define IR_NEC_DATA 0x04 > > -#define IR_CTRL 0x08 > > -#define IR_RC5_CLK_DIV 0x0c > > -#define IR_RC5_DATA 0x10 > > -#define IR_INT 0x14 > > - > > -#define NEC_TIME_BASE 560 > > -#define RC5_TIME_BASE 1778 > > - > > -#define RC6_CTRL 0x00 > > -#define RC6_CLKDIV 0x04 > > -#define RC6_DATA0 0x08 > > -#define RC6_DATA1 0x0c > > -#define RC6_DATA2 0x10 > > -#define RC6_DATA3 0x14 > > -#define RC6_DATA4 0x18 > > - > > -#define RC6_CARRIER 36000 > > -#define RC6_TIME_BASE 16 > > - > > -#define NEC_CAP(n) ((n) << 24) > > -#define GPIO_SEL(n) ((n) << 16) > > -#define DISABLE_NEC (BIT(4) | BIT(8)) > > -#define ENABLE_RC5 (BIT(0) | BIT(9)) > > -#define ENABLE_RC6 (BIT(0) | BIT(7)) > > -#define ACK_IR_INT (BIT(0) | BIT(1)) > > -#define ACK_RC6_INT (BIT(31)) > > - > > -#define NEC_ANY (RC_PROTO_BIT_NEC | RC_PROTO_BIT_NECX | RC_PROTO_BIT_N= EC32) > > - > > -struct tango_ir { > > - void __iomem *rc5_base; > > - void __iomem *rc6_base; > > - struct rc_dev *rc; > > - struct clk *clk; > > -}; > > - > > -static void tango_ir_handle_nec(struct tango_ir *ir) > > -{ > > - u32 v, code; > > - enum rc_proto proto; > > - > > - v =3D readl_relaxed(ir->rc5_base + IR_NEC_DATA); > > - if (!v) { > > - rc_repeat(ir->rc); > > - return; > > - } > > - > > - code =3D ir_nec_bytes_to_scancode(v, v >> 8, v >> 16, v >> 24, &proto= ); > > - rc_keydown(ir->rc, proto, code, 0); > > -} > > - > > -static void tango_ir_handle_rc5(struct tango_ir *ir) > > -{ > > - u32 data, field, toggle, addr, cmd, code; > > - > > - data =3D readl_relaxed(ir->rc5_base + IR_RC5_DATA); > > - if (data & BIT(31)) > > - return; > > - > > - field =3D data >> 12 & 1; > > - toggle =3D data >> 11 & 1; > > - addr =3D data >> 6 & 0x1f; > > - cmd =3D (data & 0x3f) | (field ^ 1) << 6; > > - > > - code =3D RC_SCANCODE_RC5(addr, cmd); > > - rc_keydown(ir->rc, RC_PROTO_RC5, code, toggle); > > -} > > - > > -static void tango_ir_handle_rc6(struct tango_ir *ir) > > -{ > > - u32 data0, data1, toggle, mode, addr, cmd, code; > > - > > - data0 =3D readl_relaxed(ir->rc6_base + RC6_DATA0); > > - data1 =3D readl_relaxed(ir->rc6_base + RC6_DATA1); > > - > > - mode =3D data0 >> 1 & 7; > > - if (mode !=3D 0) > > - return; > > - > > - toggle =3D data0 & 1; > > - addr =3D data0 >> 16; > > - cmd =3D data1; > > - > > - code =3D RC_SCANCODE_RC6_0(addr, cmd); > > - rc_keydown(ir->rc, RC_PROTO_RC6_0, code, toggle); > > -} > > - > > -static irqreturn_t tango_ir_irq(int irq, void *dev_id) > > -{ > > - struct tango_ir *ir =3D dev_id; > > - unsigned int rc5_stat; > > - unsigned int rc6_stat; > > - > > - rc5_stat =3D readl_relaxed(ir->rc5_base + IR_INT); > > - writel_relaxed(rc5_stat, ir->rc5_base + IR_INT); > > - > > - rc6_stat =3D readl_relaxed(ir->rc6_base + RC6_CTRL); > > - writel_relaxed(rc6_stat, ir->rc6_base + RC6_CTRL); > > - > > - if (!(rc5_stat & 3) && !(rc6_stat & BIT(31))) > > - return IRQ_NONE; > > - > > - if (rc5_stat & BIT(0)) > > - tango_ir_handle_rc5(ir); > > - > > - if (rc5_stat & BIT(1)) > > - tango_ir_handle_nec(ir); > > - > > - if (rc6_stat & BIT(31)) > > - tango_ir_handle_rc6(ir); > > - > > - return IRQ_HANDLED; > > -} > > - > > -static int tango_change_protocol(struct rc_dev *dev, u64 *rc_type) > > -{ > > - struct tango_ir *ir =3D dev->priv; > > - u32 rc5_ctrl =3D DISABLE_NEC; > > - u32 rc6_ctrl =3D 0; > > - > > - if (*rc_type & NEC_ANY) > > - rc5_ctrl =3D 0; > > - > > - if (*rc_type & RC_PROTO_BIT_RC5) > > - rc5_ctrl |=3D ENABLE_RC5; > > - > > - if (*rc_type & RC_PROTO_BIT_RC6_0) > > - rc6_ctrl =3D ENABLE_RC6; > > - > > - writel_relaxed(rc5_ctrl, ir->rc5_base + IR_CTRL); > > - writel_relaxed(rc6_ctrl, ir->rc6_base + RC6_CTRL); > > - > > - return 0; > > -} > > - > > -static int tango_ir_probe(struct platform_device *pdev) > > -{ > > - const char *map_name =3D RC_MAP_TANGO; > > - struct device *dev =3D &pdev->dev; > > - struct rc_dev *rc; > > - struct tango_ir *ir; > > - u64 clkrate, clkdiv; > > - int irq, err; > > - u32 val; > > - > > - irq =3D platform_get_irq(pdev, 0); > > - if (irq <=3D 0) > > - return -EINVAL; > > - > > - ir =3D devm_kzalloc(dev, sizeof(*ir), GFP_KERNEL); > > - if (!ir) > > - return -ENOMEM; > > - > > - ir->rc5_base =3D devm_platform_ioremap_resource(pdev, 0); > > - if (IS_ERR(ir->rc5_base)) > > - return PTR_ERR(ir->rc5_base); > > - > > - ir->rc6_base =3D devm_platform_ioremap_resource(pdev, 1); > > - if (IS_ERR(ir->rc6_base)) > > - return PTR_ERR(ir->rc6_base); > > - > > - ir->clk =3D devm_clk_get(dev, NULL); > > - if (IS_ERR(ir->clk)) > > - return PTR_ERR(ir->clk); > > - > > - rc =3D devm_rc_allocate_device(dev, RC_DRIVER_SCANCODE); > > - if (!rc) > > - return -ENOMEM; > > - > > - of_property_read_string(dev->of_node, "linux,rc-map-name", &map_name); > > - > > - rc->device_name =3D DRIVER_NAME; > > - rc->driver_name =3D DRIVER_NAME; > > - rc->input_phys =3D DRIVER_NAME "/input0"; > > - rc->map_name =3D map_name; > > - rc->allowed_protocols =3D NEC_ANY | RC_PROTO_BIT_RC5 | RC_PROTO_BIT_R= C6_0; > > - rc->change_protocol =3D tango_change_protocol; > > - rc->priv =3D ir; > > - ir->rc =3D rc; > > - > > - err =3D clk_prepare_enable(ir->clk); > > - if (err) > > - return err; > > - > > - clkrate =3D clk_get_rate(ir->clk); > > - > > - clkdiv =3D clkrate * NEC_TIME_BASE; > > - do_div(clkdiv, 1000000); > > - > > - val =3D NEC_CAP(31) | GPIO_SEL(12) | clkdiv; > > - writel_relaxed(val, ir->rc5_base + IR_NEC_CTRL); > > - > > - clkdiv =3D clkrate * RC5_TIME_BASE; > > - do_div(clkdiv, 1000000); > > - > > - writel_relaxed(DISABLE_NEC, ir->rc5_base + IR_CTRL); > > - writel_relaxed(clkdiv, ir->rc5_base + IR_RC5_CLK_DIV); > > - writel_relaxed(ACK_IR_INT, ir->rc5_base + IR_INT); > > - > > - clkdiv =3D clkrate * RC6_TIME_BASE; > > - do_div(clkdiv, RC6_CARRIER); > > - > > - writel_relaxed(ACK_RC6_INT, ir->rc6_base + RC6_CTRL); > > - writel_relaxed((clkdiv >> 2) << 18 | clkdiv, ir->rc6_base + RC6_CLKDI= V); > > - > > - err =3D devm_request_irq(dev, irq, tango_ir_irq, IRQF_SHARED, > > - dev_name(dev), ir); > > - if (err) > > - goto err_clk; > > - > > - err =3D devm_rc_register_device(dev, rc); > > - if (err) > > - goto err_clk; > > - > > - platform_set_drvdata(pdev, ir); > > - return 0; > > - > > -err_clk: > > - clk_disable_unprepare(ir->clk); > > - return err; > > -} > > - > > -static int tango_ir_remove(struct platform_device *pdev) > > -{ > > - struct tango_ir *ir =3D platform_get_drvdata(pdev); > > - > > - clk_disable_unprepare(ir->clk); > > - return 0; > > -} > > - > > -static const struct of_device_id tango_ir_dt_ids[] =3D { > > - { .compatible =3D "sigma,smp8642-ir" }, > > - { } > > -}; > > -MODULE_DEVICE_TABLE(of, tango_ir_dt_ids); > > - > > -static struct platform_driver tango_ir_driver =3D { > > - .probe =3D tango_ir_probe, > > - .remove =3D tango_ir_remove, > > - .driver =3D { > > - .name =3D DRIVER_NAME, > > - .of_match_table =3D tango_ir_dt_ids, > > - }, > > -}; > > -module_platform_driver(tango_ir_driver); > > - > > -MODULE_DESCRIPTION("SMP86xx IR decoder driver"); > > -MODULE_AUTHOR("Mans Rullgard "); > > -MODULE_LICENSE("GPL"); > > -- = > > > > 2.29.2 > > > = > -- = > M=E5ns Rullg=E5rd _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel