Commit 04853352 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'samsung-pinctrl-5.15' of... 

Merge tag 'samsung-pinctrl-5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel

Samsung pinctrl drivers changes for v5.15

1. Fix number of pins in one GPIO pin bank.
2. Add support for Exynos850 SoC (Exynos3830).
parents 0dda8b01 cdd3d945

Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ Required Properties: 
  - "samsung,exynos5420-pinctrl": for Exynos5420 compatible pin-controller.

  - "samsung,exynos5433-pinctrl": for Exynos5433 compatible pin-controller.

  - "samsung,exynos7-pinctrl": for Exynos7 compatible pin-controller.

  - "samsung,exynos850-pinctrl": for Exynos850 compatible pin-controller.



- reg: Base address of the pin controller hardware module and length of

  the address space it occupies.

drivers/pinctrl/samsung/pinctrl-exynos-arm64.c

+116 −0
Original line number Diff line number Diff line
@@ -40,6 +40,24 @@ static const struct samsung_pin_bank_type exynos5433_bank_type_alive = { 
	.reg_offset = { 0x00, 0x04, 0x08, 0x0c, },

};



/*

 * Bank type for non-alive type. Bit fields:

 * CON: 4, DAT: 1, PUD: 4, DRV: 4, CONPDN: 2, PUDPDN: 4

 */

static const struct samsung_pin_bank_type exynos850_bank_type_off  = {

	.fld_width = { 4, 1, 4, 4, 2, 4, },

	.reg_offset = { 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, },

};



/*

 * Bank type for alive type. Bit fields:

 * CON: 4, DAT: 1, PUD: 4, DRV: 4

 */

static const struct samsung_pin_bank_type exynos850_bank_type_alive = {

	.fld_width = { 4, 1, 4, 4, },

	.reg_offset = { 0x00, 0x04, 0x08, 0x0c, },

};



/* Pad retention control code for accessing PMU regmap */

static atomic_t exynos_shared_retention_refcnt;
@@ -422,3 +440,101 @@ const struct samsung_pinctrl_of_match_data exynos7_of_data __initconst = { 
	.ctrl		= exynos7_pin_ctrl,

	.num_ctrl	= ARRAY_SIZE(exynos7_pin_ctrl),

};



/* pin banks of exynos850 pin-controller 0 (ALIVE) */

static const struct samsung_pin_bank_data exynos850_pin_banks0[] __initconst = {

	/* Must start with EINTG banks, ordered by EINT group number. */

	EXYNOS850_PIN_BANK_EINTW(8, 0x000, "gpa0", 0x00),

	EXYNOS850_PIN_BANK_EINTW(8, 0x020, "gpa1", 0x04),

	EXYNOS850_PIN_BANK_EINTW(8, 0x040, "gpa2", 0x08),

	EXYNOS850_PIN_BANK_EINTW(8, 0x060, "gpa3", 0x0c),

	EXYNOS850_PIN_BANK_EINTW(4, 0x080, "gpa4", 0x10),

	EXYNOS850_PIN_BANK_EINTN(3, 0x0a0, "gpq0"),

};



/* pin banks of exynos850 pin-controller 1 (CMGP) */

static const struct samsung_pin_bank_data exynos850_pin_banks1[] __initconst = {

	/* Must start with EINTG banks, ordered by EINT group number. */

	EXYNOS850_PIN_BANK_EINTW(1, 0x000, "gpm0", 0x00),

	EXYNOS850_PIN_BANK_EINTW(1, 0x020, "gpm1", 0x04),

	EXYNOS850_PIN_BANK_EINTW(1, 0x040, "gpm2", 0x08),

	EXYNOS850_PIN_BANK_EINTW(1, 0x060, "gpm3", 0x0c),

	EXYNOS850_PIN_BANK_EINTW(1, 0x080, "gpm4", 0x10),

	EXYNOS850_PIN_BANK_EINTW(1, 0x0a0, "gpm5", 0x14),

	EXYNOS850_PIN_BANK_EINTW(1, 0x0c0, "gpm6", 0x18),

	EXYNOS850_PIN_BANK_EINTW(1, 0x0e0, "gpm7", 0x1c),

};



/* pin banks of exynos850 pin-controller 2 (AUD) */

static const struct samsung_pin_bank_data exynos850_pin_banks2[] __initconst = {

	/* Must start with EINTG banks, ordered by EINT group number. */

	EXYNOS850_PIN_BANK_EINTG(5, 0x000, "gpb0", 0x00),

	EXYNOS850_PIN_BANK_EINTG(5, 0x020, "gpb1", 0x04),

};



/* pin banks of exynos850 pin-controller 3 (HSI) */

static const struct samsung_pin_bank_data exynos850_pin_banks3[] __initconst = {

	/* Must start with EINTG banks, ordered by EINT group number. */

	EXYNOS850_PIN_BANK_EINTG(6, 0x000, "gpf2", 0x00),

};



/* pin banks of exynos850 pin-controller 4 (CORE) */

static const struct samsung_pin_bank_data exynos850_pin_banks4[] __initconst = {

	/* Must start with EINTG banks, ordered by EINT group number. */

	EXYNOS850_PIN_BANK_EINTG(4, 0x000, "gpf0", 0x00),

	EXYNOS850_PIN_BANK_EINTG(8, 0x020, "gpf1", 0x04),

};



/* pin banks of exynos850 pin-controller 5 (PERI) */

static const struct samsung_pin_bank_data exynos850_pin_banks5[] __initconst = {

	/* Must start with EINTG banks, ordered by EINT group number. */

	EXYNOS850_PIN_BANK_EINTG(2, 0x000, "gpg0", 0x00),

	EXYNOS850_PIN_BANK_EINTG(6, 0x020, "gpp0", 0x04),

	EXYNOS850_PIN_BANK_EINTG(4, 0x040, "gpp1", 0x08),

	EXYNOS850_PIN_BANK_EINTG(4, 0x060, "gpp2", 0x0c),

	EXYNOS850_PIN_BANK_EINTG(8, 0x080, "gpg1", 0x10),

	EXYNOS850_PIN_BANK_EINTG(8, 0x0a0, "gpg2", 0x14),

	EXYNOS850_PIN_BANK_EINTG(1, 0x0c0, "gpg3", 0x18),

	EXYNOS850_PIN_BANK_EINTG(3, 0x0e0, "gpc0", 0x1c),

	EXYNOS850_PIN_BANK_EINTG(6, 0x100, "gpc1", 0x20),

};



static const struct samsung_pin_ctrl exynos850_pin_ctrl[] __initconst = {

	{

		/* pin-controller instance 0 ALIVE data */

		.pin_banks	= exynos850_pin_banks0,

		.nr_banks	= ARRAY_SIZE(exynos850_pin_banks0),

		.eint_gpio_init = exynos_eint_gpio_init,

		.eint_wkup_init = exynos_eint_wkup_init,

	}, {

		/* pin-controller instance 1 CMGP data */

		.pin_banks	= exynos850_pin_banks1,

		.nr_banks	= ARRAY_SIZE(exynos850_pin_banks1),

		.eint_gpio_init = exynos_eint_gpio_init,

		.eint_wkup_init = exynos_eint_wkup_init,

	}, {

		/* pin-controller instance 2 AUD data */

		.pin_banks	= exynos850_pin_banks2,

		.nr_banks	= ARRAY_SIZE(exynos850_pin_banks2),

	}, {

		/* pin-controller instance 3 HSI data */

		.pin_banks	= exynos850_pin_banks3,

		.nr_banks	= ARRAY_SIZE(exynos850_pin_banks3),

		.eint_gpio_init = exynos_eint_gpio_init,

	}, {

		/* pin-controller instance 4 CORE data */

		.pin_banks	= exynos850_pin_banks4,

		.nr_banks	= ARRAY_SIZE(exynos850_pin_banks4),

		.eint_gpio_init = exynos_eint_gpio_init,

	}, {

		/* pin-controller instance 5 PERI data */

		.pin_banks	= exynos850_pin_banks5,

		.nr_banks	= ARRAY_SIZE(exynos850_pin_banks5),

		.eint_gpio_init = exynos_eint_gpio_init,

	},

};



const struct samsung_pinctrl_of_match_data exynos850_of_data __initconst = {

	.ctrl		= exynos850_pin_ctrl,

	.num_ctrl	= ARRAY_SIZE(exynos850_pin_ctrl),

};

drivers/pinctrl/samsung/pinctrl-exynos.h

+29 −0
Original line number Diff line number Diff line
@@ -108,6 +108,35 @@ 
		.pctl_res_idx   = pctl_idx,			\

	}							\



#define EXYNOS850_PIN_BANK_EINTN(pins, reg, id)			\

	{							\

		.type		= &exynos850_bank_type_alive,	\

		.pctl_offset	= reg,				\

		.nr_pins	= pins,				\

		.eint_type	= EINT_TYPE_NONE,		\

		.name		= id				\

	}



#define EXYNOS850_PIN_BANK_EINTG(pins, reg, id, offs)		\

	{							\

		.type		= &exynos850_bank_type_off,	\

		.pctl_offset	= reg,				\

		.nr_pins	= pins,				\

		.eint_type	= EINT_TYPE_GPIO,		\

		.eint_offset	= offs,				\

		.name		= id				\

	}



#define EXYNOS850_PIN_BANK_EINTW(pins, reg, id, offs)		\

	{							\

		.type		= &exynos850_bank_type_alive,	\

		.pctl_offset	= reg,				\

		.nr_pins	= pins,				\

		.eint_type	= EINT_TYPE_WKUP,		\

		.eint_offset	= offs,				\

		.name		= id				\

	}



/**

 * struct exynos_weint_data: irq specific data for all the wakeup interrupts

 * generated by the external wakeup interrupt controller.

drivers/pinctrl/samsung/pinctrl-samsung.c

+3 −1
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ static int samsung_pinctrl_register(struct platform_device *pdev, 
		pin_bank->grange.pin_base = drvdata->pin_base

						+ pin_bank->pin_base;

		pin_bank->grange.base = pin_bank->grange.pin_base;

		pin_bank->grange.npins = pin_bank->gpio_chip.ngpio;

		pin_bank->grange.npins = pin_bank->nr_pins;

		pin_bank->grange.gc = &pin_bank->gpio_chip;

		pinctrl_add_gpio_range(drvdata->pctl_dev, &pin_bank->grange);

	}
@@ -1264,6 +1264,8 @@ static const struct of_device_id samsung_pinctrl_dt_match[] = { 
		.data = &exynos5433_of_data },

	{ .compatible = "samsung,exynos7-pinctrl",

		.data = &exynos7_of_data },

	{ .compatible = "samsung,exynos850-pinctrl",

		.data = &exynos850_of_data },

#endif

#ifdef CONFIG_PINCTRL_S3C64XX

	{ .compatible = "samsung,s3c64xx-pinctrl",

drivers/pinctrl/samsung/pinctrl-samsung.h

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ extern const struct samsung_pinctrl_of_match_data exynos5410_of_data; 
extern const struct samsung_pinctrl_of_match_data exynos5420_of_data;

extern const struct samsung_pinctrl_of_match_data exynos5433_of_data;

extern const struct samsung_pinctrl_of_match_data exynos7_of_data;

extern const struct samsung_pinctrl_of_match_data exynos850_of_data;

extern const struct samsung_pinctrl_of_match_data s3c64xx_of_data;

extern const struct samsung_pinctrl_of_match_data s3c2412_of_data;

extern const struct samsung_pinctrl_of_match_data s3c2416_of_data;