diff mbox

ARM: sunxi_defconfig: enable CONFIG_REGULATOR

Message ID 1413354549-9012-1-git-send-email-olof@lixom.net (mailing list archive)
State New, archived
Headers show

Commit Message

Olof Johansson Oct. 15, 2014, 6:29 a.m. UTC
Commit 97a13e5289ba ('net: phy: mdio-sun4i: don't select REGULATOR') removed
the select of REGULATOR, which means that it now has to be explicitly
enabled in the defconfig or things won't work very well.

In particular, this fixes a problem with SD/MMC not probing on my A31-based
board.

Cc: Beniamino Galvani <b.galvani@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
---

Maxime, I'll apply this on our fixes branch directly.

 arch/arm/configs/sunxi_defconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Maxime Ripard Oct. 16, 2014, 8:04 a.m. UTC | #1
Hi Olof,

On Tue, Oct 14, 2014 at 11:29:09PM -0700, Olof Johansson wrote:
> Commit 97a13e5289ba ('net: phy: mdio-sun4i: don't select REGULATOR') removed
> the select of REGULATOR, which means that it now has to be explicitly
> enabled in the defconfig or things won't work very well.
> 
> In particular, this fixes a problem with SD/MMC not probing on my A31-based
> board.
> 
> Cc: Beniamino Galvani <b.galvani@gmail.com>
> Signed-off-by: Olof Johansson <olof@lixom.net>
> ---
> 
> Maxime, I'll apply this on our fixes branch directly.

I've been chasing the same bug, but didn't make a patch yet. Thanks
for taking the time to do it!

If it's not applied yet, you have my
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Maxime
Beniamino Galvani Oct. 16, 2014, 10:47 a.m. UTC | #2
On Thu, Oct 16, 2014 at 10:04:48AM +0200, Maxime Ripard wrote:
> Hi Olof,
> 
> On Tue, Oct 14, 2014 at 11:29:09PM -0700, Olof Johansson wrote:
> > Commit 97a13e5289ba ('net: phy: mdio-sun4i: don't select REGULATOR') removed
> > the select of REGULATOR, which means that it now has to be explicitly
> > enabled in the defconfig or things won't work very well.
> > 
> > In particular, this fixes a problem with SD/MMC not probing on my A31-based
> > board.
> > 
> > Cc: Beniamino Galvani <b.galvani@gmail.com>
> > Signed-off-by: Olof Johansson <olof@lixom.net>
> > ---
> > 
> > Maxime, I'll apply this on our fixes branch directly.
> 
> I've been chasing the same bug, but didn't make a patch yet. Thanks
> for taking the time to do it!
> 
> If it's not applied yet, you have my
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Sorry for the breakage, I didn't realize that some configurations
could rely on the implicit selection of the symbol.

Beniamino
Maxime Ripard Oct. 16, 2014, 11:46 a.m. UTC | #3
On Thu, Oct 16, 2014 at 12:47:17PM +0200, Beniamino Galvani wrote:
> On Thu, Oct 16, 2014 at 10:04:48AM +0200, Maxime Ripard wrote:
> > Hi Olof,
> > 
> > On Tue, Oct 14, 2014 at 11:29:09PM -0700, Olof Johansson wrote:
> > > Commit 97a13e5289ba ('net: phy: mdio-sun4i: don't select REGULATOR') removed
> > > the select of REGULATOR, which means that it now has to be explicitly
> > > enabled in the defconfig or things won't work very well.
> > > 
> > > In particular, this fixes a problem with SD/MMC not probing on my A31-based
> > > board.
> > > 
> > > Cc: Beniamino Galvani <b.galvani@gmail.com>
> > > Signed-off-by: Olof Johansson <olof@lixom.net>
> > > ---
> > > 
> > > Maxime, I'll apply this on our fixes branch directly.
> > 
> > I've been chasing the same bug, but didn't make a patch yet. Thanks
> > for taking the time to do it!
> > 
> > If it's not applied yet, you have my
> > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> 
> Sorry for the breakage, I didn't realize that some configurations
> could rely on the implicit selection of the symbol.

Don't worry, it's fine, it's why we have a bugfix period and boots
testing for :)
Olof Johansson Oct. 19, 2014, 9:24 p.m. UTC | #4
On Thu, Oct 16, 2014 at 4:46 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Thu, Oct 16, 2014 at 12:47:17PM +0200, Beniamino Galvani wrote:
>> On Thu, Oct 16, 2014 at 10:04:48AM +0200, Maxime Ripard wrote:
>> > Hi Olof,
>> >
>> > On Tue, Oct 14, 2014 at 11:29:09PM -0700, Olof Johansson wrote:
>> > > Commit 97a13e5289ba ('net: phy: mdio-sun4i: don't select REGULATOR') removed
>> > > the select of REGULATOR, which means that it now has to be explicitly
>> > > enabled in the defconfig or things won't work very well.
>> > >
>> > > In particular, this fixes a problem with SD/MMC not probing on my A31-based
>> > > board.
>> > >
>> > > Cc: Beniamino Galvani <b.galvani@gmail.com>
>> > > Signed-off-by: Olof Johansson <olof@lixom.net>
>> > > ---
>> > >
>> > > Maxime, I'll apply this on our fixes branch directly.
>> >
>> > I've been chasing the same bug, but didn't make a patch yet. Thanks
>> > for taking the time to do it!
>> >
>> > If it's not applied yet, you have my
>> > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>>
>> Sorry for the breakage, I didn't realize that some configurations
>> could rely on the implicit selection of the symbol.
>
> Don't worry, it's fine, it's why we have a bugfix period and boots
> testing for :)

Yep, no worries.

However, it doesn't seem to have been enough and I don't know how I
made the test pass the first time when I checked the fix.  Looks like
it needs REGULATOR_FIXED_VOLTAGE too, and I didn't catch it before I
sent out the pull request. D'oh.

I'll fix it for -rc2.


-Olof
diff mbox

Patch

diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index c1a4ca4f6e6d..847045313101 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -75,6 +75,7 @@  CONFIG_POWER_RESET_SUN6I=y
 CONFIG_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
 CONFIG_MFD_AXP20X=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y