Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa13e760 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pinctrl: msm: fix gpio direction configuration"

parents 031cd5fe 8eaad8df

drivers/pinctrl/pinctrl-msm-tlmm-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int msm_tlmm_v3_gp_cfg(uint pin_no, unsigned long *config, 
			data = pinconf_to_config_argument(*config);

			inout_val = dir_to_inout_val(data);

			writel_relaxed(inout_val, inout_reg);

			data = (mask << shft);

			data = mask;

		} else {

			inout_val = readl_relaxed(inout_reg);

			data = inout_val_to_dir(inout_val);

drivers/pinctrl/pinctrl-msm-tlmm-v4.c

+1 −0
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ static int msm_tlmm_v4_gp_cfg(uint pin_no, unsigned long *config, 
			data = pinconf_to_config_argument(*config);

			inout_val = dir_to_inout_val(data);

			writel_relaxed(inout_val, inout_reg);

			data = mask;

		} else {

			inout_val = readl_relaxed(inout_reg);

			data = inout_val_to_dir(inout_val);