From c35869a49915114e48c36b096212f01ea3ea9ffc Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Fri, 17 May 2013 18:24:30 +0200 Subject: [PATCH] --- yaml --- r: 376399 b: refs/heads/master c: 21c219933fd123d4cdfc8853f51c41330b9d6c28 h: refs/heads/master i: 376397: 9c15d56fb0ffcdbd370df25bde29d12b71322805 376395: d4dd85287cd1115ab04446682d7a70e4bc3a8ddb 376391: d09af3f16fcf5942ec3bde79c5c5ae7dae9b8188 376383: 424ab456e092f69de40fbb054bc11fae31ea6ead v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-samsung.c | 6 ++++++ trunk/drivers/pinctrl/pinctrl-samsung.h | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4ef0c1899254..f387943b62e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97fc463769f1564e8eda2e2f70d3b6e92a25ff16 +refs/heads/master: 21c219933fd123d4cdfc8853f51c41330b9d6c28 diff --git a/trunk/drivers/pinctrl/pinctrl-samsung.c b/trunk/drivers/pinctrl/pinctrl-samsung.c index 15db2580c145..63ac22e89678 100644 --- a/trunk/drivers/pinctrl/pinctrl-samsung.c +++ b/trunk/drivers/pinctrl/pinctrl-samsung.c @@ -1010,6 +1010,9 @@ static void samsung_pinctrl_suspend_dev( reg, bank->pm_save[PINCFG_TYPE_FUNC]); } } + + if (ctrl->suspend) + ctrl->suspend(drvdata); } /** @@ -1026,6 +1029,9 @@ static void samsung_pinctrl_resume_dev(struct samsung_pinctrl_drv_data *drvdata) void __iomem *virt_base = drvdata->virt_base; int i; + if (ctrl->resume) + ctrl->resume(drvdata); + for (i = 0; i < ctrl->nr_banks; i++) { struct samsung_pin_bank *bank = &ctrl->pin_banks[i]; void __iomem *reg = virt_base + bank->pctl_offset; diff --git a/trunk/drivers/pinctrl/pinctrl-samsung.h b/trunk/drivers/pinctrl/pinctrl-samsung.h index 9f5cc811b8cf..b316d9fe9b6b 100644 --- a/trunk/drivers/pinctrl/pinctrl-samsung.h +++ b/trunk/drivers/pinctrl/pinctrl-samsung.h @@ -187,6 +187,9 @@ struct samsung_pin_ctrl { int (*eint_gpio_init)(struct samsung_pinctrl_drv_data *); int (*eint_wkup_init)(struct samsung_pinctrl_drv_data *); + void (*suspend)(struct samsung_pinctrl_drv_data *); + void (*resume)(struct samsung_pinctrl_drv_data *); + char *label; };