Commit 4fac6f0e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'samsung/pinctrl-exynos' into late/dt 

* samsung/pinctrl-exynos:
  ARM: EXYNOS: skip wakeup interrupt registration for exynos5250 if pinctrl is enabled
  gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250
  pinctrl: exynos: add exynos5250 SoC specific data
parents 41ef2d56 97916777

arch/arm/mach-exynos/common.c

+1 −0
Original line number Diff line number Diff line
@@ -822,6 +822,7 @@ static int __init exynos_init_irq_eint(void) 
	static const struct of_device_id exynos_pinctrl_ids[] = {

		{ .compatible = "samsung,exynos4210-pinctrl", },

		{ .compatible = "samsung,exynos4x12-pinctrl", },

		{ .compatible = "samsung,exynos5250-pinctrl", },

	};

	struct device_node *pctrl_np, *wkup_np;

	const char *wkup_compat = "samsung,exynos4210-wakeup-eint";

drivers/gpio/gpio-samsung.c

+1 −0
Original line number Diff line number Diff line
@@ -3024,6 +3024,7 @@ static __init int samsung_gpiolib_init(void) 
	static const struct of_device_id exynos_pinctrl_ids[] = {

		{ .compatible = "samsung,exynos4210-pinctrl", },

		{ .compatible = "samsung,exynos4x12-pinctrl", },

		{ .compatible = "samsung,exynos5250-pinctrl", },

		{ .compatible = "samsung,exynos5440-pinctrl", },

	};

	for_each_matching_node(pctrl_np, exynos_pinctrl_ids)

drivers/pinctrl/pinctrl-exynos.c

+108 −0
Original line number Diff line number Diff line
@@ -677,3 +677,111 @@ struct samsung_pin_ctrl exynos4x12_pin_ctrl[] = { 
		.label		= "exynos4x12-gpio-ctrl3",

	},

};



/* pin banks of exynos5250 pin-controller 0 */

static struct samsung_pin_bank exynos5250_pin_banks0[] = {

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

	EXYNOS_PIN_BANK_EINTG(6, 0x020, "gpa1", 0x04),

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

	EXYNOS_PIN_BANK_EINTG(5, 0x060, "gpb0", 0x0c),

	EXYNOS_PIN_BANK_EINTG(5, 0x080, "gpb1", 0x10),

	EXYNOS_PIN_BANK_EINTG(4, 0x0A0, "gpb2", 0x14),

	EXYNOS_PIN_BANK_EINTG(4, 0x0C0, "gpb3", 0x18),

	EXYNOS_PIN_BANK_EINTG(7, 0x0E0, "gpc0", 0x1c),

	EXYNOS_PIN_BANK_EINTG(4, 0x100, "gpc1", 0x20),

	EXYNOS_PIN_BANK_EINTG(7, 0x120, "gpc2", 0x24),

	EXYNOS_PIN_BANK_EINTG(7, 0x140, "gpc3", 0x28),

	EXYNOS_PIN_BANK_EINTG(4, 0x160, "gpd0", 0x2c),

	EXYNOS_PIN_BANK_EINTG(8, 0x180, "gpd1", 0x30),

	EXYNOS_PIN_BANK_EINTG(7, 0x2E0, "gpc4", 0x34),

	EXYNOS_PIN_BANK_EINTN(6, 0x1A0, "gpy0"),

	EXYNOS_PIN_BANK_EINTN(4, 0x1C0, "gpy1"),

	EXYNOS_PIN_BANK_EINTN(6, 0x1E0, "gpy2"),

	EXYNOS_PIN_BANK_EINTN(8, 0x200, "gpy3"),

	EXYNOS_PIN_BANK_EINTN(8, 0x220, "gpy4"),

	EXYNOS_PIN_BANK_EINTN(8, 0x240, "gpy5"),

	EXYNOS_PIN_BANK_EINTN(8, 0x260, "gpy6"),

	EXYNOS_PIN_BANK_EINTW(8, 0xC00, "gpx0", 0x00),

	EXYNOS_PIN_BANK_EINTW(8, 0xC20, "gpx1", 0x04),

	EXYNOS_PIN_BANK_EINTW(8, 0xC40, "gpx2", 0x08),

	EXYNOS_PIN_BANK_EINTW(8, 0xC60, "gpx3", 0x0c),

};



/* pin banks of exynos5250 pin-controller 1 */

static struct samsung_pin_bank exynos5250_pin_banks1[] = {

	EXYNOS_PIN_BANK_EINTG(8, 0x000, "gpe0", 0x00),

	EXYNOS_PIN_BANK_EINTG(2, 0x020, "gpe1", 0x04),

	EXYNOS_PIN_BANK_EINTG(4, 0x040, "gpf0", 0x08),

	EXYNOS_PIN_BANK_EINTG(4, 0x060, "gpf1", 0x0c),

	EXYNOS_PIN_BANK_EINTG(8, 0x080, "gpg0", 0x10),

	EXYNOS_PIN_BANK_EINTG(8, 0x0A0, "gpg1", 0x14),

	EXYNOS_PIN_BANK_EINTG(2, 0x0C0, "gpg2", 0x18),

	EXYNOS_PIN_BANK_EINTG(4, 0x0E0, "gph0", 0x1c),

	EXYNOS_PIN_BANK_EINTG(8, 0x100, "gph1", 0x20),

};



/* pin banks of exynos5250 pin-controller 2 */

static struct samsung_pin_bank exynos5250_pin_banks2[] = {

	EXYNOS_PIN_BANK_EINTG(8, 0x000, "gpv0", 0x00),

	EXYNOS_PIN_BANK_EINTG(8, 0x020, "gpv1", 0x04),

	EXYNOS_PIN_BANK_EINTG(8, 0x060, "gpv2", 0x08),

	EXYNOS_PIN_BANK_EINTG(8, 0x080, "gpv3", 0x0c),

	EXYNOS_PIN_BANK_EINTG(2, 0x0C0, "gpv4", 0x10),

};



/* pin banks of exynos5250 pin-controller 3 */

static struct samsung_pin_bank exynos5250_pin_banks3[] = {

	EXYNOS_PIN_BANK_EINTG(7, 0x000, "gpz", 0x00),

};



/*

 * Samsung pinctrl driver data for Exynos5250 SoC. Exynos5250 SoC includes

 * four gpio/pin-mux/pinconfig controllers.

 */

struct samsung_pin_ctrl exynos5250_pin_ctrl[] = {

	{

		/* pin-controller instance 0 data */

		.pin_banks	= exynos5250_pin_banks0,

		.nr_banks	= ARRAY_SIZE(exynos5250_pin_banks0),

		.geint_con	= EXYNOS_GPIO_ECON_OFFSET,

		.geint_mask	= EXYNOS_GPIO_EMASK_OFFSET,

		.geint_pend	= EXYNOS_GPIO_EPEND_OFFSET,

		.weint_con	= EXYNOS_WKUP_ECON_OFFSET,

		.weint_mask	= EXYNOS_WKUP_EMASK_OFFSET,

		.weint_pend	= EXYNOS_WKUP_EPEND_OFFSET,

		.svc		= EXYNOS_SVC_OFFSET,

		.eint_gpio_init = exynos_eint_gpio_init,

		.eint_wkup_init = exynos_eint_wkup_init,

		.label		= "exynos5250-gpio-ctrl0",

	}, {

		/* pin-controller instance 1 data */

		.pin_banks	= exynos5250_pin_banks1,

		.nr_banks	= ARRAY_SIZE(exynos5250_pin_banks1),

		.geint_con	= EXYNOS_GPIO_ECON_OFFSET,

		.geint_mask	= EXYNOS_GPIO_EMASK_OFFSET,

		.geint_pend	= EXYNOS_GPIO_EPEND_OFFSET,

		.svc		= EXYNOS_SVC_OFFSET,

		.eint_gpio_init = exynos_eint_gpio_init,

		.label		= "exynos5250-gpio-ctrl1",

	}, {

		/* pin-controller instance 2 data */

		.pin_banks	= exynos5250_pin_banks2,

		.nr_banks	= ARRAY_SIZE(exynos5250_pin_banks2),

		.geint_con	= EXYNOS_GPIO_ECON_OFFSET,

		.geint_mask	= EXYNOS_GPIO_EMASK_OFFSET,

		.geint_pend	= EXYNOS_GPIO_EPEND_OFFSET,

		.svc		= EXYNOS_SVC_OFFSET,

		.eint_gpio_init = exynos_eint_gpio_init,

		.label		= "exynos5250-gpio-ctrl2",

	}, {

		/* pin-controller instance 3 data */

		.pin_banks	= exynos5250_pin_banks3,

		.nr_banks	= ARRAY_SIZE(exynos5250_pin_banks3),

		.geint_con	= EXYNOS_GPIO_ECON_OFFSET,

		.geint_mask	= EXYNOS_GPIO_EMASK_OFFSET,

		.geint_pend	= EXYNOS_GPIO_EPEND_OFFSET,

		.svc		= EXYNOS_SVC_OFFSET,

		.eint_gpio_init = exynos_eint_gpio_init,

		.label		= "exynos5250-gpio-ctrl3",

	},

};

drivers/pinctrl/pinctrl-samsung.c

+2 −0
Original line number Diff line number Diff line
@@ -948,6 +948,8 @@ static const struct of_device_id samsung_pinctrl_dt_match[] = { 
		.data = (void *)exynos4210_pin_ctrl },

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

		.data = (void *)exynos4x12_pin_ctrl },

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

		.data = (void *)exynos5250_pin_ctrl },

	{},

};

MODULE_DEVICE_TABLE(of, samsung_pinctrl_dt_match);

drivers/pinctrl/pinctrl-samsung.h

+1 −0
Original line number Diff line number Diff line
@@ -237,5 +237,6 @@ struct samsung_pmx_func { 
/* list of all exported SoC specific data */

extern struct samsung_pin_ctrl exynos4210_pin_ctrl[];

extern struct samsung_pin_ctrl exynos4x12_pin_ctrl[];

extern struct samsung_pin_ctrl exynos5250_pin_ctrl[];



#endif /* __PINCTRL_SAMSUNG_H */