Loading sound/soc/codecs/rt5645.c +46 −1 Original line number Diff line number Diff line Loading @@ -19,6 +19,7 @@ #include <linux/spi/spi.h> #include <linux/gpio.h> #include <linux/acpi.h> #include <linux/dmi.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> Loading Loading @@ -2666,6 +2667,34 @@ static struct acpi_device_id rt5645_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, rt5645_acpi_match); #endif static struct rt5645_platform_data *rt5645_pdata; static struct rt5645_platform_data strago_platform_data = { .dmic_en = true, .dmic1_data_pin = -1, .dmic2_data_pin = RT5645_DMIC_DATA_IN2P, .en_jd_func = true, .jd_mode = 3, }; static int strago_quirk_cb(const struct dmi_system_id *id) { rt5645_pdata = &strago_platform_data; return 1; } static struct dmi_system_id dmi_platform_intel_braswell[] __initdata = { { .ident = "Intel Strago", .callback = strago_quirk_cb, .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "Strago"), }, }, { } }; static int rt5645_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { Loading @@ -2673,6 +2702,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, struct rt5645_priv *rt5645; int ret; unsigned int val; struct gpio_desc *gpiod; rt5645 = devm_kzalloc(&i2c->dev, sizeof(struct rt5645_priv), GFP_KERNEL); Loading @@ -2682,8 +2712,23 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, rt5645->i2c = i2c; i2c_set_clientdata(i2c, rt5645); if (pdata) if (pdata) { rt5645->pdata = *pdata; } else { if (dmi_check_system(dmi_platform_intel_braswell)) { rt5645->pdata = *rt5645_pdata; gpiod = devm_gpiod_get_index(&i2c->dev, "rt5645", 0); if (IS_ERR(gpiod) || gpiod_direction_input(gpiod)) { rt5645->pdata.hp_det_gpio = -1; dev_err(&i2c->dev, "failed to initialize gpiod\n"); } else { rt5645->pdata.hp_det_gpio = desc_to_gpio(gpiod); rt5645->pdata.gpio_hp_det_active_high = !gpiod_is_active_low(gpiod); } } } rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap); if (IS_ERR(rt5645->regmap)) { Loading Loading
sound/soc/codecs/rt5645.c +46 −1 Original line number Diff line number Diff line Loading @@ -19,6 +19,7 @@ #include <linux/spi/spi.h> #include <linux/gpio.h> #include <linux/acpi.h> #include <linux/dmi.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> Loading Loading @@ -2666,6 +2667,34 @@ static struct acpi_device_id rt5645_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, rt5645_acpi_match); #endif static struct rt5645_platform_data *rt5645_pdata; static struct rt5645_platform_data strago_platform_data = { .dmic_en = true, .dmic1_data_pin = -1, .dmic2_data_pin = RT5645_DMIC_DATA_IN2P, .en_jd_func = true, .jd_mode = 3, }; static int strago_quirk_cb(const struct dmi_system_id *id) { rt5645_pdata = &strago_platform_data; return 1; } static struct dmi_system_id dmi_platform_intel_braswell[] __initdata = { { .ident = "Intel Strago", .callback = strago_quirk_cb, .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "Strago"), }, }, { } }; static int rt5645_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { Loading @@ -2673,6 +2702,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, struct rt5645_priv *rt5645; int ret; unsigned int val; struct gpio_desc *gpiod; rt5645 = devm_kzalloc(&i2c->dev, sizeof(struct rt5645_priv), GFP_KERNEL); Loading @@ -2682,8 +2712,23 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, rt5645->i2c = i2c; i2c_set_clientdata(i2c, rt5645); if (pdata) if (pdata) { rt5645->pdata = *pdata; } else { if (dmi_check_system(dmi_platform_intel_braswell)) { rt5645->pdata = *rt5645_pdata; gpiod = devm_gpiod_get_index(&i2c->dev, "rt5645", 0); if (IS_ERR(gpiod) || gpiod_direction_input(gpiod)) { rt5645->pdata.hp_det_gpio = -1; dev_err(&i2c->dev, "failed to initialize gpiod\n"); } else { rt5645->pdata.hp_det_gpio = desc_to_gpio(gpiod); rt5645->pdata.gpio_hp_det_active_high = !gpiod_is_active_low(gpiod); } } } rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap); if (IS_ERR(rt5645->regmap)) { Loading