summaryrefslogtreecommitdiff
path: root/include/linux/sh_pfc.h
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2011-12-13 16:01:05 (GMT)
committerPaul Mundt <lethal@linux-sh.org>2012-01-09 00:33:55 (GMT)
commitf78a26f55b2438c439609fc90b473f7f08f5b697 (patch)
tree40359c326c23ccbc4c1f014f04aa60b97db6994e /include/linux/sh_pfc.h
parent18925e118b3b4d55b45711218cd3c3c4360e5cd1 (diff)
downloadlinux-fsl-qoriq-f78a26f55b2438c439609fc90b473f7f08f5b697.tar.xz
sh: pfc: Variable bitfield width config register support
Add support for variable config reg hardware by adding the macro PINMUX_CFG_REG_VAR(). The width of each bitfield needs to be passed to the macro, and the correct space must be consumed by each bitfield in the enum table following the macro. Data registers still need to have fixed bitfields. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux/sh_pfc.h')
-rw-r--r--include/linux/sh_pfc.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/sh_pfc.h b/include/linux/sh_pfc.h
index 91666a5..84538c4 100644
--- a/include/linux/sh_pfc.h
+++ b/include/linux/sh_pfc.h
@@ -45,12 +45,19 @@ struct pinmux_cfg_reg {
unsigned long reg, reg_width, field_width;
unsigned long *cnt;
pinmux_enum_t *enum_ids;
+ unsigned long *var_field_width;
};
#define PINMUX_CFG_REG(name, r, r_width, f_width) \
.reg = r, .reg_width = r_width, .field_width = f_width, \
.cnt = (unsigned long [r_width / f_width]) {}, \
- .enum_ids = (pinmux_enum_t [(r_width / f_width) * (1 << f_width)]) \
+ .enum_ids = (pinmux_enum_t [(r_width / f_width) * (1 << f_width)])
+
+#define PINMUX_CFG_REG_VAR(name, r, r_width, var_fw0, var_fwn...) \
+ .reg = r, .reg_width = r_width, \
+ .cnt = (unsigned long [r_width]) {}, \
+ .var_field_width = (unsigned long [r_width]) { var_fw0, var_fwn, 0 }, \
+ .enum_ids = (pinmux_enum_t [])
struct pinmux_data_reg {
unsigned long reg, reg_width, reg_shadow;