diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c index 63de214916f5..19be3386240a 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c @@ -656,12 +656,14 @@ static int ov2680_probe(struct i2c_client *client) ret = ov2680_init_controls(sensor); if (ret) { + dev_dbg(&client->dev, "ov2680_init_controls() returned %d\n", ret); ov2680_remove(client); return ret; } ret = media_entity_pads_init(&sensor->sd.entity, 1, &sensor->pad); if (ret) { + dev_dbg(&client->dev, "media_entity_pads_init() returned %d\n", ret); ov2680_remove(client); return ret; } @@ -671,6 +673,7 @@ static int ov2680_probe(struct i2c_client *client) ret = atomisp_register_sensor_no_gmin(&sensor->sd, 1, ATOMISP_INPUT_FORMAT_RAW_10, atomisp_bayer_order_bggr); if (ret) { + dev_dbg(&client->dev, "atomisp_register_sensor_no_gmin() returned %d\n", ret); ov2680_remove(client); return ret; } diff --git a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c index f83de0ffaf16..5dfbdf663745 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c +++ b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c @@ -304,7 +304,28 @@ static struct gmin_cfg_var surface3_vars[] = { {}, }; +/* Cube iWork 8 i1-W - no DSDT or EFI definitions */ +static struct gmin_cfg_var cube_i1w_vars[] = { + /* ACPI DSDT CAM7 */ + {"OVTI2680:00_CsiPort", "0"}, + {"OVTI2680:00_CsiLanes", "1"}, + {"OVTI2680:00_CamClk", "1"}, + + /* ACPI DSDT CAM8 */ + {"OVTI2680:01_CsiPort", "1"}, + {"OVTI2680:01_CsiLanes", "1"}, + {"OVTI2680:01_CamClk", "0"}, + {}, +}; + static const struct dmi_system_id gmin_vars[] = { + { + .ident = "Cube I1W", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "i1-W"), + }, + .driver_data = cube_i1w_vars, + }, { .ident = "BYT-T FFD8", .matches = {