From patchwork Sun Jun 26 20:29:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9199603 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 5C31A60752 for ; Sun, 26 Jun 2016 20:31:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B0D428551 for ; Sun, 26 Jun 2016 20:31:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D42128554; Sun, 26 Jun 2016 20:31:30 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E4A4128551 for ; Sun, 26 Jun 2016 20:31:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHGgt-0004LE-8x; Sun, 26 Jun 2016 20:30:03 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHGgf-0004Hq-Q0; Sun, 26 Jun 2016 20:29:50 +0000 Received: by mail-wm0-x241.google.com with SMTP id r201so19612212wme.0; Sun, 26 Jun 2016 13:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IXCT8es0I/uyYKqrwrdtsVNSBsBa5YDByOUt+tNByPE=; b=cvsZcvLmr8doGoQXCGIl8lzWbDMvP6PtUbSPE+N52QsEFOi+WWD4YagghcZd1gacyU lYyLSjjQDlMw+RoOO1nd73j2yXmlC+nRZWNNuiphEo2HvP54XJCqti90qzuoQKQNiaYp nnPbO7nH57s0CZb4Mkmis+4Bc1Wx48oY2akv+jj/A6D4/qfa6HdqkCO7pYbiZ4dPEhP8 ORMBTG28VfQPp/7GDeJrL5nUXYM+xJzWANvxE96kt2mXGi8CoRpMOpYw69Om/ldimv2Y 5n3ma+e6I3+6BV8eUKRkKo1C+xLms3X5Thfwm4lSUZYQNUhjxpHFi8lydajDLao3VPhc D06w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IXCT8es0I/uyYKqrwrdtsVNSBsBa5YDByOUt+tNByPE=; b=KbZQEEd9RhW5xwfgi5TT4KWqqdFRu25Tb7ZZAGKQJbe4dhz8Te+uxjqYOXtnqMoMwm 4n106bIxt5BXDiG+BREgZHRY2aznfqr59JjBDEMKZHWmg0awt1ZkzNm5VjW2ccd0v0Ed 3DecjsZxQsqSbCyMDlVc0oGZQJ6uOB8jkqfUzCxp12wtK18uzcYbFEKKd+7j0xQIgYaB dpgqEwWPlD6Ujl8VTFXVNmanCFPXPr6zLl5gNAWe6yC/PeE7LBOkaRb4Qaks+qzC2lOs uiHRifAMjkBA4YPf1MSGxaWqVZvGApf+uIH1nhY7W32wkrFihK1/Vt09IsK0RRZYpwbu sw0w== X-Gm-Message-State: ALyK8tJIpI+X1olQ4sxOJzjUVIOXzW591MUVvwFch2SXsSsJCreBE9d+u488nSgCTmeX3w== X-Received: by 10.28.173.8 with SMTP id w8mr6945939wme.39.1466972965895; Sun, 26 Jun 2016 13:29:25 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3CD1B04BC56BB9C73E3153B.dip0.t-ipconnect.de. [2003:dc:d3cd:1b04:bc56:bb9c:73e3:153b]) by smtp.googlemail.com with ESMTPSA id w188sm1032660wmw.11.2016.06.26.13.29.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jun 2016 13:29:25 -0700 (PDT) From: Martin Blumenstingl To: b.galvani@gmail.com, linux-media@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH] media: rc: use the correct register offset and bits to enable raw mode Date: Sun, 26 Jun 2016 22:29:05 +0200 Message-Id: <20160626202905.21817-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160626202905.21817-1-martin.blumenstingl@googlemail.com> References: <20160626202905.21817-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160626_132949_991172_BFCB2EF0 X-CRM114-Status: GOOD ( 10.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , khilman@baylibre.com, tobetter@gmail.com, carlo@caione.org, mchehab@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP According to the datasheet of Meson8b (S805) and GXBB (S905) the decoding mode is configured in AO_MF_IR_DEC_REG2 (offset 0x20) using bits 0-3. The "duration" field may not be set correctly when any of the hardware decoding modes. This can happen while a "default" decoding mode (either set by the bootloader or the chip's default, which uses NEC as it's default) is used. While here, I also added defines for the protocols which can be decoded by the hardware (more work is needed to be actually able to use them though). Signed-off-by: Martin Blumenstingl --- drivers/media/rc/meson-ir.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c index fcc3b82..662d065 100644 --- a/drivers/media/rc/meson-ir.c +++ b/drivers/media/rc/meson-ir.c @@ -32,13 +32,10 @@ #define IR_DEC_FRAME 0x14 #define IR_DEC_STATUS 0x18 #define IR_DEC_REG1 0x1c +#define IR_DEC_REG2 0x20 #define REG0_RATE_MASK (BIT(11) - 1) -#define REG1_MODE_MASK (BIT(7) | BIT(8)) -#define REG1_MODE_NEC (0 << 7) -#define REG1_MODE_GENERAL (2 << 7) - #define REG1_TIME_IV_SHIFT 16 #define REG1_TIME_IV_MASK ((BIT(13) - 1) << REG1_TIME_IV_SHIFT) @@ -51,6 +48,20 @@ #define REG1_RESET BIT(0) #define REG1_ENABLE BIT(15) +#define REG2_DEC_MODE_SHIFT 0 +#define REG2_DEC_MODE_MASK GENMASK(3, REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_NEC (0x0 << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_RAW (0x2 << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_THOMSON (0x4 << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_TOSHIBA (0x5 << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_SONY (0x6 << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_RC5 (0x7 << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_RC6 (0x9 << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_RCMM (0xa << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_DUOKAN (0xb << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_COMCAST (0xe << REG2_DEC_MODE_SHIFT) +#define REG2_DEC_MODE_SANYO (0xf << REG2_DEC_MODE_SHIFT) + #define STATUS_IR_DEC_IN BIT(8) #define MESON_TRATE 10 /* us */ @@ -158,8 +169,9 @@ static int meson_ir_probe(struct platform_device *pdev) /* Reset the decoder */ meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, REG1_RESET); meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, 0); - /* Set general operation mode */ - meson_ir_set_mask(ir, IR_DEC_REG1, REG1_MODE_MASK, REG1_MODE_GENERAL); + /* Enable raw/soft-decode mode */ + meson_ir_set_mask(ir, IR_DEC_REG2, REG2_DEC_MODE_MASK, + REG2_DEC_MODE_RAW << REG2_DEC_MODE_SHIFT); /* Set rate */ meson_ir_set_mask(ir, IR_DEC_REG0, REG0_RATE_MASK, MESON_TRATE - 1); /* IRQ on rising and falling edges */