Merge "pinctrl: qcom: handle input-enable pinconf property" (0a9223b6) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/pinctrl/qcom/pinctrl-msm.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,7 @@ static int msm_config_reg(struct msm_pinctrl *pctrl,
		*mask = 7;
		break;
		case PIN_CONFIG_OUTPUT:
		case PIN_CONFIG_INPUT_ENABLE:
		*bit = g->oe_bit;
		*mask = 1;
		break;
		@@ -279,6 +280,12 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev,
		val = readl(pctrl->regs + g->io_reg);
		arg = !!(val & BIT(g->in_bit));
		break;
		case PIN_CONFIG_INPUT_ENABLE:
		/* Pin is output */
		if (arg)
		return -EINVAL;
		arg = 1;
		break;
		default:
		dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
		param);
		@@ -351,6 +358,10 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
		/* enable output */
		arg = 1;
		break;
		case PIN_CONFIG_INPUT_ENABLE:
		/* disable output */
		arg = 0;
		break;
		default:
		dev_err(pctrl->dev, "Unsupported config parameter: %x\n",
		param);