Commit d7667f19 authored by Francesco Dolcini's avatar Francesco Dolcini Committed by Lee Jones
Browse files

mfd: stmpe: Probe sub-function by compatible 



Use sub-function of_compatible during probe, instead of using the node
name. The code should not rely on the node names during probe, in
addition to that the previously hard-coded node names are not compliant
to the latest naming convention (they are not generic and they use
underscores), and it was broken by mistake already once [1].

[1] commit 56086b5e ("ARM: dts: imx6qdl-apalis: Avoid underscore in node name")

Suggested-by: default avatarAhmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: default avatarFrancesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20220712163345.445811-3-francesco.dolcini@toradex.com
parent 8c435297

drivers/mfd/stmpe.c

+5 −6
Original line number Diff line number Diff line
@@ -1362,19 +1362,18 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata, 
	pdata->autosleep = (pdata->autosleep_timeout) ? true : false;



	for_each_available_child_of_node(np, child) {

		if (of_node_name_eq(child, "stmpe_gpio")) {

		if (of_device_is_compatible(child, stmpe_gpio_cell.of_compatible))

			pdata->blocks |= STMPE_BLOCK_GPIO;

		} else if (of_node_name_eq(child, "stmpe_keypad")) {

		else if (of_device_is_compatible(child, stmpe_keypad_cell.of_compatible))

			pdata->blocks |= STMPE_BLOCK_KEYPAD;

		} else if (of_node_name_eq(child, "stmpe_touchscreen")) {

		else if (of_device_is_compatible(child, stmpe_ts_cell.of_compatible))

			pdata->blocks |= STMPE_BLOCK_TOUCHSCREEN;

		} else if (of_node_name_eq(child, "stmpe_adc")) {

		else if (of_device_is_compatible(child, stmpe_adc_cell.of_compatible))

			pdata->blocks |= STMPE_BLOCK_ADC;

		} else if (of_node_name_eq(child, "stmpe_pwm")) {

		else if (of_device_is_compatible(child, stmpe_pwm_cell.of_compatible))

			pdata->blocks |= STMPE_BLOCK_PWM;

	}

}

}



/* Called from client specific probe routines */

int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)