From: Alex Riesen <alexander.riesen@cetitec.com> To: Kieran Bingham <kieran.bingham@ideasonboard.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org>, Mauro Carvalho Chehab <mchehab@kernel.org>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, "Laurent Pinchart" <laurent.pinchart@ideasonboard.com>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, <devel@driverdev.osuosl.org>, <linux-media@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-renesas-soc@vger.kernel.org> Subject: [PATCH v2 03/10] media: adv748x: reduce amount of code for bitwise modifications of device registers Date: Thu, 19 Mar 2020 18:41:53 +0100 [thread overview] Message-ID: <099ebaa317156ec8edab973d0445851337139e6b.1584639664.git.alexander.riesen@cetitec.com> (raw) In-Reply-To: <cover.1584639664.git.alexander.riesen@cetitec.com> The regmap provides a convenient utility for this. Signed-off-by: Alexander Riesen <alexander.riesen@cetitec.com> --- drivers/media/i2c/adv748x/adv748x-core.c | 6 ++++++ drivers/media/i2c/adv748x/adv748x.h | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c index 345f009de121..36164a254d7b 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..c5245464fffc 100644 --- a/drivers/media/i2c/adv748x/adv748x.h +++ b/drivers/media/i2c/adv748x/adv748x.h @@ -393,25 +393,34 @@ 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 io_update(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_update(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_update(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
WARNING: multiple messages have this Message-ID (diff)
From: Alex Riesen <alexander.riesen@cetitec.com> To: Kieran Bingham <kieran.bingham@ideasonboard.com> Cc: Mark Rutland <mark.rutland@arm.com>, devel@driverdev.osuosl.org, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Rob Herring <robh+dt@kernel.org>, Geert Uytterhoeven <geert@linux-m68k.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Mauro Carvalho Chehab <mchehab@kernel.org>, linux-media@vger.kernel.org Subject: [PATCH v2 03/10] media: adv748x: reduce amount of code for bitwise modifications of device registers Date: Thu, 19 Mar 2020 18:41:53 +0100 [thread overview] Message-ID: <099ebaa317156ec8edab973d0445851337139e6b.1584639664.git.alexander.riesen@cetitec.com> (raw) In-Reply-To: <cover.1584639664.git.alexander.riesen@cetitec.com> The regmap provides a convenient utility for this. Signed-off-by: Alexander Riesen <alexander.riesen@cetitec.com> --- drivers/media/i2c/adv748x/adv748x-core.c | 6 ++++++ drivers/media/i2c/adv748x/adv748x.h | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c index 345f009de121..36164a254d7b 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..c5245464fffc 100644 --- a/drivers/media/i2c/adv748x/adv748x.h +++ b/drivers/media/i2c/adv748x/adv748x.h @@ -393,25 +393,34 @@ 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 io_update(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_update(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_update(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 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2020-03-19 17:42 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-19 17:41 [PATCH v2 00/10] media: adv748x: add support for HDMI audio Alex Riesen 2020-03-19 17:41 ` Alex Riesen 2020-03-19 17:41 ` [PATCH v2 01/10] media: adv748x: fix end-of-line terminators in diagnostic statements Alex Riesen 2020-03-19 17:41 ` Alex Riesen 2020-03-19 18:03 ` Laurent Pinchart 2020-03-19 18:03 ` Laurent Pinchart 2020-03-19 17:41 ` [PATCH v2 02/10] media: adv748x: include everything adv748x.h needs into the file Alex Riesen 2020-03-19 17:41 ` Alex Riesen 2020-03-19 17:48 ` Laurent Pinchart 2020-03-19 17:48 ` Laurent Pinchart 2020-03-20 8:23 ` Alex Riesen 2020-03-20 8:23 ` Alex Riesen 2020-03-19 17:41 ` Alex Riesen [this message] 2020-03-19 17:41 ` [PATCH v2 03/10] media: adv748x: reduce amount of code for bitwise modifications of device registers Alex Riesen 2020-03-19 18:06 ` Laurent Pinchart 2020-03-19 18:06 ` Laurent Pinchart 2020-03-20 9:08 ` Alex Riesen 2020-03-20 9:08 ` Alex Riesen 2020-03-19 17:41 ` [PATCH v2 04/10] media: adv748x: add definitions for audio output related registers Alex Riesen 2020-03-19 17:41 ` Alex Riesen 2020-03-19 17:42 ` [PATCH v2 05/10] media: adv748x: add support for HDMI audio Alex Riesen 2020-03-19 17:42 ` Alex Riesen 2020-03-20 8:43 ` Geert Uytterhoeven 2020-03-20 8:43 ` Geert Uytterhoeven 2020-03-20 8:57 ` Alex Riesen 2020-03-20 8:57 ` Alex Riesen 2020-03-20 9:10 ` Geert Uytterhoeven 2020-03-20 9:10 ` Geert Uytterhoeven 2020-03-20 10:58 ` Alex Riesen 2020-03-20 10:58 ` Alex Riesen 2020-03-20 11:05 ` Geert Uytterhoeven 2020-03-20 11:05 ` Geert Uytterhoeven 2020-03-20 11:11 ` Alex Riesen 2020-03-20 11:11 ` Alex Riesen 2020-03-19 17:42 ` [PATCH v2 06/10] media: adv748x: only activate DAI if it is described in device tree Alex Riesen 2020-03-19 17:42 ` Alex Riesen 2020-03-19 17:42 ` [PATCH v2 07/10] dt-bindings: adv748x: add information about serial audio interface (I2S/TDM) Alex Riesen 2020-03-19 17:42 ` Alex Riesen 2020-03-19 18:01 ` Laurent Pinchart 2020-03-19 18:01 ` Laurent Pinchart 2020-03-20 8:44 ` Alex Riesen 2020-03-20 8:44 ` Alex Riesen 2020-03-20 8:48 ` Geert Uytterhoeven 2020-03-20 8:48 ` Geert Uytterhoeven 2020-03-20 9:03 ` Alex Riesen 2020-03-20 9:03 ` Alex Riesen 2020-03-20 9:15 ` Geert Uytterhoeven 2020-03-20 9:15 ` Geert Uytterhoeven 2020-03-20 9:18 ` Alex Riesen 2020-03-20 9:18 ` Alex Riesen 2020-03-20 9:59 ` Laurent Pinchart 2020-03-20 9:59 ` Laurent Pinchart 2020-03-20 16:15 ` Alex Riesen 2020-03-20 16:15 ` Alex Riesen 2020-03-19 17:42 ` [PATCH v2 08/10] arm64: dts: renesas: salvator: add a connection from adv748x codec (HDMI input) to the R-Car SoC Alex Riesen 2020-03-19 17:42 ` Alex Riesen 2020-03-23 0:12 ` Kuninori Morimoto 2020-03-23 0:12 ` Kuninori Morimoto 2020-03-23 7:35 ` Alex Riesen 2020-03-23 7:35 ` Alex Riesen 2020-03-19 17:42 ` [PATCH v2 09/10] media: adv748x: add support for log_status ioctl Alex Riesen 2020-03-19 17:42 ` Alex Riesen 2020-03-19 17:43 ` [PATCH v2 10/10] media: adv748x: allow the HDMI sub-device to accept EDID Alex Riesen 2020-03-19 17:43 ` Alex Riesen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=099ebaa317156ec8edab973d0445851337139e6b.1584639664.git.alexander.riesen@cetitec.com \ --to=alexander.riesen@cetitec.com \ --cc=devel@driverdev.osuosl.org \ --cc=devicetree@vger.kernel.org \ --cc=geert@linux-m68k.org \ --cc=hverkuil-cisco@xs4all.nl \ --cc=kieran.bingham@ideasonboard.com \ --cc=kuninori.morimoto.gx@renesas.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mchehab@kernel.org \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.