Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp753639ybn; Tue, 24 Sep 2019 09:01:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJbT04dpyizZrluQH0UgRPB0E5yixM9/Q7Hkrbpy7jTFGN20cpyS5JnHJbXrozVQZo4QYe X-Received: by 2002:a17:906:13cd:: with SMTP id g13mr3096463ejc.302.1569340868142; Tue, 24 Sep 2019 09:01:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569340868; cv=none; d=google.com; s=arc-20160816; b=xp7Inl+qP0kHT/u1JLGid7o8op2kP/CTeSpc4LBWxNk3rvR3FJ10BI09E3OiQaRQvp SAQTlRCzlJy7Byfqkc7ruT8vcgQBgaroiCU2EmxYIYvMPNALsrGOqJIPrKgWxR4Wh0Jv TwbgUHUTVr2UufT0xAq5vakCtL6Qqrj+ftKIW9Uv6ru/13qKO12E1bWK9hk9BmlvrMu0 mRJjwLv43RaZ1SCdoUwglFu1sETbiXoMeONqc2v5Rt280ynEBVOxe8uol2VnP/xxl48P a/rFRCB8V5+V4U93Z/3AdvfwPcvYAedNviUWSGhN1b8s8hdobTzsd1ScOhs+Z/SFg9C/ fYrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VslykLbbcOHP0ubQOFxYSX/LrlOFhdVkih6aGGXwGcw=; b=S40MjnMmbtDL9mLML2IQEbgOitje5jCsTKuE9Nh5jwM/8M6OhivN9OLhaVglQT32YS 6i9IIjnwx4Yaore9nTxcM95KQv2VotExDjfLIjM13/DhLdBU11PhO9iC0X4pFtst02dm FvLlolSY7L3VfRrUyRneYqbcjX2EQ2pirgbrT84b4ZwCzpKGdelf7tCeeBcZnXe+NrWo Bm0gp9Xo2RAA2I4S+I1hJaSOrKj2jupKdcrTjVXz0BMABfUoI3NtVMRoJPO37Mt5lN83 UVUUxdbRIYK+XskOMnsflwzvGAJr61eS7iWOIMijdl3UltzsX2ciuFJRg28DT7oR6shS fW+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xVcNyBus; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p8si1135374ejf.58.2019.09.24.09.00.43; Tue, 24 Sep 2019 09:01:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xVcNyBus; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439220AbfIVTgY (ORCPT + 99 others); Sun, 22 Sep 2019 15:36:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:42464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389879AbfIVSqW (ORCPT ); Sun, 22 Sep 2019 14:46:22 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B24E2206B6; Sun, 22 Sep 2019 18:46:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177981; bh=/gOo4WZ1NVLy14zDedgsXiyLcv0A5qENps5nn1jtGQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xVcNyBus8Fak2S6X7sqruhTQQd9VVYqiSu5sqXCu13b8aLjJRhbZTx8pxhOwBzhcy n8o6H4nUj7qDUCRJGIxGRmpxT1yLiqw7j/UCD4RWex8GY01pigKX2I5yWCjq2ZyNX7 +TeW06qOwhjOMT8AZ9vQaMnMKk0cWrwG3MQDiF5M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Darius Rad , Sean Young , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 076/203] media: rc: imon: Allow iMON RC protocol for ffdc 7e device Date: Sun, 22 Sep 2019 14:41:42 -0400 Message-Id: <20190922184350.30563-76-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Darius Rad [ Upstream commit b20a6e298bcb8cb8ae18de26baaf462a6418515b ] Allow selecting the IR protocol, MCE or iMON, for a device that identifies as follows (with config id 0x7e): 15c2:ffdc SoundGraph Inc. iMON PAD Remote Controller As the driver is structured to default to iMON when both RC protocols are supported, existing users of this device (using MCE protocol) will need to manually switch to MCE (RC-6) protocol from userspace (with ir-keytable, sysfs). Signed-off-by: Darius Rad Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/rc/imon.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index 7bee72108b0ee..37a850421fbb1 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c @@ -1826,12 +1826,17 @@ static void imon_get_ffdc_type(struct imon_context *ictx) break; /* iMON VFD, MCE IR */ case 0x46: - case 0x7e: case 0x9e: dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR"); detected_display_type = IMON_DISPLAY_TYPE_VFD; allowed_protos = RC_PROTO_BIT_RC6_MCE; break; + /* iMON VFD, iMON or MCE IR */ + case 0x7e: + dev_info(ictx->dev, "0xffdc iMON VFD, iMON or MCE IR"); + detected_display_type = IMON_DISPLAY_TYPE_VFD; + allowed_protos |= RC_PROTO_BIT_RC6_MCE; + break; /* iMON LCD, MCE IR */ case 0x9f: dev_info(ictx->dev, "0xffdc iMON LCD, MCE IR"); -- 2.20.1