hikaru - diff dvbsky.c - Kernel 4.17 4.18
von hikaru- SNIPPET_TEXT:
-
- $ diff 4.17.17_dvbsky.c 4.18.20_dvbsky.c
- 293,305d292
- < static const struct m88ds3103_config dvbsky_s960_m88ds3103_config = {
- < .i2c_addr = 0x68,
- < .clock = 27000000,
- < .i2c_wr_max = 33,
- < .clock_out = 0,
- < .ts_mode = M88DS3103_TS_CI,
- < .ts_clk = 16000,
- < .ts_clk_pol = 0,
- < .agc = 0x99,
- < .lnb_hv_pol = 1,
- < .lnb_en_pol = 1,
- < };
- <
- 310,314c297,298
- < int ret = 0;
- < /* demod I2C adapter */
- < struct i2c_adapter *i2c_adapter = NULL;
- < struct i2c_client *client;
- < struct i2c_board_info info;
- ---
- > struct i2c_adapter *i2c_adapter;
- > struct m88ds3103_platform_data m88ds3103_pdata = {};
- 316d299
- 319,327c302,319
- < adap->fe[0] = dvb_attach(m88ds3103_attach,
- < &dvbsky_s960_m88ds3103_config,
- < &d->i2c_adap,
- < &i2c_adapter);
- < if (!adap->fe[0]) {
- < dev_err(&d->udev->dev, "dvbsky_s960_attach fail.\n");
- < ret = -ENODEV;
- < goto fail_attach;
- < }
- ---
- > m88ds3103_pdata.clk = 27000000;
- > m88ds3103_pdata.i2c_wr_max = 33;
- > m88ds3103_pdata.clk_out = 0;
- > m88ds3103_pdata.ts_mode = M88DS3103_TS_CI;
- > m88ds3103_pdata.ts_clk = 16000;
- > m88ds3103_pdata.ts_clk_pol = 0;
- > m88ds3103_pdata.agc = 0x99;
- > m88ds3103_pdata.lnb_hv_pol = 1,
- > m88ds3103_pdata.lnb_en_pol = 1,
- >
- > state->i2c_client_demod = dvb_module_probe("m88ds3103", NULL,
- > &d->i2c_adap,
- > 0x68, &m88ds3103_pdata);
- > if (!state->i2c_client_demod)
- > return -ENODEV;
- >
- > adap->fe[0] = m88ds3103_pdata.get_dvb_frontend(state->i2c_client_demod);
- > i2c_adapter = m88ds3103_pdata.get_i2c_adapter(state->i2c_client_demod);
- 332,341d323
- < strlcpy(info.type, "ts2020", I2C_NAME_SIZE);
- < info.addr = 0x60;
- < info.platform_data = &ts2020_config;
- < request_module("ts2020");
- < client = i2c_new_device(i2c_adapter, &info);
- < if (client == NULL || client->dev.driver == NULL) {
- < dvb_frontend_detach(adap->fe[0]);
- < ret = -ENODEV;
- < goto fail_attach;
- < }
- 343,347c325,330
- < if (!try_module_get(client->dev.driver->owner)) {
- < i2c_unregister_device(client);
- < dvb_frontend_detach(adap->fe[0]);
- < ret = -ENODEV;
- < goto fail_attach;
- ---
- > state->i2c_client_tuner = dvb_module_probe("ts2020", NULL,
- > i2c_adapter,
- > 0x60, &ts2020_config);
- > if (!state->i2c_client_tuner) {
- > dvb_module_release(state->i2c_client_demod);
- > return -ENODEV;
- 362,365c345
- < state->i2c_client_tuner = client;
- <
- < fail_attach:
- < return ret;
- ---
- > return 0;
- 415,427d394
- < static const struct m88ds3103_config dvbsky_s960c_m88ds3103_config = {
- < .i2c_addr = 0x68,
- < .clock = 27000000,
- < .i2c_wr_max = 33,
- < .clock_out = 0,
- < .ts_mode = M88DS3103_TS_CI,
- < .ts_clk = 10000,
- < .ts_clk_pol = 1,
- < .agc = 0x99,
- < .lnb_hv_pol = 0,
- < .lnb_en_pol = 1,
- < };
- <
- 432,437c399,400
- < int ret = 0;
- < /* demod I2C adapter */
- < struct i2c_adapter *i2c_adapter = NULL;
- < struct i2c_client *client_tuner, *client_ci;
- < struct i2c_board_info info;
- < struct sp2_config sp2_config;
- ---
- > struct i2c_adapter *i2c_adapter;
- > struct m88ds3103_platform_data m88ds3103_pdata = {};
- 439c402
- ---
- > struct sp2_config sp2_config = {};
- 442,450c405,422
- < adap->fe[0] = dvb_attach(m88ds3103_attach,
- < &dvbsky_s960c_m88ds3103_config,
- < &d->i2c_adap,
- < &i2c_adapter);
- < if (!adap->fe[0]) {
- < dev_err(&d->udev->dev, "dvbsky_s960ci_attach fail.\n");
- < ret = -ENODEV;
- < goto fail_attach;
- < }
- ---
- > m88ds3103_pdata.clk = 27000000,
- > m88ds3103_pdata.i2c_wr_max = 33,
- > m88ds3103_pdata.clk_out = 0,
- > m88ds3103_pdata.ts_mode = M88DS3103_TS_CI,
- > m88ds3103_pdata.ts_clk = 10000,
- > m88ds3103_pdata.ts_clk_pol = 1,
- > m88ds3103_pdata.agc = 0x99,
- > m88ds3103_pdata.lnb_hv_pol = 0,
- > m88ds3103_pdata.lnb_en_pol = 1,
- >
- > state->i2c_client_demod = dvb_module_probe("m88ds3103", NULL,
- > &d->i2c_adap,
- > 0x68, &m88ds3103_pdata);
- > if (!state->i2c_client_demod)
- > return -ENODEV;
- >
- > adap->fe[0] = m88ds3103_pdata.get_dvb_frontend(state->i2c_client_demod);
- > i2c_adapter = m88ds3103_pdata.get_i2c_adapter(state->i2c_client_demod);
- 455,463d426
- < strlcpy(info.type, "ts2020", I2C_NAME_SIZE);
- < info.addr = 0x60;
- < info.platform_data = &ts2020_config;
- < request_module("ts2020");
- < client_tuner = i2c_new_device(i2c_adapter, &info);
- < if (client_tuner == NULL || client_tuner->dev.driver == NULL) {
- < ret = -ENODEV;
- < goto fail_tuner_device;
- < }
- 465,467c428,433
- < if (!try_module_get(client_tuner->dev.driver->owner)) {
- < ret = -ENODEV;
- < goto fail_tuner_module;
- ---
- > state->i2c_client_tuner = dvb_module_probe("ts2020", NULL,
- > i2c_adapter,
- > 0x60, &ts2020_config);
- > if (!state->i2c_client_tuner) {
- > dvb_module_release(state->i2c_client_demod);
- > return -ENODEV;
- 471d436
- 475,484d439
- < strlcpy(info.type, "sp2", I2C_NAME_SIZE);
- < info.addr = 0x40;
- < info.platform_data = &sp2_config;
- < request_module("sp2");
- < client_ci = i2c_new_device(&d->i2c_adap, &info);
- < if (client_ci == NULL || client_ci->dev.driver == NULL) {
- < ret = -ENODEV;
- < goto fail_ci_device;
- < }
- 486,488c441,448
- < if (!try_module_get(client_ci->dev.driver->owner)) {
- < ret = -ENODEV;
- < goto fail_ci_module;
- ---
- > state->i2c_client_ci = dvb_module_probe("sp2", NULL,
- > &d->i2c_adap,
- > 0x40, &sp2_config);
- >
- > if (!state->i2c_client_ci) {
- > dvb_module_release(state->i2c_client_tuner);
- > dvb_module_release(state->i2c_client_demod);
- > return -ENODEV;
- 503,515c463
- < state->i2c_client_tuner = client_tuner;
- < state->i2c_client_ci = client_ci;
- < return ret;
- < fail_ci_module:
- < i2c_unregister_device(client_ci);
- < fail_ci_device:
- < module_put(client_tuner->dev.driver->owner);
- < fail_tuner_module:
- < i2c_unregister_device(client_tuner);
- < fail_tuner_device:
- < dvb_frontend_detach(adap->fe[0]);
- < fail_attach:
- < return ret;
- ---
- > return 0;
- 522d469
- < int ret = 0;
- 524,528c471,473
- < struct i2c_client *client_demod, *client_tuner, *client_ci;
- < struct i2c_board_info info;
- < struct si2168_config si2168_config;
- < struct si2157_config si2157_config;
- < struct sp2_config sp2_config;
- ---
- > struct si2168_config si2168_config = {};
- > struct si2157_config si2157_config = {};
- > struct sp2_config sp2_config = {};
- 531d475
- 535,546c479,484
- < strlcpy(info.type, "si2168", I2C_NAME_SIZE);
- < info.addr = 0x64;
- < info.platform_data = &si2168_config;
- <
- < request_module(info.type);
- < client_demod = i2c_new_device(&d->i2c_adap, &info);
- < if (client_demod == NULL ||
- < client_demod->dev.driver == NULL)
- < goto fail_demod_device;
- < if (!try_module_get(client_demod->dev.driver->owner))
- < goto fail_demod_module;
- ---
- >
- > state->i2c_client_demod = dvb_module_probe("si2168", NULL,
- > &d->i2c_adap,
- > 0x64, &si2168_config);
- > if (!state->i2c_client_demod)
- > return -ENODEV;
- 549d486
- 552,563c489,496
- < strlcpy(info.type, "si2157", I2C_NAME_SIZE);
- < info.addr = 0x60;
- < info.platform_data = &si2157_config;
- <
- < request_module(info.type);
- < client_tuner = i2c_new_device(i2c_adapter, &info);
- < if (client_tuner == NULL ||
- < client_tuner->dev.driver == NULL)
- < goto fail_tuner_device;
- < if (!try_module_get(client_tuner->dev.driver->owner))
- < goto fail_tuner_module;
- ---
- >
- > state->i2c_client_tuner = dvb_module_probe("si2157", NULL,
- > i2c_adapter,
- > 0x60, &si2157_config);
- > if (!state->i2c_client_tuner) {
- > dvb_module_release(state->i2c_client_demod);
- > return -ENODEV;
- > }
- 566d498
- 570,600c502,513
- < strlcpy(info.type, "sp2", I2C_NAME_SIZE);
- < info.addr = 0x40;
- < info.platform_data = &sp2_config;
- <
- < request_module(info.type);
- < client_ci = i2c_new_device(&d->i2c_adap, &info);
- <
- < if (client_ci == NULL || client_ci->dev.driver == NULL)
- < goto fail_ci_device;
- <
- < if (!try_module_get(client_ci->dev.driver->owner))
- < goto fail_ci_module;
- <
- < state->i2c_client_demod = client_demod;
- < state->i2c_client_tuner = client_tuner;
- < state->i2c_client_ci = client_ci;
- < return ret;
- < fail_ci_module:
- < i2c_unregister_device(client_ci);
- < fail_ci_device:
- < module_put(client_tuner->dev.driver->owner);
- < fail_tuner_module:
- < i2c_unregister_device(client_tuner);
- < fail_tuner_device:
- < module_put(client_demod->dev.driver->owner);
- < fail_demod_module:
- < i2c_unregister_device(client_demod);
- < fail_demod_device:
- < ret = -ENODEV;
- < return ret;
- ---
- >
- > state->i2c_client_ci = dvb_module_probe("sp2", NULL,
- > &d->i2c_adap,
- > 0x40, &sp2_config);
- >
- > if (!state->i2c_client_ci) {
- > dvb_module_release(state->i2c_client_tuner);
- > dvb_module_release(state->i2c_client_demod);
- > return -ENODEV;
- > }
- >
- > return 0;
- 607d519
- < int ret = 0;
- 609,612c521,522
- < struct i2c_client *client_demod, *client_tuner;
- < struct i2c_board_info info;
- < struct si2168_config si2168_config;
- < struct si2157_config si2157_config;
- ---
- > struct si2168_config si2168_config = {};
- > struct si2157_config si2157_config = {};
- 615d524
- 620,631c529,534
- < strlcpy(info.type, "si2168", I2C_NAME_SIZE);
- < info.addr = 0x64;
- < info.platform_data = &si2168_config;
- <
- < request_module(info.type);
- < client_demod = i2c_new_device(&d->i2c_adap, &info);
- < if (client_demod == NULL ||
- < client_demod->dev.driver == NULL)
- < goto fail_demod_device;
- < if (!try_module_get(client_demod->dev.driver->owner))
- < goto fail_demod_module;
- ---
- >
- > state->i2c_client_demod = dvb_module_probe("si2168", NULL,
- > &d->i2c_adap,
- > 0x64, &si2168_config);
- > if (!state->i2c_client_demod)
- > return -ENODEV;
- 634d536
- 637,648d538
- < strlcpy(info.type, "si2157", I2C_NAME_SIZE);
- < info.addr = 0x60;
- < info.platform_data = &si2157_config;
- <
- < request_module(info.type);
- < client_tuner = i2c_new_device(i2c_adapter, &info);
- < if (client_tuner == NULL ||
- < client_tuner->dev.driver == NULL)
- < goto fail_tuner_device;
- < if (!try_module_get(client_tuner->dev.driver->owner))
- < goto fail_tuner_module;
- 650,661c540,548
- < state->i2c_client_demod = client_demod;
- < state->i2c_client_tuner = client_tuner;
- < return ret;
- < fail_tuner_module:
- < i2c_unregister_device(client_tuner);
- < fail_tuner_device:
- < module_put(client_demod->dev.driver->owner);
- < fail_demod_module:
- < i2c_unregister_device(client_demod);
- < fail_demod_device:
- < ret = -ENODEV;
- < return ret;
- ---
- > state->i2c_client_tuner = dvb_module_probe("si2157", NULL,
- > i2c_adapter,
- > 0x60, &si2157_config);
- > if (!state->i2c_client_tuner) {
- > dvb_module_release(state->i2c_client_demod);
- > return -ENODEV;
- > }
- >
- > return 0;
- 669,672c556,557
- < struct i2c_client *client_demod, *client_tuner;
- < struct i2c_board_info info;
- < struct si2168_config si2168_config;
- < struct si2157_config si2157_config;
- ---
- > struct si2168_config si2168_config = {};
- > struct si2157_config si2157_config = {};
- 675d559
- 680,690c564,569
- < info.addr = 0x64;
- < info.platform_data = &si2168_config;
- <
- < request_module("si2168");
- < client_demod = i2c_new_device(&d->i2c_adap, &info);
- < if (!client_demod || !client_demod->dev.driver)
- < goto fail_demod_device;
- < if (!try_module_get(client_demod->dev.driver->owner))
- < goto fail_demod_module;
- ---
- >
- > state->i2c_client_demod = dvb_module_probe("si2168", NULL,
- > &d->i2c_adap,
- > 0x64, &si2168_config);
- > if (!state->i2c_client_demod)
- > return -ENODEV;
- 693d571
- 696,706d573
- < info.addr = 0x60;
- < info.platform_data = &si2157_config;
- <
- < request_module("si2157");
- < client_tuner = i2c_new_device(i2c_adapter, &info);
- < if (!client_tuner || !client_tuner->dev.driver)
- < goto fail_tuner_device;
- < if (!try_module_get(client_tuner->dev.driver->owner))
- < goto fail_tuner_module;
- 708,710c575,581
- < state->i2c_client_demod = client_demod;
- < state->i2c_client_tuner = client_tuner;
- < return 0;
- ---
- > state->i2c_client_tuner = dvb_module_probe("si2157", "si2141",
- > i2c_adapter,
- > 0x60, &si2157_config);
- > if (!state->i2c_client_tuner) {
- > dvb_module_release(state->i2c_client_demod);
- > return -ENODEV;
- > }
- 712,719c583
- < fail_tuner_module:
- < i2c_unregister_device(client_tuner);
- < fail_tuner_device:
- < module_put(client_demod->dev.driver->owner);
- < fail_demod_module:
- < i2c_unregister_device(client_demod);
- < fail_demod_device:
- < return -ENODEV;
- ---
- > return 0;
- 757c621
- < struct i2c_client *client;
- ---
- > struct dvb_usb_adapter *adap = &d->adapter[0];
- 759,776c623,627
- < client = state->i2c_client_tuner;
- < /* remove I2C tuner */
- < if (client) {
- < module_put(client->dev.driver->owner);
- < i2c_unregister_device(client);
- < }
- < client = state->i2c_client_demod;
- < /* remove I2C demod */
- < if (client) {
- < module_put(client->dev.driver->owner);
- < i2c_unregister_device(client);
- < }
- < client = state->i2c_client_ci;
- < /* remove I2C ci */
- < if (client) {
- < module_put(client->dev.driver->owner);
- < i2c_unregister_device(client);
- < }
- ---
- > dvb_module_release(state->i2c_client_tuner);
- > dvb_module_release(state->i2c_client_demod);
- > dvb_module_release(state->i2c_client_ci);
- >
- > adap->fe[0] = NULL;
Quellcode
Hier kannst du den Code kopieren und ihn in deinen bevorzugten Editor einfügen. PASTEBIN_DOWNLOAD_SNIPPET_EXPLAIN