Skip to content

Commit

Permalink
configs: Add SND_SOC_MAX98357A=m
Browse files Browse the repository at this point in the history 
Enable the MAX98357A driver.

See: https://www.raspberrypi.org/forums/viewtopic.php?f=107&t=275919

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  • Loading branch information
@pelwell
pelwell committed Jun 2, 2020
1 parent 75f4140 commit 3d1e520
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions arch/arm/configs/bcm2709_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,7 @@ CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_CS4265=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_MA120X0P=m
CONFIG_SND_SOC_MAX98357A=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SIMPLE_CARD=m
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/bcm2711_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,6 @@ CONFIG_GPIO_WATCHDOG=m
CONFIG_BCM2835_WDT=y
CONFIG_MFD_STMPE=y
CONFIG_STMPE_SPI=y
CONFIG_MFD_SYSCON=y
CONFIG_MFD_ARIZONA_I2C=m
CONFIG_MFD_ARIZONA_SPI=m
CONFIG_MFD_WM5102=y
Expand Down Expand Up @@ -1016,6 +1015,7 @@ CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_CS4265=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_MA120X0P=m
CONFIG_SND_SOC_MAX98357A=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SIMPLE_CARD=m
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/bcmrpi_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,7 @@ CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_CS4265=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_MA120X0P=m
CONFIG_SND_SOC_MAX98357A=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SIMPLE_CARD=m
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/bcm2711_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,7 @@ CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_CS4265=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_MA120X0P=m
CONFIG_SND_SOC_MAX98357A=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SIMPLE_CARD=m
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/bcmrpi3_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,7 @@ CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_CS4265=m
CONFIG_SND_SOC_ICS43432=m
CONFIG_SND_SOC_MA120X0P=m
CONFIG_SND_SOC_MAX98357A=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_HIDRAW=y
Expand Down

5 comments on commit 3d1e520

@6by9
Copy link
Contributor

@6by9 6by9 commented on 3d1e520 Jun 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pelwell I know you use scripts to make these changes, but did you mean to lose CONFIG_MFD_SYSCON from bcm2711_defconfig?
It was added in c836672, but presumably didn't work if the scripts disabled it again.

@pelwell
Copy link
Contributor Author

@pelwell pelwell commented on 3d1e520 Jun 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not about "didn't work" - it is not necessary because of other settings. If you make bcm2711_defconfig you'll find that CONFIG_MFD_SYSCON is enabled via other settings, therefore it doesn't appear in the defconfig.

@pelwell
Copy link
Contributor Author

@pelwell pelwell commented on 3d1e520 Jun 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the "config" changes are regularly squashed, so taking care to split such changes into independent parts is pointless.

@6by9
Copy link
Contributor

@6by9 6by9 commented on 3d1e520 Jun 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, I just noted the extra change and queried it.

At some point we need to stop rebasing this branch and call it "stable", then they ought to be independent changes.

@pelwell
Copy link
Contributor Author

@pelwell pelwell commented on 3d1e520 Jun 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That change coincides with rpi-5.4.y being made the default branch here, which usually happens when the kernel package is switched over.

Please sign in to comment.