|
89 | 89 |
|
90 | 90 | #define PIN_CFG_PIN_MAP_MASK GENMASK_ULL(62, 55)
|
91 | 91 | #define PIN_CFG_PIN_REG_MASK GENMASK_ULL(54, 47)
|
92 |
| -#define PIN_CFG_MASK GENMASK_ULL(46, 0) |
| 92 | +#define PIN_CFG_MASK GENMASK_ULL(31, 0) |
93 | 93 |
|
94 | 94 | /*
|
95 | 95 | * m indicates the bitmap of supported pins, a is the register index
|
@@ -1187,7 +1187,7 @@ static int rzg2l_pinctrl_pinconf_get(struct pinctrl_dev *pctldev,
|
1187 | 1187 | u64 *pin_data = pin->drv_data;
|
1188 | 1188 | unsigned int arg = 0;
|
1189 | 1189 | u32 off;
|
1190 |
| - u64 cfg; |
| 1190 | + u32 cfg; |
1191 | 1191 | int ret;
|
1192 | 1192 | u8 bit;
|
1193 | 1193 |
|
@@ -1322,7 +1322,7 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
|
1322 | 1322 | u64 *pin_data = pin->drv_data;
|
1323 | 1323 | unsigned int i, arg, index;
|
1324 | 1324 | u32 off, param;
|
1325 |
| - u64 cfg; |
| 1325 | + u32 cfg; |
1326 | 1326 | int ret;
|
1327 | 1327 | u8 bit;
|
1328 | 1328 |
|
@@ -2755,9 +2755,9 @@ static void rzg2l_pinctrl_pm_setup_regs(struct rzg2l_pinctrl *pctrl, bool suspen
|
2755 | 2755 |
|
2756 | 2756 | for (u32 port = 0; port < nports; port++) {
|
2757 | 2757 | bool has_iolh, has_ien;
|
2758 |
| - u64 cfg, caps; |
| 2758 | + u32 off, caps; |
2759 | 2759 | u8 pincnt;
|
2760 |
| - u32 off; |
| 2760 | + u64 cfg; |
2761 | 2761 |
|
2762 | 2762 | cfg = pctrl->data->port_pin_configs[port];
|
2763 | 2763 | off = RZG2L_PIN_CFG_TO_PORT_OFFSET(cfg);
|
@@ -2801,7 +2801,7 @@ static void rzg2l_pinctrl_pm_setup_regs(struct rzg2l_pinctrl *pctrl, bool suspen
|
2801 | 2801 | static void rzg2l_pinctrl_pm_setup_dedicated_regs(struct rzg2l_pinctrl *pctrl, bool suspend)
|
2802 | 2802 | {
|
2803 | 2803 | struct rzg2l_pinctrl_reg_cache *cache = pctrl->dedicated_cache;
|
2804 |
| - u64 caps; |
| 2804 | + u32 caps; |
2805 | 2805 | u32 i;
|
2806 | 2806 |
|
2807 | 2807 | /*
|
|
0 commit comments