|
@@ -46,6 +46,8 @@ static int __crisv32_pinmux_alloc(int port, int first_pin, int last_pin,
|
|
pins[port][i] = mode;
|
|
pins[port][i] = mode;
|
|
|
|
|
|
crisv32_pinmux_set(port);
|
|
crisv32_pinmux_set(port);
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static int crisv32_pinmux_init(void)
|
|
static int crisv32_pinmux_init(void)
|
|
@@ -93,6 +95,7 @@ int crisv32_pinmux_alloc_fixed(enum fixed_function function)
|
|
int ret = -EINVAL;
|
|
int ret = -EINVAL;
|
|
char saved[sizeof pins];
|
|
char saved[sizeof pins];
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
|
|
+ reg_pinmux_rw_hwprot hwprot;
|
|
|
|
|
|
spin_lock_irqsave(&pinmux_lock, flags);
|
|
spin_lock_irqsave(&pinmux_lock, flags);
|
|
|
|
|
|
@@ -101,7 +104,7 @@ int crisv32_pinmux_alloc_fixed(enum fixed_function function)
|
|
|
|
|
|
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
|
|
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
|
|
|
|
|
|
- reg_pinmux_rw_hwprot hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot);
|
|
|
|
|
|
+ hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot);
|
|
|
|
|
|
switch (function) {
|
|
switch (function) {
|
|
case pinmux_ser1:
|
|
case pinmux_ser1:
|
|
@@ -227,6 +230,7 @@ int crisv32_pinmux_dealloc_fixed(enum fixed_function function)
|
|
int ret = -EINVAL;
|
|
int ret = -EINVAL;
|
|
char saved[sizeof pins];
|
|
char saved[sizeof pins];
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
|
|
+ reg_pinmux_rw_hwprot hwprot;
|
|
|
|
|
|
spin_lock_irqsave(&pinmux_lock, flags);
|
|
spin_lock_irqsave(&pinmux_lock, flags);
|
|
|
|
|
|
@@ -235,7 +239,7 @@ int crisv32_pinmux_dealloc_fixed(enum fixed_function function)
|
|
|
|
|
|
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
|
|
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
|
|
|
|
|
|
- reg_pinmux_rw_hwprot hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot);
|
|
|
|
|
|
+ hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot);
|
|
|
|
|
|
switch (function) {
|
|
switch (function) {
|
|
case pinmux_ser1:
|
|
case pinmux_ser1:
|