From patchwork Thu Mar 26 10:35:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Riesen X-Patchwork-Id: 11459849 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DF2C6CA for ; Thu, 26 Mar 2020 11:08:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7FB8720409 for ; Thu, 26 Mar 2020 11:08:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728077AbgCZLIz (ORCPT ); Thu, 26 Mar 2020 07:08:55 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:50817 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727688AbgCZLIz (ORCPT ); Thu, 26 Mar 2020 07:08:55 -0400 Received: from mail.cetitecgmbh.com ([87.190.42.90]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MuDPh-1jVurQ2ec9-00uclg for ; Thu, 26 Mar 2020 12:08:53 +0100 Received: from pflvmailgateway.corp.cetitec.com (unknown [127.0.0.1]) by mail.cetitecgmbh.com (Postfix) with ESMTP id 6417E64FD25 for ; Thu, 26 Mar 2020 11:08:53 +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 uIV8B1SyGEks for ; Thu, 26 Mar 2020 12:08:53 +0100 (CET) Received: from pfwsexchange.corp.cetitec.com (unknown [10.10.1.99]) by mail.cetitecgmbh.com (Postfix) with ESMTPS id 0626E64F787 for ; Thu, 26 Mar 2020 12:08:53 +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:52 +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-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:dEnU+TJY/EQ47A/QYMKKfg5/dkYLXo2nZHHvjkx3AwN5Kxf4opd bWKWtMZ8mCgt5mGsl6hX0nUw+cwUcqETOUPwQedlHaMoBc4joXqDtBp2A28mk5GyKAS2r2m A94nC4iUirx523BXau0jZ8lmJLJ8cnAyLlqCdHJIGnJ1HKu6psTZwJutTicLhimSLBOYIpr 2K/ioqSi4xNPvadIhLDxA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:OC04nKps/AI=:oU4CeL4wkxD1fVZSind9K3 qC+t6O97FqcYfX/OYaJGm6Uk8u5txUGzuq+i9Qbhf1ECuogHW+Ze7oeHDi8SNX2Jl6Wh/QLMu UY72c7JEayn+IqXGoxIfYiKCooCOxV98lDC/+V9ROAJQypXtQLYNkfa0I8lJnVY1amo8W8Lrh 0skAUgWqzibF5pvAIUI0kDDmbs1xjkhGS2EKJ6ShG7obXTbPQCsQOHhunZQJ+J3ozT+nQTWwi WAaTnTpuIQW6sKp1OPgCCHQ2Mo8fgqJJdK2quL3SAXLLja9TX3lC6irDeOqKSmTiMXKr1RW7d DaDnlMzi53nGRT1KrGbpEiiYSzC5QG6Bs2EPPQXlYumcYPRxCC7EqXGbDFRvsCfcBxAAVGBeC coLA9+eM+XiD3Qpx4NkozYHLjnUoSlD7QAXfux68yMNcnzRB7S7QxFgyvM1TKMa90cgKHknsH v5tvcu1s0/Q4say8TVx85wyH2fHz5YsbMbLbBmBwnRLV+MfQn2UxIEk1Q9xwUvPMEzQvBCFbj d8+RoWJgEtQ/wEIUWgq6NdoprpatYHFv8gj4nZiAnsTP+Sl3h+k+Qtlla4isoiFpy4CYvWpPO BMJph88mfar7wEbMXvNpgDc/TKKUdQbeH6AbIVFSi6iVB6mt7V0pWPKV0j3lvGXmE+jorYQxW XdqbPRwzl+iVLCcF9XloHMfyvRocqrkMox3F0cvpK2xjzIjQATYcuNWWQnuivsJzpQphD0sFM hiThj4irCZrrt04WVf2zz/SzxVyKvkopZJm3B8y3/+soD0x12CF+oCxXYtTSp5ykf+kzmiJQu YqcOtaVGzPm/ceEjoH1Igj3VUyalD7ELA8ChtZVtipEborIwO9weiOzcNcC6nqBtGXue3Uu Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@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)