From patchwork Sun Dec 17 22:45:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Rossak X-Patchwork-Id: 10117995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6A53B603FA for ; Sun, 17 Dec 2017 22:47:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E17F28C83 for ; Sun, 17 Dec 2017 22:47:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 526F3291DA; Sun, 17 Dec 2017 22:47:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1B4928C83 for ; Sun, 17 Dec 2017 22:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932341AbdLQWrK (ORCPT ); Sun, 17 Dec 2017 17:47:10 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:45240 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757587AbdLQWpx (ORCPT ); Sun, 17 Dec 2017 17:45:53 -0500 Received: by mail-wr0-f194.google.com with SMTP id h1so12460029wre.12; Sun, 17 Dec 2017 14:45:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BTlRFcRSBvQQF6RM07yx5xM3ps16EN27oe1ZC+EK6R4=; b=UX/YEGe5j4tuJfPMW/jI5c5nYJPWK57MJBYnuClcDlRWykOlvw2p113OQ0L69u/Fjj b8ex3OLFOr8iGbUJ8JAo7LTR/cd+iX772aG8RAWqr6kRzg4eRG3TXJcaMvvJTpMzFWKU uFWw1P6gw01Aig4KuPNHMQVXrmAqEFTSSHUtlG7jLJpe13h5WFTT0D2A23dywWiJm33q xccmhGwhUQDv6Cbgg+XO27C0hdveO3YlwKGfWpaL/7+u5s3M7pylrXbPxg2Ftf/sEHDO T9ZqRUL2ZaJVkHmwvT9aVFmnSjBGKFsrYmEMn3teffoVENfsoXL/G7lb7PMbBM99K/q9 Bb9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BTlRFcRSBvQQF6RM07yx5xM3ps16EN27oe1ZC+EK6R4=; b=O5lrDRzUBd1Su8umJNxNOq3ntDUqYflrjizWH+SUs23UEXIF8CN6BChAzAVnL0gskK CNYSSD7yzttzfNsUsBXrIynhh1IrzucHgqjay49sQvvdlme3QF68UWZdrbH0FDp4ds/d sDcN+5b10ZU16rcCJAj0Ltxva902+qPrg5qiHdkHONwdHWmD6lT7DlXsXRdl16hvdeIo MO4laf3yd8RY+fflS6dU51KJdcW7cyv6Q0SiULIbgtBxNSVqusUx/akARlcx55npk5bG qSBrNc+mkNlvCpYpl+7LKUAbj0h7SnNFXjbYVngSkWGMSAQsgu2avMBYvGLps4wjStAa ZV5A== X-Gm-Message-State: AKGB3mID5mkFQ0NhxYGHd5McF7lr+nSn4+eLEtmZ2DkPs6p2SwVLIRaQ 7dEy9nMlPxbypCTOimyfaPc= X-Google-Smtp-Source: ACJfBosqkrPqmoVVcV/YxgoJBG+5kYj54a5xYqwrOZ1aYgSCtkijMEy+yEeplbUnMsJ3MmXOigbh/A== X-Received: by 10.223.174.147 with SMTP id y19mr14883502wrc.97.1513550751679; Sun, 17 Dec 2017 14:45:51 -0800 (PST) Received: from debian-laptop.fritz.box (p5B3DDB65.dip0.t-ipconnect.de. [91.61.219.101]) by smtp.gmail.com with ESMTPSA id 52sm30890673wrv.8.2017.12.17.14.45.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 14:45:51 -0800 (PST) From: Philipp Rossak To: mchehab@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, maxime.ripard@free-electrons.com, wens@csie.org, linux@armlinux.org.uk, sean@mess.org, p.zabel@pengutronix.de, andi.shyti@samsung.com Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com Subject: [PATCH 1/5] media: rc: update sunxi-ir driver to get base clock frequency from devicetree Date: Sun, 17 Dec 2017 23:45:43 +0100 Message-Id: <20171217224547.21481-2-embed3d@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171217224547.21481-1-embed3d@gmail.com> References: <20171217224547.21481-1-embed3d@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch updates the sunxi-ir driver to set the base clock frequency from devicetree. This is neccessary since there are different ir recievers on the market, that operate with different frequencys. So this value could be set if the attached ir receiver needs an other base clock frequency, than the default 8 MHz. Signed-off-by: Philipp Rossak --- drivers/media/rc/sunxi-cir.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c index 97f367b446c4..9bbe55a76860 100644 --- a/drivers/media/rc/sunxi-cir.c +++ b/drivers/media/rc/sunxi-cir.c @@ -72,12 +72,8 @@ /* CIR_REG register idle threshold */ #define REG_CIR_ITHR(val) (((val) << 8) & (GENMASK(15, 8))) -/* Required frequency for IR0 or IR1 clock in CIR mode */ +/* Required frequency for IR0 or IR1 clock in CIR mode (default) */ #define SUNXI_IR_BASE_CLK 8000000 -/* Frequency after IR internal divider */ -#define SUNXI_IR_CLK (SUNXI_IR_BASE_CLK / 64) -/* Sample period in ns */ -#define SUNXI_IR_SAMPLE (1000000000ul / SUNXI_IR_CLK) /* Noise threshold in samples */ #define SUNXI_IR_RXNOISE 1 /* Idle Threshold in samples */ @@ -122,7 +118,7 @@ static irqreturn_t sunxi_ir_irq(int irqno, void *dev_id) /* for each bit in fifo */ dt = readb(ir->base + SUNXI_IR_RXFIFO_REG); rawir.pulse = (dt & 0x80) != 0; - rawir.duration = ((dt & 0x7f) + 1) * SUNXI_IR_SAMPLE; + rawir.duration = ((dt & 0x7f) + 1) * ir->rc->rx_resolution; ir_raw_event_store_with_filter(ir->rc, &rawir); } } @@ -148,6 +144,7 @@ static int sunxi_ir_probe(struct platform_device *pdev) struct device_node *dn = dev->of_node; struct resource *res; struct sunxi_ir *ir; + u32 b_clk_freq; ir = devm_kzalloc(dev, sizeof(struct sunxi_ir), GFP_KERNEL); if (!ir) @@ -172,6 +169,11 @@ static int sunxi_ir_probe(struct platform_device *pdev) return PTR_ERR(ir->clk); } + /* Base clock frequency (optional) */ + if (of_property_read_u32(dn, "clock-frequency", &b_clk_freq)) { + b_clk_freq = SUNXI_IR_BASE_CLK; + } + /* Reset (optional) */ ir->rst = devm_reset_control_get_optional_exclusive(dev, NULL); if (IS_ERR(ir->rst)) @@ -180,11 +182,12 @@ static int sunxi_ir_probe(struct platform_device *pdev) if (ret) return ret; - ret = clk_set_rate(ir->clk, SUNXI_IR_BASE_CLK); + ret = clk_set_rate(ir->clk, b_clk_freq); if (ret) { dev_err(dev, "set ir base clock failed!\n"); goto exit_reset_assert; } + dev_info(dev, "set base clock frequency to %d Hz.\n", b_clk_freq); if (clk_prepare_enable(ir->apb_clk)) { dev_err(dev, "try to enable apb_ir_clk failed\n"); @@ -225,7 +228,8 @@ static int sunxi_ir_probe(struct platform_device *pdev) ir->rc->map_name = ir->map_name ?: RC_MAP_EMPTY; ir->rc->dev.parent = dev; ir->rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER; - ir->rc->rx_resolution = SUNXI_IR_SAMPLE; + /* Frequency after IR internal divider with sample period in ns */ + ir->rc->rx_resolution = (1000000000ul / (b_clk_freq / 64)); ir->rc->timeout = MS_TO_NS(SUNXI_IR_TIMEOUT); ir->rc->driver_name = SUNXI_IR_DEV;