Merge branches 'ib-mfd-iio-input-5.1', 'ib-mfd-input-watchdog-5.1' and 'ib-mfd-platform-5.1' into ibs-for-mfd-merged
这个提交包含在:
@@ -1358,17 +1358,17 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata,
|
||||
pdata->autosleep = (pdata->autosleep_timeout) ? true : false;
|
||||
|
||||
for_each_child_of_node(np, child) {
|
||||
if (!strcmp(child->name, "stmpe_gpio")) {
|
||||
if (of_node_name_eq(child, "stmpe_gpio")) {
|
||||
pdata->blocks |= STMPE_BLOCK_GPIO;
|
||||
} else if (!strcmp(child->name, "stmpe_keypad")) {
|
||||
} else if (of_node_name_eq(child, "stmpe_keypad")) {
|
||||
pdata->blocks |= STMPE_BLOCK_KEYPAD;
|
||||
} else if (!strcmp(child->name, "stmpe_touchscreen")) {
|
||||
} else if (of_node_name_eq(child, "stmpe_touchscreen")) {
|
||||
pdata->blocks |= STMPE_BLOCK_TOUCHSCREEN;
|
||||
} else if (!strcmp(child->name, "stmpe_adc")) {
|
||||
} else if (of_node_name_eq(child, "stmpe_adc")) {
|
||||
pdata->blocks |= STMPE_BLOCK_ADC;
|
||||
} else if (!strcmp(child->name, "stmpe_pwm")) {
|
||||
} else if (of_node_name_eq(child, "stmpe_pwm")) {
|
||||
pdata->blocks |= STMPE_BLOCK_PWM;
|
||||
} else if (!strcmp(child->name, "stmpe_rotator")) {
|
||||
} else if (of_node_name_eq(child, "stmpe_rotator")) {
|
||||
pdata->blocks |= STMPE_BLOCK_ROTATOR;
|
||||
}
|
||||
}
|
||||
|
在新工单中引用
屏蔽一个用户