| From 539ac74ff21330c0941901ad7e20bdd5be8f0923 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Fri, 29 Sep 2017 14:16:14 +0200 |
| Subject: [PATCH 0212/1795] pinctrl: sh-pfc: Add generic bias register |
| description |
| |
| Add a generic way to describe bias registers (for pull-up/down control), |
| like is already done for config and drive registers. |
| |
| This makes the sh-pfc core code aware of these registers, which will |
| ease introducing suspend/resume support later. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| (cherry picked from commit beaa34d9080f20c9f0994071703c5d5c012afb56) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/pinctrl/sh-pfc/sh_pfc.h | 12 ++++++++++++ |
| 1 file changed, 12 insertions(+) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h |
| index 8688b405e081..1914f4b5fef5 100644 |
| --- a/drivers/pinctrl/sh-pfc/sh_pfc.h |
| +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h |
| @@ -148,6 +148,17 @@ struct pinmux_drive_reg { |
| .reg = r, \ |
| .fields = |
| |
| +struct pinmux_bias_reg { |
| + u32 puen; /* Pull-enable or pull-up control register */ |
| + u32 pud; /* Pull-up/down control register (optional) */ |
| + const u16 pins[32]; |
| +}; |
| + |
| +#define PINMUX_BIAS_REG(name1, r1, name2, r2) \ |
| + .puen = r1, \ |
| + .pud = r2, \ |
| + .pins = |
| + |
| struct pinmux_data_reg { |
| u32 reg; |
| u8 reg_width; |
| @@ -245,6 +256,7 @@ struct sh_pfc_soc_info { |
| |
| const struct pinmux_cfg_reg *cfg_regs; |
| const struct pinmux_drive_reg *drive_regs; |
| + const struct pinmux_bias_reg *bias_regs; |
| const struct pinmux_data_reg *data_regs; |
| |
| const u16 *pinmux_data; |
| -- |
| 2.19.0 |
| |