Merge tag 'pinctrl-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[karo-tx-linux.git] / drivers / pinctrl / sh-pfc / sh_pfc.h

diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index e2142956a8e5fff5bd1363f3e6837e00b1064bff..ab8fd258d9ed041dec94f38c140b2f567b00bf54 100644 (file)
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -76,12 +76,13 @@ struct pinmux_cfg_reg {
 
 #define PINMUX_CFG_REG(name, r, r_width, f_width) \
        .reg = r, .reg_width = r_width, .field_width = f_width,         \
-       .enum_ids = (u16 [(r_width / f_width) * (1 << f_width)])
+       .enum_ids = (const u16 [(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, \
-       .var_field_width = (unsigned long [r_width]) { var_fw0, var_fwn, 0 }, \
-       .enum_ids = (u16 [])
+       .var_field_width = (const unsigned long [r_width]) \
+               { var_fw0, var_fwn, 0 }, \
+       .enum_ids = (const u16 [])
 
 struct pinmux_data_reg {
        unsigned long reg, reg_width;
@@ -90,15 +91,15 @@ struct pinmux_data_reg {
 
 #define PINMUX_DATA_REG(name, r, r_width) \
        .reg = r, .reg_width = r_width, \
-       .enum_ids = (u16 [r_width]) \
+       .enum_ids = (const u16 [r_width]) \
 
 struct pinmux_irq {
        int irq;
-       unsigned short *gpios;
+       const short *gpios;
 };
 
 #define PINMUX_IRQ(irq_nr, ids...)                        \
-       { .irq = irq_nr, .gpios = (unsigned short []) { ids, 0 } }      \
+       { .irq = irq_nr, .gpios = (const short []) { ids, -1 } }
 
 struct pinmux_range {
        u16 begin;
@@ -304,8 +305,7 @@ struct sh_pfc_soc_info {
 #define PORTCR(nr, reg)                                                        \
        {                                                               \
                PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) {             \
-                       _PCRH(PORT##nr##_IN, PORT##nr##_IN_PD,          \
-                             PORT##nr##_IN_PU, PORT##nr##_OUT),        \
+                       _PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT),     \
                                PORT##nr##_FN0, PORT##nr##_FN1,         \
                                PORT##nr##_FN2, PORT##nr##_FN3,         \
                                PORT##nr##_FN4, PORT##nr##_FN5,         \