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

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

pinctrl: sh-pfc: Use u32 to store register addresses 



Currently all PFC registers lie in low 32-bit address space. Hence use
u32 instead of unsigned long to store PFC register addresses in pinctrl
tables.  All calculations of virtual addresses use a phys_addr_t
intermediate, so we know where to add an offset if the 32-bit assumption
ever becomes false.

While this doesn't impact 32-bit builds, it would save ca. 7 KiB on a
64-bit shmobile_defconfig kernel.

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 17c7cbb0

drivers/pinctrl/sh-pfc/core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -92,10 +92,10 @@ static int sh_pfc_map_resources(struct sh_pfc *pfc, 
	return 0;

	return 0;

}

}





static void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc,

static void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc, u32 reg)

					 unsigned long address)

{

{

	struct sh_pfc_window *window;

	struct sh_pfc_window *window;

	phys_addr_t address = reg;

	unsigned int i;

	unsigned int i;





	/* scan through physical windows and convert address */

	/* scan through physical windows and convert address */
@@ -208,7 +208,7 @@ static void sh_pfc_write_config_reg(struct sh_pfc *pfc, 




	sh_pfc_config_reg_helper(pfc, crp, field, &mapped_reg, &mask, &pos);

	sh_pfc_config_reg_helper(pfc, crp, field, &mapped_reg, &mask, &pos);





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

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

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

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

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

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

drivers/pinctrl/sh-pfc/gpio.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -62,7 +62,8 @@ static void gpio_get_data_reg(struct sh_pfc_chip *chip, unsigned int offset, 
static u32 gpio_read_data_reg(struct sh_pfc_chip *chip,

static u32 gpio_read_data_reg(struct sh_pfc_chip *chip,

			      const struct pinmux_data_reg *dreg)

			      const struct pinmux_data_reg *dreg)

{

{

	void __iomem *mem = dreg->reg - chip->mem->phys + chip->mem->virt;

	phys_addr_t address = dreg->reg;

	void __iomem *mem = address - chip->mem->phys + chip->mem->virt;





	return sh_pfc_read_raw_reg(mem, dreg->reg_width);

	return sh_pfc_read_raw_reg(mem, dreg->reg_width);

}

}
@@ -70,7 +71,8 @@ static u32 gpio_read_data_reg(struct sh_pfc_chip *chip, 
static void gpio_write_data_reg(struct sh_pfc_chip *chip,

static void gpio_write_data_reg(struct sh_pfc_chip *chip,

				const struct pinmux_data_reg *dreg, u32 value)

				const struct pinmux_data_reg *dreg, u32 value)

{

{

	void __iomem *mem = dreg->reg - chip->mem->phys + chip->mem->virt;

	phys_addr_t address = dreg->reg;

	void __iomem *mem = address - chip->mem->phys + chip->mem->virt;





	sh_pfc_write_raw_reg(mem, dreg->reg_width, value);

	sh_pfc_write_raw_reg(mem, dreg->reg_width, value);

}

}
@@ -340,6 +342,7 @@ sh_pfc_add_gpiochip(struct sh_pfc *pfc, int(*setup)(struct sh_pfc_chip *), 
int sh_pfc_register_gpiochip(struct sh_pfc *pfc)

int sh_pfc_register_gpiochip(struct sh_pfc *pfc)

{

{

	struct sh_pfc_chip *chip;

	struct sh_pfc_chip *chip;

	phys_addr_t address;

	unsigned int i;

	unsigned int i;

	int ret;

	int ret;
@@ -351,11 +354,12 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) 
	 * that covers the data registers. In that case don't try to handle

	 * that covers the data registers. In that case don't try to handle

	 * GPIOs.

	 * GPIOs.

	 */

	 */

	address = pfc->info->data_regs[0].reg;

	for (i = 0; i < pfc->num_windows; ++i) {

	for (i = 0; i < pfc->num_windows; ++i) {

		struct sh_pfc_window *window = &pfc->windows[i];

		struct sh_pfc_window *window = &pfc->windows[i];





		if (pfc->info->data_regs[0].reg >= window->phys &&

		if (address >= window->phys &&

		    pfc->info->data_regs[0].reg < window->phys + window->size)

		    address < window->phys + window->size)

			break;

			break;

	}

	}

drivers/pinctrl/sh-pfc/sh_pfc.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ struct pinmux_func { 
};

};





struct pinmux_cfg_reg {

struct pinmux_cfg_reg {

	unsigned long reg;

	u32 reg;

	u8 reg_width, field_width;

	u8 reg_width, field_width;

	const u16 *enum_ids;

	const u16 *enum_ids;

	const u8 *var_field_width;

	const u8 *var_field_width;
@@ -86,7 +86,7 @@ struct pinmux_cfg_reg { 
	.enum_ids = (const u16 [])

	.enum_ids = (const u16 [])





struct pinmux_data_reg {

struct pinmux_data_reg {

	unsigned long reg;

	u32 reg;

	u8 reg_width;

	u8 reg_width;

	const u16 *enum_ids;

	const u16 *enum_ids;

};

};
@@ -150,7 +150,7 @@ struct sh_pfc_soc_info { 
	const struct pinmux_irq *gpio_irq;

	const struct pinmux_irq *gpio_irq;

	unsigned int gpio_irq_size;

	unsigned int gpio_irq_size;





	unsigned long unlock_reg;

	u32 unlock_reg;

};

};





/* -----------------------------------------------------------------------------

/* -----------------------------------------------------------------------------