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

Commit 53673a51 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'sh-pfc-for-v4.8-tag1' of... 

Merge tag 'sh-pfc-for-v4.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel

pinctrl: sh-pfc: Updates for v4.8

  - Voltage switching support for R-Car H3,
  - DRIF pin support for R-Car H3,
  - Cleanups and fixes.
parents 4e80c8f5 2d775831

Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ Pin Configuration Node Properties: 


The pin configuration parameters use the generic pinconf bindings defined in

pinctrl-bindings.txt in this directory. The supported parameters are

bias-disable, bias-pull-up, bias-pull-down, drive strength and power-source. For

bias-disable, bias-pull-up, bias-pull-down, drive-strength and power-source. For

pins that have a configurable I/O voltage, the power-source value should be the

nominal I/O voltage in millivolts.

drivers/pinctrl/sh-pfc/core.c

+0 −10
Original line number Diff line number Diff line
@@ -598,15 +598,6 @@ static int sh_pfc_probe(struct platform_device *pdev) 
	return 0;

}



static int sh_pfc_remove(struct platform_device *pdev)

{

#ifdef CONFIG_PINCTRL_SH_PFC_GPIO

	sh_pfc_unregister_gpiochip(platform_get_drvdata(pdev));

#endif



	return 0;

}



static const struct platform_device_id sh_pfc_id_table[] = {

#ifdef CONFIG_PINCTRL_PFC_SH7203

	{ "pfc-sh7203", (kernel_ulong_t)&sh7203_pinmux_info },
@@ -650,7 +641,6 @@ static const struct platform_device_id sh_pfc_id_table[] = { 


static struct platform_driver sh_pfc_driver = {

	.probe		= sh_pfc_probe,

	.remove		= sh_pfc_remove,

	.id_table	= sh_pfc_id_table,

	.driver		= {

		.name	= DRV_NAME,

drivers/pinctrl/sh-pfc/core.h

+0 −58
Original line number Diff line number Diff line
@@ -10,50 +10,16 @@ 
#ifndef __SH_PFC_CORE_H__

#define __SH_PFC_CORE_H__



#include <linux/compiler.h>

#include <linux/spinlock.h>

#include <linux/types.h>



#include "sh_pfc.h"



struct sh_pfc_window {

	phys_addr_t phys;

	void __iomem *virt;

	unsigned long size;

};



struct sh_pfc_chip;

struct sh_pfc_pinctrl;



struct sh_pfc_pin_range {

	u16 start;

	u16 end;

};



struct sh_pfc {

	struct device *dev;

	const struct sh_pfc_soc_info *info;

	spinlock_t lock;



	unsigned int num_windows;

	struct sh_pfc_window *windows;

	unsigned int num_irqs;

	unsigned int *irqs;



	struct sh_pfc_pin_range *ranges;

	unsigned int nr_ranges;



	unsigned int nr_gpio_pins;



	struct sh_pfc_chip *gpio;

#ifdef CONFIG_SUPERH

	struct sh_pfc_chip *func;

#endif



};



int sh_pfc_register_gpiochip(struct sh_pfc *pfc);

int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc);



int sh_pfc_register_pinctrl(struct sh_pfc *pfc);
@@ -67,28 +33,4 @@ void sh_pfc_write_reg(struct sh_pfc *pfc, u32 reg, unsigned int width, 
int sh_pfc_get_pin_index(struct sh_pfc *pfc, unsigned int pin);

int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type);



extern const struct sh_pfc_soc_info emev2_pinmux_info;

extern const struct sh_pfc_soc_info r8a73a4_pinmux_info;

extern const struct sh_pfc_soc_info r8a7740_pinmux_info;

extern const struct sh_pfc_soc_info r8a7778_pinmux_info;

extern const struct sh_pfc_soc_info r8a7779_pinmux_info;

extern const struct sh_pfc_soc_info r8a7790_pinmux_info;

extern const struct sh_pfc_soc_info r8a7791_pinmux_info;

extern const struct sh_pfc_soc_info r8a7793_pinmux_info;

extern const struct sh_pfc_soc_info r8a7794_pinmux_info;

extern const struct sh_pfc_soc_info r8a7795_pinmux_info;

extern const struct sh_pfc_soc_info sh7203_pinmux_info;

extern const struct sh_pfc_soc_info sh7264_pinmux_info;

extern const struct sh_pfc_soc_info sh7269_pinmux_info;

extern const struct sh_pfc_soc_info sh73a0_pinmux_info;

extern const struct sh_pfc_soc_info sh7720_pinmux_info;

extern const struct sh_pfc_soc_info sh7722_pinmux_info;

extern const struct sh_pfc_soc_info sh7723_pinmux_info;

extern const struct sh_pfc_soc_info sh7724_pinmux_info;

extern const struct sh_pfc_soc_info sh7734_pinmux_info;

extern const struct sh_pfc_soc_info sh7757_pinmux_info;

extern const struct sh_pfc_soc_info sh7785_pinmux_info;

extern const struct sh_pfc_soc_info sh7786_pinmux_info;

extern const struct sh_pfc_soc_info shx3_pinmux_info;



#endif /* __SH_PFC_CORE_H__ */

drivers/pinctrl/sh-pfc/gpio.c

+1 −12
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ sh_pfc_add_gpiochip(struct sh_pfc *pfc, int(*setup)(struct sh_pfc_chip *), 
	if (ret < 0)

		return ERR_PTR(ret);



	ret = gpiochip_add_data(&chip->gpio_chip, chip);

	ret = devm_gpiochip_add_data(pfc->dev, &chip->gpio_chip, chip);

	if (unlikely(ret < 0))

		return ERR_PTR(ret);
@@ -399,18 +399,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) 
	chip = sh_pfc_add_gpiochip(pfc, gpio_function_setup, NULL);

	if (IS_ERR(chip))

		return PTR_ERR(chip);



	pfc->func = chip;

#endif /* CONFIG_SUPERH */



	return 0;

}
 


int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc)

{

	gpiochip_remove(&pfc->gpio->gpio_chip);

#ifdef CONFIG_SUPERH

	gpiochip_remove(&pfc->func->gpio_chip);

#endif

	return 0;

}

drivers/pinctrl/sh-pfc/pfc-r8a73a4.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/kernel.h>

#include <linux/pinctrl/pinconf-generic.h>



#include "core.h"

#include "sh_pfc.h"



#define CPU_ALL_PORT(fn, pfx, sfx)					\