Loading drivers/mfd/palmas.c +3 −3 Original line number Diff line number Diff line Loading @@ -278,20 +278,20 @@ static void palmas_dt_to_pdata(struct i2c_client *i2c, int ret; u32 prop; ret = of_property_read_u32(node, "ti,mux_pad1", &prop); ret = of_property_read_u32(node, "ti,mux-pad1", &prop); if (!ret) { pdata->mux_from_pdata = 1; pdata->pad1 = prop; } ret = of_property_read_u32(node, "ti,mux_pad2", &prop); ret = of_property_read_u32(node, "ti,mux-pad2", &prop); if (!ret) { pdata->mux_from_pdata = 1; pdata->pad2 = prop; } /* The default for this register is all masked */ ret = of_property_read_u32(node, "ti,power_ctrl", &prop); ret = of_property_read_u32(node, "ti,power-ctrl", &prop); if (!ret) pdata->power_ctrl = prop; else Loading Loading
drivers/mfd/palmas.c +3 −3 Original line number Diff line number Diff line Loading @@ -278,20 +278,20 @@ static void palmas_dt_to_pdata(struct i2c_client *i2c, int ret; u32 prop; ret = of_property_read_u32(node, "ti,mux_pad1", &prop); ret = of_property_read_u32(node, "ti,mux-pad1", &prop); if (!ret) { pdata->mux_from_pdata = 1; pdata->pad1 = prop; } ret = of_property_read_u32(node, "ti,mux_pad2", &prop); ret = of_property_read_u32(node, "ti,mux-pad2", &prop); if (!ret) { pdata->mux_from_pdata = 1; pdata->pad2 = prop; } /* The default for this register is all masked */ ret = of_property_read_u32(node, "ti,power_ctrl", &prop); ret = of_property_read_u32(node, "ti,power-ctrl", &prop); if (!ret) pdata->power_ctrl = prop; else Loading