Commit 3d1ef6e4 authored by Nicolas Frattaroli's avatar Nicolas Frattaroli Committed by Yury Norov
Browse files

ASoC: rockchip: i2s-tdm: switch to FIELD_PREP_WM16_CONST macro 



The era of hand-rolled HIWORD_UPDATE macros is over, at least for those
drivers that use constant masks.

Replace the implementation of this driver's HIWORD_UPDATE macro with an
instance of FIELD_PREP_WM16_CONST. The const variant is chosen here
because some of the header defines are then used in initializers.

This gives us some compile-time error checking, while keeping the diff
very small and easy to review.

Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarNicolas Frattaroli <nicolas.frattaroli@collabora.com>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarYury Norov (NVIDIA) <yury.norov@gmail.com>
parent 63df37f3

sound/soc/rockchip/rockchip_i2s_tdm.h

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#ifndef _ROCKCHIP_I2S_TDM_H

#define _ROCKCHIP_I2S_TDM_H



#include <linux/hw_bitfield.h>



/*

 * TXCR

 * transmit operation control register
@@ -285,7 +287,7 @@ enum { 
#define I2S_TDM_RXCR	(0x0034)

#define I2S_CLKDIV	(0x0038)



#define HIWORD_UPDATE(v, h, l)	(((v) << (l)) | (GENMASK((h), (l)) << 16))

#define HIWORD_UPDATE(v, h, l)	(FIELD_PREP_WM16_CONST(GENMASK((h), (l)), (v)))



/* PX30 GRF CONFIGS */

#define PX30_I2S0_CLK_IN_SRC_FROM_TX		HIWORD_UPDATE(1, 13, 12)