Skip to content

Commit 5835196

Browse files
committed
pinctrl: cherryview: Return correct value if pin in push-pull mode
Currently the getter returns ENOTSUPP on pin configured in the push-pull mode. Fix this by adding the missed switch case. Fixes: ccdf81d ("pinctrl: cherryview: add option to set open-drain pin config") Fixes: 6e08d6b ("pinctrl: Add Intel Cherryview/Braswell pin controller support") Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent 0633dc4 commit 5835196

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

drivers/pinctrl/intel/pinctrl-cherryview.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -949,11 +949,6 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned int pin,
949949

950950
break;
951951

952-
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
953-
if (!(ctrl1 & CHV_PADCTRL1_ODEN))
954-
return -EINVAL;
955-
break;
956-
957952
case PIN_CONFIG_BIAS_HIGH_IMPEDANCE: {
958953
u32 cfg;
959954

@@ -963,6 +958,16 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned int pin,
963958
return -EINVAL;
964959

965960
break;
961+
962+
case PIN_CONFIG_DRIVE_PUSH_PULL:
963+
if (ctrl1 & CHV_PADCTRL1_ODEN)
964+
return -EINVAL;
965+
break;
966+
967+
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
968+
if (!(ctrl1 & CHV_PADCTRL1_ODEN))
969+
return -EINVAL;
970+
break;
966971
}
967972

968973
default:

0 commit comments

Comments
 (0)