Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc700715 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Walleij
Browse files

pinctrl: sh-pfc: Store register/field widths in u8 instead of unsigned long 



Register and field widths are in the range 1..32. Storing them in the
pinctrl data in (arrays of) unsigned long wastes space.

This decreases the size of a (32-bit) shmobile_defconfig kernel
supporting 7 SoCs by 26460 bytes.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent dbad75dd

drivers/pinctrl/sh-pfc/core.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static void sh_pfc_write_config_reg(struct sh_pfc *pfc, 
	sh_pfc_config_reg_helper(pfc, crp, field, &mapped_reg, &mask, &pos);



	dev_dbg(pfc->dev, "write_reg addr = %lx, value = 0x%x, field = %ld, "

		"r_width = %ld, f_width = %ld\n",

		"r_width = %u, f_width = %u\n",

		crp->reg, value, field, crp->reg_width, crp->field_width);



	mask = ~(mask << pos);

drivers/pinctrl/sh-pfc/sh_pfc.h

+6 −4
Original line number Diff line number Diff line
@@ -69,9 +69,10 @@ struct pinmux_func { 
};



struct pinmux_cfg_reg {

	unsigned long reg, reg_width, field_width;

	unsigned long reg;

	u8 reg_width, field_width;

	const u16 *enum_ids;

	const unsigned long *var_field_width;

	const u8 *var_field_width;

};



#define PINMUX_CFG_REG(name, r, r_width, f_width) \
@@ -80,12 +81,13 @@ struct pinmux_cfg_reg { 


#define PINMUX_CFG_REG_VAR(name, r, r_width, var_fw0, var_fwn...) \

	.reg = r, .reg_width = r_width,	\

	.var_field_width = (const unsigned long [r_width]) \

	.var_field_width = (const u8 [r_width]) \

		{ var_fw0, var_fwn, 0 }, \

	.enum_ids = (const u16 [])



struct pinmux_data_reg {

	unsigned long reg, reg_width;

	unsigned long reg;

	u8 reg_width;

	const u16 *enum_ids;

};