From patchwork Mon Jan 22 17:13:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Scheller X-Patchwork-Id: 10178911 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 5E46F601D5 for ; Mon, 22 Jan 2018 17:13:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44F872841F for ; Mon, 22 Jan 2018 17:13:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39AC328421; Mon, 22 Jan 2018 17:13:58 +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=ham 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 C648F2841F for ; Mon, 22 Jan 2018 17:13:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751113AbeAVRN4 (ORCPT ); Mon, 22 Jan 2018 12:13:56 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:39701 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028AbeAVRNx (ORCPT ); Mon, 22 Jan 2018 12:13:53 -0500 Received: by mail-wr0-f194.google.com with SMTP id z48so9500698wrz.6 for ; Mon, 22 Jan 2018 09:13:53 -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 :mime-version:content-transfer-encoding; bh=At8VomXaYfqrzk/uV+hx/5kX6Dfq+XE0W0QrBmAOxcw=; b=lVo7tvBId2PNHU26p1yC89InQE9m/hJICsYGfmhJxYIg08vEDmOeE8+gKGehWggM0A Swvd6ZKqtj5iD0r0zdX66/eT383eeSYM2oVsp5dM8J+rHooNCaZWYQONkCW1fG09sOSI y2893rwSruHqMrzj+z0vgD1gCoz+/Z70q15HKO9b49Sgbglybn/ZnUCcdssUXr1q7Om1 sBiKLk1HPT52m1MpKDr4ylKLe+gdHZ/hvE3QcbSzg23FIMLxAPezGRS3+PRp/V4BKF8z DkBd0Z+FauUJFDwCW6+ey3w+bIHUp+tClTr/EUCyTDQ0J2ZOvHHFaRwBijbwRXyjoAvP KW0g== 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:mime-version:content-transfer-encoding; bh=At8VomXaYfqrzk/uV+hx/5kX6Dfq+XE0W0QrBmAOxcw=; b=SCBsyfsr5nLVmQ5x0x60FwOoJkfHQgye2TjkvJ6GJj9HSiedn2CDyRTz1Q8irM47hz /SQ988qsT3izGB6rHUctCb4J0KW0J9y1cTh06DP4x95a7dE7JC4nx1mu3xttXv/4TZC7 aDG0MTFgw2wVMQuPIWCeaJiPlJRaOoMh627Jb/ywuW0AUGU0PSGvsCdL8+oAfi6IWUwX s7XNy8X/Iaik1bM2rA2R/XC6AcO+L3i28PLuEPg8+vLAAXvUuJ0g+QciAuG7CjYysbpE 6tODaFaz0xlCUIdGnPMBbv3FFJtGw0mkGtdPyWPnfwpVbzrQAKJ8168OGCIx7mBYm7wn gObg== X-Gm-Message-State: AKwxyteK31gUf8d6KqOWorw7LdluaoKFxph+rKywRtxqKASGaGkglyLG TY4hcyVeGxIvGOl0oTt0iMqobw== X-Google-Smtp-Source: AH8x224eLxmCEpU6BxGVSDjWpIexvi9nqxJLjsEoV9rHqGjREMFmlkOlrI1DLFqgBPRLAbQg0JRVUw== X-Received: by 10.223.190.4 with SMTP id n4mr7893193wrh.28.1516641232338; Mon, 22 Jan 2018 09:13:52 -0800 (PST) Received: from dvbdev.wuest.de (ip-84-118-193-200.unity-media.net. [84.118.193.200]) by smtp.gmail.com with ESMTPSA id z39sm13113986wrz.20.2018.01.22.09.13.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 09:13:51 -0800 (PST) From: Daniel Scheller To: linux-media@vger.kernel.org, mchehab@kernel.org, mchehab@s-opensource.com Cc: rascobie@slingshot.co.nz Subject: [PATCH v2 2/5] media: dvb_frontend: add DVB-S2X rolloff factors Date: Mon, 22 Jan 2018 18:13:43 +0100 Message-Id: <20180122171346.822-3-d.scheller.oss@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180122171346.822-1-d.scheller.oss@gmail.com> References: <20180122171346.822-1-d.scheller.oss@gmail.com> MIME-Version: 1.0 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 From: Daniel Scheller Add 15%, 10% and 5% DVB-S2X rolloff factors. Also fix roloff typos. Signed-off-by: Daniel Scheller --- Documentation/media/frontend.h.rst.exceptions | 3 +++ drivers/media/dvb-core/dvb_frontend.c | 9 +++++++++ include/uapi/linux/dvb/frontend.h | 16 +++++++++++----- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Documentation/media/frontend.h.rst.exceptions b/Documentation/media/frontend.h.rst.exceptions index ae1148be0a39..c1643ce93426 100644 --- a/Documentation/media/frontend.h.rst.exceptions +++ b/Documentation/media/frontend.h.rst.exceptions @@ -167,6 +167,9 @@ ignore symbol ROLLOFF_35 ignore symbol ROLLOFF_20 ignore symbol ROLLOFF_25 ignore symbol ROLLOFF_AUTO +ignore symbol ROLLOFF_15 +ignore symbol ROLLOFF_10 +ignore symbol ROLLOFF_5 ignore symbol INVERSION_ON ignore symbol INVERSION_OFF diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c index 722b86a43497..e5105c1783b8 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c @@ -2183,6 +2183,15 @@ static int dtv_set_frontend(struct dvb_frontend *fe) break; case SYS_DVBS2: switch (c->rolloff) { + case ROLLOFF_5: + rolloff = 105; + break; + case ROLLOFF_10: + rolloff = 110; + break; + case ROLLOFF_15: + rolloff = 115; + break; case ROLLOFF_20: rolloff = 120; break; diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h index 227268a657cd..8bf1c63627a2 100644 --- a/include/uapi/linux/dvb/frontend.h +++ b/include/uapi/linux/dvb/frontend.h @@ -580,20 +580,26 @@ enum fe_pilot { /** * enum fe_rolloff - Rolloff factor - * @ROLLOFF_35: Roloff factor: α=35% - * @ROLLOFF_20: Roloff factor: α=20% - * @ROLLOFF_25: Roloff factor: α=25% - * @ROLLOFF_AUTO: Auto-detect the roloff factor. + * @ROLLOFF_35: Rolloff factor: α=35% + * @ROLLOFF_20: Rolloff factor: α=20% + * @ROLLOFF_25: Rolloff factor: α=25% + * @ROLLOFF_AUTO: Auto-detect the rolloff factor. + * @ROLLOFF_15: Rolloff factor: α=15% + * @ROLLOFF_10: Rolloff factor: α=10% + * @ROLLOFF_5: Rolloff factor: α=5% * * .. note: * - * Roloff factor of 35% is implied on DVB-S. On DVB-S2, it is default. + * Rolloff factor of 35% is implied on DVB-S. On DVB-S2, it is default. */ enum fe_rolloff { ROLLOFF_35, ROLLOFF_20, ROLLOFF_25, ROLLOFF_AUTO, + ROLLOFF_15, + ROLLOFF_10, + ROLLOFF_5, }; /**