From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16DF8C43331 for ; Thu, 26 Mar 2020 11:08:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D959020409 for ; Thu, 26 Mar 2020 11:08:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727841AbgCZLIk (ORCPT ); Thu, 26 Mar 2020 07:08:40 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:42651 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727688AbgCZLIk (ORCPT ); Thu, 26 Mar 2020 07:08:40 -0400 Received: from mail.cetitecgmbh.com ([87.190.42.90]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MbBQU-1joHDq0IcC-00bf0F for ; Thu, 26 Mar 2020 12:08:38 +0100 Received: from pflvmailgateway.corp.cetitec.com (unknown [127.0.0.1]) by mail.cetitecgmbh.com (Postfix) with ESMTP id D603F64FD25 for ; Thu, 26 Mar 2020 11:08:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at cetitec.com Received: from mail.cetitecgmbh.com ([127.0.0.1]) by pflvmailgateway.corp.cetitec.com (pflvmailgateway.corp.cetitec.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PBHqDtACqvzl for ; Thu, 26 Mar 2020 12:08:37 +0100 (CET) Received: from pfwsexchange.corp.cetitec.com (unknown [10.10.1.99]) by mail.cetitecgmbh.com (Postfix) with ESMTPS id 726DF64ED6A for ; Thu, 26 Mar 2020 12:08:37 +0100 (CET) Received: from pflmari.corp.cetitec.com (10.8.5.79) by PFWSEXCHANGE.corp.cetitec.com (10.10.1.99) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 26 Mar 2020 12:08:37 +0100 Received: by pflmari.corp.cetitec.com (Postfix, from userid 1000) id 5049380500; Thu, 26 Mar 2020 11:35:23 +0100 (CET) Date: Thu, 26 Mar 2020 11:35:23 +0100 From: Alex Riesen To: Kieran Bingham CC: Geert Uytterhoeven , Mauro Carvalho Chehab , Hans Verkuil , "Laurent Pinchart" , Rob Herring , Mark Rutland , Kuninori Morimoto , , , , , Subject: [PATCH v4 3/9] media: adv748x: reduce amount of code for bitwise modifications of device registers Message-ID: <88950969b1d16ff5fcd1b3458356c4cf5a9e6cff.1585218857.git.alexander.riesen@cetitec.com> Mail-Followup-To: Alex Riesen , Kieran Bingham , Geert Uytterhoeven , Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Rob Herring , Mark Rutland , Kuninori Morimoto , devel@driverdev.osuosl.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org References: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: X-Originating-IP: [10.8.5.79] X-ClientProxiedBy: PFWSEXCHANGE.corp.cetitec.com (10.10.1.99) To PFWSEXCHANGE.corp.cetitec.com (10.10.1.99) X-EsetResult: clean, is OK X-EsetId: 37303A290D7F536A6D7C67 X-Provags-ID: V03:K1:e+lodIGHi67ANw8DbDC7KVOunLRPdcfdGITk/3ytzmOWRGY637q IfDBhtT6MMzpeNJRVyVqXM7ut9zMk5MfT8QFKSqWTIL23g32UXI5rv1bUEJfJMaYGSgqtkI MwhfVPIOJdu2utGz4a3y9rfRcZw1mboEAaAAdWafHp0EU1TXUUUrPGtBmiS9w1W6qf0tkQD pd5hh70ALRLvCWz2M/0Zw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Zvydpc5Cwkg=:UbtWLVtypjaF4zylePfjbk yA3wjJjpS7gIbT4qpKf0B5ayP+/vwrN4yZY8neu1AhaHV1eznOh4Z+ONKMJA39F9vgfJEjLAO xqoJnJe7JqgG/IpjwBAIbmQWf8M6YBarmPq6WFr/1CbyjrCMdm7jpkLFqFObH2esPDvb0zN2t 0Ebgo7lyFeuR4f0tjEg5X5c6Yjo5ONVZB4la9orQ3ukPJfkRrlPe3mECH85T4LSZvb4rOb7q1 piC3W92evtLll7oIZ4af8vymXEleNJs/oUnSLPPZGUjbZNIr3QmSwqAV3HG4oS/vioSta2W1V iyrxRbSq1ux1PkUVMOUT6YV3EYOf7S8Z7HaTc3YEatJSsAq2k7I/Rk9vliPkO+g2/tlfSKeCh N1cINhB/4NbvTrfskPcaWAOQerZG7URL8U6E/+d+SavWz8GpQILzqHnl3+/pwbh4ZY1949xUZ xjRIgT/MfSzB8Rv52vedmDabZBc2fr4UChc0boHVhpeBwsrLIYhpJAq3vgmR7eXitQZaVj+2h GLd38VVjz//rD7LItCS2X6jCd+6aorqbpVs/Vb3qQD9gHlbbUruPkVx1zKD4KLOowt4NO3ivE qIwLpu3U70Qh6JQI9wms3TyzrKanLDo/wlPBk8m2FzXHu+BSsy+Eu2guT+gKIV2Ep+flxnWi9 LOca1wUDLB/k/uOFIx0QwklaDeffoBi6+8Yj/9kkh36JK8uCwOI76btfBs/4LU1BdfbEN3g1d 86EkYxfQPpjz4/P91kWp+FMuKENrQT7jB0gEk7Do3k3nYO8LBjTrF4xobI9NSgpVW2VGLidKy NQtkUOvk1+6r/is0tN0gX8T1fUFZnCd1czuCqsrEjr9vUkdIQSTxNDinIm957tAr6HmC5qB Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The regmap provides a convenient utility for this. The hdmi_* and dpll_* register modification macros added for symmetry with the existing operations (io_*, sdp_*). Signed-off-by: Alexander Riesen Reviewed-by: Laurent Pinchart -- v3: remove _update name in favor of existing _clrset --- drivers/media/i2c/adv748x/adv748x-core.c | 6 ++++++ drivers/media/i2c/adv748x/adv748x.h | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c index 5c59aad319d1..8580e6624276 100644 --- a/drivers/media/i2c/adv748x/adv748x-core.c +++ b/drivers/media/i2c/adv748x/adv748x-core.c @@ -133,6 +133,12 @@ static int adv748x_write_check(struct adv748x_state *state, u8 page, u8 reg, return *error; } +int adv748x_update_bits(struct adv748x_state *state, u8 page, u8 reg, u8 mask, + u8 value) +{ + return regmap_update_bits(state->regmap[page], reg, mask, value); +} + /* adv748x_write_block(): Write raw data with a maximum of I2C_SMBUS_BLOCK_MAX * size to one or more registers. * diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h index 09aab4138c3f..0a9d78c2870b 100644 --- a/drivers/media/i2c/adv748x/adv748x.h +++ b/drivers/media/i2c/adv748x/adv748x.h @@ -393,25 +393,33 @@ int adv748x_write(struct adv748x_state *state, u8 page, u8 reg, u8 value); int adv748x_write_block(struct adv748x_state *state, int client_page, unsigned int init_reg, const void *val, size_t val_len); +int adv748x_update_bits(struct adv748x_state *state, u8 page, u8 reg, + u8 mask, u8 value); #define io_read(s, r) adv748x_read(s, ADV748X_PAGE_IO, r) #define io_write(s, r, v) adv748x_write(s, ADV748X_PAGE_IO, r, v) -#define io_clrset(s, r, m, v) io_write(s, r, (io_read(s, r) & ~(m)) | (v)) +#define io_clrset(s, r, m, v) adv748x_update_bits(s, ADV748X_PAGE_IO, r, m, v) #define hdmi_read(s, r) adv748x_read(s, ADV748X_PAGE_HDMI, r) #define hdmi_read16(s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, (r)+1)) & (m)) #define hdmi_write(s, r, v) adv748x_write(s, ADV748X_PAGE_HDMI, r, v) +#define hdmi_clrset(s, r, m, v) \ + adv748x_update_bits(s, ADV748X_PAGE_HDMI, r, m, v) + +#define dpll_read(s, r) adv748x_read(s, ADV748X_PAGE_DPLL, r) +#define dpll_clrset(s, r, m, v) \ + adv748x_update_bits(s, ADV748X_PAGE_DPLL, r, m, v) #define repeater_read(s, r) adv748x_read(s, ADV748X_PAGE_REPEATER, r) #define repeater_write(s, r, v) adv748x_write(s, ADV748X_PAGE_REPEATER, r, v) #define sdp_read(s, r) adv748x_read(s, ADV748X_PAGE_SDP, r) #define sdp_write(s, r, v) adv748x_write(s, ADV748X_PAGE_SDP, r, v) -#define sdp_clrset(s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~(m)) | (v)) +#define sdp_clrset(s, r, m, v) adv748x_update_bits(s, ADV748X_PAGE_SDP, r, m, v) #define cp_read(s, r) adv748x_read(s, ADV748X_PAGE_CP, r) #define cp_write(s, r, v) adv748x_write(s, ADV748X_PAGE_CP, r, v) -#define cp_clrset(s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~(m)) | (v)) +#define cp_clrset(s, r, m, v) adv748x_update_bits(s, ADV748X_PAGE_CP, r, m, v) #define tx_read(t, r) adv748x_read(t->state, t->page, r) #define tx_write(t, r, v) adv748x_write(t->state, t->page, r, v) -- 2.25.1.25.g9ecbe7eb18