Skip to content

Audioinjector Octo : add extra sample rates, fix rst and use bcm270x … #1930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2017
Merged

Audioinjector Octo : add extra sample rates, fix rst and use bcm270x … #1930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 5 additions & 25 deletions arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,6 @@
};

fragment@1 {
target = <&soc>;
__overlay__ {
reg_digital: reg_digital@0 {
compatible = "regulator-fixed";
regulator-name = "cs42448_dig_supply";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_analogue: reg_analogue@0 {
compatible = "regulator-fixed";
regulator-name = "cs42448_ana_supply";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
};
};

fragment@2 {
target = <&i2c1>;
__overlay__ {
#address-cells = <1>;
Expand All @@ -45,10 +25,10 @@
reg = <0x48>;
clocks = <&cs42448_mclk>;
clock-names = "mclk";
VA-supply = <&reg_analogue>;
VD-supply = <&reg_digital>;
VLS-supply = <&reg_digital>;
VLC-supply = <&reg_digital>;
VA-supply = <&vdd_5v0_reg>;
VD-supply = <&vdd_3v3_reg>;
VLS-supply = <&vdd_3v3_reg>;
VLC-supply = <&vdd_3v3_reg>;
status = "okay";
};

Expand All @@ -60,7 +40,7 @@
};
};

fragment@3 {
fragment@2 {
target = <&sound>;
__overlay__ {
compatible = "ai,audioinjector-octo-soundcard";
Expand Down
50 changes: 47 additions & 3 deletions sound/soc/bcm/audioinjector-octo-soundcard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static struct gpio_desc *codec_rst_gpio;
static unsigned int audioinjector_octo_rate;

static const unsigned int audioinjector_octo_rates[] = {
96000, 48000, 88200, 44100,
96000, 48000, 32000, 24000, 16000, 8000, 88200, 44100, 29400, 22050, 14700,
};

static struct snd_pcm_hw_constraint_list audioinjector_octo_constraints = {
Expand Down Expand Up @@ -98,11 +98,33 @@ static int audioinjector_octo_hw_params(struct snd_pcm_substream *substream,
return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 49152000,
0);
break;
case 24000:
return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 49152000/2,
0);
break;
case 32000:
case 16000:
return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 49152000/3,
0);
break;
case 8000:
return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 49152000/6,
0);
break;
case 88200:
case 44100:
return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 45185400,
0);
break;
case 22050:
return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 45185400/2,
0);
break;
case 29400:
case 14700:
return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 45185400/3,
0);
break;
default:
return -EINVAL;
}
Expand Down Expand Up @@ -132,6 +154,25 @@ static int audioinjector_octo_trigger(struct snd_pcm_substream *substream,
case 44100:
mult[2] = 1;
break;
case 32000:
mult[3] = 1;
case 29400:
mult[0] = 1;
mult[1] = 1;
break;
case 24000:
mult[3] = 1;
case 22050:
mult[1] = 1;
break;
case 16000:
mult[3] = 1;
case 14700:
mult[0] = 1;
break;
case 8000:
mult[3] = 1;
break;
default:
return -EINVAL;
}
Expand Down Expand Up @@ -233,12 +274,15 @@ static int audioinjector_octo_probe(struct platform_device *pdev)
if (IS_ERR(codec_rst_gpio))
return PTR_ERR(codec_rst_gpio);

if (codec_rst_gpio)
gpiod_set_value(codec_rst_gpio, 1);
msleep(500);
if (codec_rst_gpio)
gpiod_set_value(codec_rst_gpio, 0);
msleep(5);
msleep(500);
if (codec_rst_gpio)
gpiod_set_value(codec_rst_gpio, 1);
msleep(50);
msleep(500);

if (i2s_node && codec_node) {
dai->cpu_dai_name = NULL;
Expand Down