From patchwork Tue Dec 19 08:07:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Rossak X-Patchwork-Id: 10122629 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 98036603B5 for ; Tue, 19 Dec 2017 08:10:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A3BC29094 for ; Tue, 19 Dec 2017 08:10:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E3E52909C; Tue, 19 Dec 2017 08:10:12 +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 2B58529094 for ; Tue, 19 Dec 2017 08:10:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760200AbdLSIJp (ORCPT ); Tue, 19 Dec 2017 03:09:45 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38456 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759019AbdLSIHw (ORCPT ); Tue, 19 Dec 2017 03:07:52 -0500 Received: by mail-wr0-f193.google.com with SMTP id o2so17699655wro.5; Tue, 19 Dec 2017 00:07:51 -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=b8MEb55PDDl2pZqUsog8UI8eI5rioBonZSzy7NTkKqg=; b=CHl2lbY8wn4mULvS003jI9tiFdExk4jlMVYsVotOMjQPTycUgt55ag8fN8iP3/tzj6 EOroBstZ3c7GPAs3mus3l3ykkrn+4XZ+Vr6mfTA7bq4GpijrzAHlU2W23ygtBePurJ/u X6Y/fNcyFVoJBj61SxqsMO27QMdWdLhQjxMWzesqui4MWPRE48f+wM0cT0O8dn1S16LM OBTZ+xFSe/7oWmeu68tLrjkWumvYH3Vn5YOjvxmQJ4TPxyWqsCmAaqEmO/mg0irgmn/m kuO08i9DIJdJly/px3H8BsoSd9pFtJptOvWjTJKBrHBlg31IqkNHeFGC/P1mNoGRNjDU bylQ== 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=b8MEb55PDDl2pZqUsog8UI8eI5rioBonZSzy7NTkKqg=; b=tPb7GaJCmliohGCGFxqeSUEc4018Weuz0+mfdOfegLdFANhFLOaefHFToRk4d/F4Kc UyrfZR3Af+3HHSAf4diOl+2BbU3Q8rbBUNkl5xzwL2hjswdy61JCNZOTyjzBOLcMhbY6 SwuT2RRTlwcB4vZ19QMpokYpAGhydmJy3lvG2ycsxJc6qpN0h/d+EBw2BaPzqawdlEAt mATmcLGlZCr5w9S3Xv4jx+ORGuvF19BdEUewFVWfwArFeZhY8XaDWRdDS4atCbNoK/tW 3hBJv/aQvHSuJXtgsJ3oiVcoWUHHNQL6aW45Hy7MRd2Ruy4HLqvcFU1FOEHYqM2QyVkB IBBg== X-Gm-Message-State: AKGB3mJn1rg2vzMQj+wayGSCx5ilMFKXP3pkR0jBjJgSq4s8Tkwc6AVq T+v0QCkcUBW8xWQSzNjC50o= X-Google-Smtp-Source: ACJfBotFK3rVMq47+sneVF+aEMRPZCi9GQ9uT2s1aCZbfoK2lDFKpvcZeO8kcAL6pH1rT0tJNSq3nw== X-Received: by 10.223.134.216 with SMTP id 24mr3903059wry.156.1513670871253; Tue, 19 Dec 2017 00:07: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 c34sm15820113wra.53.2017.12.19.00.07.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Dec 2017 00:07:50 -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 v3 1/6] media: rc: update sunxi-ir driver to get base clock frequency from devicetree Date: Tue, 19 Dec 2017 09:07:42 +0100 Message-Id: <20171219080747.4507-2-embed3d@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171219080747.4507-1-embed3d@gmail.com> References: <20171219080747.4507-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 necessary since there are different ir receivers on the market, that operate with different frequencies. So this value could be set if the attached ir receiver needs a different base clock frequency, than the default 8 MHz. Signed-off-by: Philipp Rossak Reviewed-by: Andi Shyti Acked-by: Sean Young --- drivers/media/rc/sunxi-cir.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c index 97f367b446c4..f500cea228a9 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,8 @@ 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 +145,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 = SUNXI_IR_BASE_CLK; ir = devm_kzalloc(dev, sizeof(struct sunxi_ir), GFP_KERNEL); if (!ir) @@ -172,6 +170,9 @@ static int sunxi_ir_probe(struct platform_device *pdev) return PTR_ERR(ir->clk); } + /* Base clock frequency (optional) */ + of_property_read_u32(dn, "clock-frequency", &b_clk_freq); + /* Reset (optional) */ ir->rst = devm_reset_control_get_optional_exclusive(dev, NULL); if (IS_ERR(ir->rst)) @@ -180,11 +181,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_dbg(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 +227,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;