Commit 47975a87 authored by Nicolas Frattaroli's avatar Nicolas Frattaroli Committed by Yury Norov
Browse files

mmc: dw_mmc-rockchip: switch to FIELD_PREP_WM16 macro 



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

Switch to the new FIELD_PREP_WM16 macro in hw_bitfield.h, which has
error checking. Instead of redefining the driver's HIWORD_UPDATE macro
in this case, replace the two only instances of it with the new macro,
as I could test that they result in an equivalent value.

Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.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 21368fcb

drivers/mmc/host/dw_mmc-rockchip.c

+5 −4
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/clk.h>

#include <linux/hw_bitfield.h>

#include <linux/mmc/host.h>

#include <linux/of_address.h>

#include <linux/mmc/slot-gpio.h>
@@ -24,8 +25,6 @@ 
#define ROCKCHIP_MMC_DELAYNUM_OFFSET	2

#define ROCKCHIP_MMC_DELAYNUM_MASK	(0xff << ROCKCHIP_MMC_DELAYNUM_OFFSET)

#define ROCKCHIP_MMC_DELAY_ELEMENT_PSEC	60

#define HIWORD_UPDATE(val, mask, shift) \

		((val) << (shift) | (mask) << ((shift) + 16))



static const unsigned int freqs[] = { 100000, 200000, 300000, 400000 };
@@ -148,9 +147,11 @@ static int rockchip_mmc_set_internal_phase(struct dw_mci *host, bool sample, int 
	raw_value |= nineties;



	if (sample)

		mci_writel(host, TIMING_CON1, HIWORD_UPDATE(raw_value, 0x07ff, 1));

		mci_writel(host, TIMING_CON1,

			   FIELD_PREP_WM16(GENMASK(11, 1), raw_value));

	else

		mci_writel(host, TIMING_CON0, HIWORD_UPDATE(raw_value, 0x07ff, 1));

		mci_writel(host, TIMING_CON0,

			   FIELD_PREP_WM16(GENMASK(11, 1), raw_value));



	dev_dbg(host->dev, "set %s_phase(%d) delay_nums=%u actual_degrees=%d\n",

		sample ? "sample" : "drv", degrees, delay_num,