Samsung pinctrl drivers changes for v5.17
1. Add support for Exynos7885. 2. Drop usage of platform_get_resource(). -----BEGIN PGP SIGNATURE----- iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmHG8FUQHGtyemtAa2Vy bmVsLm9yZwAKCRDBN2bmhouD1yeOD/4rAo7Pt6hNuyFd41VVppgE5qrkGkZGdfzE MFgnjhzNgBiVy+A6iq3saL45goq50NKjjAdXgR/tYBcGSGnsbAUdUkYurSZVv3jN RJqB0dmKG3yjIrsW9TLPsbjJ0GV+jFkhDsUd0kt5uCyTnSKuZloATt8SaG3c7YZD ZS9CYIw5+EgICETZZaDXc6srNaKfEZ67DGhaSOuuuvldbrRZJ0ua2lPA3136pz20 +Stdn/fdmnhw/xbpIaPzS3AwycGziT5foXHxBiTJ4Br+rFvZFOdnlQba6L6lsdKL GTEqT8MH8Jj50bVQYC9JTWj9RXMxS6G7jNFGCc6XixflwPrzKmstXXOdD9qUhRG3 ValOmpxRHMI5aAvSOlPLh2oB/y7J/tNnBHdKtLDv6ZzYvxji7RPd3YieWAt7Zts3 EHFw9Xdn3F9K6h6QcmoImtCdp02l+oss3W8q3wuiRQkvYsl+Z/gPVVYf+pNTDTxQ aQyBiYj1H6TNgiO1TtxOx1CKleIQ6IeVzMKvi9pVZW+ZeWs1/ZTCLzrbgXMolNkn 6XmEbDDGu+XaffO9WIatgz79C7JgtzlqTYL47OgVBsbiGsDRLLSvtR+N6ZdzRrLE ZdUtJp6DzzDfhPP8OC0YIa7idIkNDBaP09g2HF9VPMbAXLXslhXTCaZmHkn062Mm qfEPxFSKSA== =hka6 -----END PGP SIGNATURE----- Merge tag 'samsung-pinctrl-5.17' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel Samsung pinctrl drivers changes for v5.17 1. Add support for Exynos7885. 2. Drop usage of platform_get_resource().
This commit is contained in:
Linus Walleij
commit
c8eefdbfa1
@ -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,exynos7885-pinctrl": for Exynos7885 compatible pin-controller.
|
||||
- "samsung,exynos850-pinctrl": for Exynos850 compatible pin-controller.
|
||||
- "samsung,exynosautov9-pinctrl": for ExynosAutov9 compatible pin-controller.
|
||||
|
||||
|
||||
@ -441,6 +441,87 @@ const struct samsung_pinctrl_of_match_data exynos7_of_data __initconst = {
|
||||
.num_ctrl = ARRAY_SIZE(exynos7_pin_ctrl),
|
||||
};
|
||||
|
||||
/* pin banks of exynos7885 pin-controller 0 (ALIVE) */
|
||||
static const struct samsung_pin_bank_data exynos7885_pin_banks0[] __initconst = {
|
||||
EXYNOS_PIN_BANK_EINTN(3, 0x000, "etc0"),
|
||||
EXYNOS_PIN_BANK_EINTN(3, 0x020, "etc1"),
|
||||
EXYNOS850_PIN_BANK_EINTW(8, 0x040, "gpa0", 0x00),
|
||||
EXYNOS850_PIN_BANK_EINTW(8, 0x060, "gpa1", 0x04),
|
||||
EXYNOS850_PIN_BANK_EINTW(8, 0x080, "gpa2", 0x08),
|
||||
EXYNOS850_PIN_BANK_EINTW(5, 0x0a0, "gpq0", 0x0c),
|
||||
};
|
||||
|
||||
/* pin banks of exynos7885 pin-controller 1 (DISPAUD) */
|
||||
static const struct samsung_pin_bank_data exynos7885_pin_banks1[] __initconst = {
|
||||
EXYNOS850_PIN_BANK_EINTG(5, 0x000, "gpb0", 0x00),
|
||||
EXYNOS850_PIN_BANK_EINTG(4, 0x020, "gpb1", 0x04),
|
||||
EXYNOS850_PIN_BANK_EINTG(5, 0x040, "gpb2", 0x08),
|
||||
};
|
||||
|
||||
/* pin banks of exynos7885 pin-controller 2 (FSYS) */
|
||||
static const struct samsung_pin_bank_data exynos7885_pin_banks2[] __initconst = {
|
||||
EXYNOS850_PIN_BANK_EINTG(4, 0x000, "gpf0", 0x00),
|
||||
EXYNOS850_PIN_BANK_EINTG(8, 0x020, "gpf2", 0x04),
|
||||
EXYNOS850_PIN_BANK_EINTG(6, 0x040, "gpf3", 0x08),
|
||||
EXYNOS850_PIN_BANK_EINTG(6, 0x060, "gpf4", 0x0c),
|
||||
};
|
||||
|
||||
/* pin banks of exynos7885 pin-controller 3 (TOP) */
|
||||
static const struct samsung_pin_bank_data exynos7885_pin_banks3[] __initconst = {
|
||||
EXYNOS850_PIN_BANK_EINTG(4, 0x000, "gpp0", 0x00),
|
||||
EXYNOS850_PIN_BANK_EINTG(3, 0x020, "gpg0", 0x04),
|
||||
EXYNOS850_PIN_BANK_EINTG(4, 0x040, "gpp1", 0x08),
|
||||
EXYNOS850_PIN_BANK_EINTG(4, 0x060, "gpp2", 0x0c),
|
||||
EXYNOS850_PIN_BANK_EINTG(3, 0x080, "gpp3", 0x10),
|
||||
EXYNOS850_PIN_BANK_EINTG(6, 0x0a0, "gpp4", 0x14),
|
||||
EXYNOS850_PIN_BANK_EINTG(4, 0x0c0, "gpp5", 0x18),
|
||||
EXYNOS850_PIN_BANK_EINTG(5, 0x0e0, "gpp6", 0x1c),
|
||||
EXYNOS850_PIN_BANK_EINTG(2, 0x100, "gpp7", 0x20),
|
||||
EXYNOS850_PIN_BANK_EINTG(2, 0x120, "gpp8", 0x24),
|
||||
EXYNOS850_PIN_BANK_EINTG(8, 0x140, "gpg1", 0x28),
|
||||
EXYNOS850_PIN_BANK_EINTG(8, 0x160, "gpg2", 0x2c),
|
||||
EXYNOS850_PIN_BANK_EINTG(8, 0x180, "gpg3", 0x30),
|
||||
EXYNOS850_PIN_BANK_EINTG(2, 0x1a0, "gpg4", 0x34),
|
||||
EXYNOS850_PIN_BANK_EINTG(4, 0x1c0, "gpc0", 0x38),
|
||||
EXYNOS850_PIN_BANK_EINTG(8, 0x1e0, "gpc1", 0x3c),
|
||||
EXYNOS850_PIN_BANK_EINTG(8, 0x200, "gpc2", 0x40),
|
||||
};
|
||||
|
||||
static const struct samsung_pin_ctrl exynos7885_pin_ctrl[] __initconst = {
|
||||
{
|
||||
/* pin-controller instance 0 Alive data */
|
||||
.pin_banks = exynos7885_pin_banks0,
|
||||
.nr_banks = ARRAY_SIZE(exynos7885_pin_banks0),
|
||||
.eint_gpio_init = exynos_eint_gpio_init,
|
||||
.eint_wkup_init = exynos_eint_wkup_init,
|
||||
.suspend = exynos_pinctrl_suspend,
|
||||
.resume = exynos_pinctrl_resume,
|
||||
}, {
|
||||
/* pin-controller instance 1 DISPAUD data */
|
||||
.pin_banks = exynos7885_pin_banks1,
|
||||
.nr_banks = ARRAY_SIZE(exynos7885_pin_banks1),
|
||||
}, {
|
||||
/* pin-controller instance 2 FSYS data */
|
||||
.pin_banks = exynos7885_pin_banks2,
|
||||
.nr_banks = ARRAY_SIZE(exynos7885_pin_banks2),
|
||||
.eint_gpio_init = exynos_eint_gpio_init,
|
||||
.suspend = exynos_pinctrl_suspend,
|
||||
.resume = exynos_pinctrl_resume,
|
||||
}, {
|
||||
/* pin-controller instance 3 TOP data */
|
||||
.pin_banks = exynos7885_pin_banks3,
|
||||
.nr_banks = ARRAY_SIZE(exynos7885_pin_banks3),
|
||||
.eint_gpio_init = exynos_eint_gpio_init,
|
||||
.suspend = exynos_pinctrl_suspend,
|
||||
.resume = exynos_pinctrl_resume,
|
||||
},
|
||||
};
|
||||
|
||||
const struct samsung_pinctrl_of_match_data exynos7885_of_data __initconst = {
|
||||
.ctrl = exynos7885_pin_ctrl,
|
||||
.num_ctrl = ARRAY_SIZE(exynos7885_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. */
|
||||
|
||||
@ -1095,7 +1095,6 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
|
||||
struct samsung_pinctrl_drv_data *drvdata;
|
||||
const struct samsung_pin_ctrl *ctrl;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct resource *res;
|
||||
int ret;
|
||||
|
||||
drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
|
||||
@ -1109,9 +1108,11 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
|
||||
}
|
||||
drvdata->dev = dev;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||
if (res)
|
||||
drvdata->irq = res->start;
|
||||
ret = platform_get_irq_optional(pdev, 0);
|
||||
if (ret < 0 && ret != -ENXIO)
|
||||
return ret;
|
||||
if (ret > 0)
|
||||
drvdata->irq = ret;
|
||||
|
||||
if (ctrl->retention_data) {
|
||||
drvdata->retention_ctrl = ctrl->retention_data->init(drvdata,
|
||||
@ -1264,6 +1265,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,exynos7885-pinctrl",
|
||||
.data = &exynos7885_of_data },
|
||||
{ .compatible = "samsung,exynos850-pinctrl",
|
||||
.data = &exynos850_of_data },
|
||||
{ .compatible = "samsung,exynosautov9-pinctrl",
|
||||
|
||||
@ -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 exynos7885_of_data;
|
||||
extern const struct samsung_pinctrl_of_match_data exynos850_of_data;
|
||||
extern const struct samsung_pinctrl_of_match_data exynosautov9_of_data;
|
||||
extern const struct samsung_pinctrl_of_match_data s3c64xx_of_data;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user