| Message ID | 1378736961-21005-1-git-send-email-koen@dominion.thruhere.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Koen Kooi <koen@dominion.thruhere.net> writes: > The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, > so create a common dtsi both can use. > > IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver > after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead > of 1.8. > > MMC support for AM335x still isn't in, so only the LDO change has been added. > > Cc: stable@vger.kernel.org > > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > Tested-by: Tom Rini <trini@ti.com> > Tested-by: Matt Porter <matt.porter@linaro.org> I guess the subject should've included v5? Also, if this is to be stable material, it will likely need rework since I don't think it will apply cleanly to older trees due to DT churn. Anyways, for this patch... Acked-by: Kevin Hilman <khilman@linaro.org> Even though I've probably already fried my HDMI transciever due to using the original DTS a lot more than a dozen times. (and to TI: yes, I'd accept a new BB black as a sympathy gift.) ;) Also, I tested this on both BBW and BBW: Tested-by: Kevin Hilman <khilman@linaro.org> Benoit, assuming this looks good to you, can you queue this for v3.12-rc please? It applies to Linus' HEAD today (which has most of arm-soc merged), so it should apply cleanly on top of all your stuff. Kevin
Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: > Koen Kooi <koen@dominion.thruhere.net> writes: > >> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >> so create a common dtsi both can use. >> >> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >> of 1.8. >> >> MMC support for AM335x still isn't in, so only the LDO change has been added. >> >> Cc: stable@vger.kernel.org >> >> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >> Tested-by: Tom Rini <trini@ti.com> >> Tested-by: Matt Porter <matt.porter@linaro.org> > > I guess the subject should've included v5? Yes, I blame it on being monday :) > Also, if this is to be > stable material, it will likely need rework since I don't think it will > apply cleanly to older trees due to DT churn. Ah right, the preprocessor changes. We'll see what happens with the stable trees. Most older kernels are useless on am335x, but the just released 3.11 is dangerous enough to get this backported. > Anyways, for this patch... > > Acked-by: Kevin Hilman <khilman@linaro.org> > > Even though I've probably already fried my HDMI transciever due to using > the original DTS a lot more than a dozen times. (and to TI: yes, I'd > accept a new BB black as a sympathy gift.) ;) > Also, I tested this on both BBW and BBW: > > Tested-by: Kevin Hilman <khilman@linaro.org> Thanks! regards, Koen > > Benoit, assuming this looks good to you, can you queue this for v3.12-rc > please? It applies to Linus' HEAD today (which has most of arm-soc > merged), so it should apply cleanly on top of all your stuff. > > Kevin
On 09/09/2013 10:51 AM, Koen Kooi wrote: > > Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: > >> Koen Kooi <koen@dominion.thruhere.net> writes: >> >>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >>> so create a common dtsi both can use. >>> >>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >>> of 1.8. >>> >>> MMC support for AM335x still isn't in, so only the LDO change has been added. >>> >>> Cc: stable@vger.kernel.org >>> >>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>> Tested-by: Tom Rini <trini@ti.com> >>> Tested-by: Matt Porter <matt.porter@linaro.org> >> >> I guess the subject should've included v5? > > Yes, I blame it on being monday :) The series you're posting will require rebasing on the current MMC DT series that is being discussed last couple of weeks on the mailing list which were waiting until now as DMA support was missing. Now that DMA support is pulled in, it is safe to apply those patches so I will be reposting them shortly. Please hold off any changes until those patches are posted. This will avoid unnecessary conflicts. Thanks, -Joel
Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: > On 09/09/2013 10:51 AM, Koen Kooi wrote: >> >> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: >> >>> Koen Kooi <koen@dominion.thruhere.net> writes: >>> >>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >>>> so create a common dtsi both can use. >>>> >>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >>>> of 1.8. >>>> >>>> MMC support for AM335x still isn't in, so only the LDO change has been added. >>>> >>>> Cc: stable@vger.kernel.org >>>> >>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>> Tested-by: Tom Rini <trini@ti.com> >>>> Tested-by: Matt Porter <matt.porter@linaro.org> >>> >>> I guess the subject should've included v5? >> >> Yes, I blame it on being monday :) > > The series you're posting will require rebasing on the current MMC DT series > that is being discussed last couple of weeks on the mailing list which were > waiting until now as DMA support was missing. Now that DMA support is pulled in, > it is safe to apply those patches so I will be reposting them shortly. > > Please hold off any changes until those patches are posted. This will avoid > unnecessary conflicts. Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine.
On 09/09/2013 01:43 PM, Koen Kooi wrote: > > Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: > >> On 09/09/2013 10:51 AM, Koen Kooi wrote: >>> >>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: >>> >>>> Koen Kooi <koen@dominion.thruhere.net> writes: >>>> >>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >>>>> so create a common dtsi both can use. >>>>> >>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >>>>> of 1.8. >>>>> >>>>> MMC support for AM335x still isn't in, so only the LDO change has been added. >>>>> >>>>> Cc: stable@vger.kernel.org >>>>> >>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>> Tested-by: Tom Rini <trini@ti.com> >>>>> Tested-by: Matt Porter <matt.porter@linaro.org> >>>> >>>> I guess the subject should've included v5? >>> >>> Yes, I blame it on being monday :) >> >> The series you're posting will require rebasing on the current MMC DT series >> that is being discussed last couple of weeks on the mailing list which were >> waiting until now as DMA support was missing. Now that DMA support is pulled in, >> it is safe to apply those patches so I will be reposting them shortly. >> >> Please hold off any changes until those patches are posted. This will avoid >> unnecessary conflicts. > > Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine. > That's fair enough, since Kevin Acked and Benoit is pulling it, I'm fine with rebasing on top of it and we avoid any merge conflicts. Regards, -Joel
On 09/09/2013 01:51 PM, Joel Fernandes wrote: > On 09/09/2013 01:43 PM, Koen Kooi wrote: >> >> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: >> >>> On 09/09/2013 10:51 AM, Koen Kooi wrote: >>>> >>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: >>>> >>>>> Koen Kooi <koen@dominion.thruhere.net> writes: >>>>> >>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >>>>>> so create a common dtsi both can use. >>>>>> >>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >>>>>> of 1.8. >>>>>> >>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added. >>>>>> >>>>>> Cc: stable@vger.kernel.org >>>>>> >>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>>> Tested-by: Tom Rini <trini@ti.com> >>>>>> Tested-by: Matt Porter <matt.porter@linaro.org> >>>>> >>>>> I guess the subject should've included v5? >>>> >>>> Yes, I blame it on being monday :) >>> >>> The series you're posting will require rebasing on the current MMC DT series >>> that is being discussed last couple of weeks on the mailing list which were >>> waiting until now as DMA support was missing. Now that DMA support is pulled in, >>> it is safe to apply those patches so I will be reposting them shortly. >>> >>> Please hold off any changes until those patches are posted. This will avoid >>> unnecessary conflicts. >> >> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine. >> > > That's fair enough, since Kevin Acked and Benoit is pulling it, I'm fine with > rebasing on top of it and we avoid any merge conflicts. > I noticed - there were still some comments from Felipe on the v4 series of this patch regarding RF cape and HDMI may be breaking it. How are you addressing that? Regards, -Joel
Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: > On 09/09/2013 01:51 PM, Joel Fernandes wrote: >> On 09/09/2013 01:43 PM, Koen Kooi wrote: >>> >>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: >>> >>>> On 09/09/2013 10:51 AM, Koen Kooi wrote: >>>>> >>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: >>>>> >>>>>> Koen Kooi <koen@dominion.thruhere.net> writes: >>>>>> >>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >>>>>>> so create a common dtsi both can use. >>>>>>> >>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >>>>>>> of 1.8. >>>>>>> >>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added. >>>>>>> >>>>>>> Cc: stable@vger.kernel.org >>>>>>> >>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>>>> Tested-by: Tom Rini <trini@ti.com> >>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org> >>>>>> >>>>>> I guess the subject should've included v5? >>>>> >>>>> Yes, I blame it on being monday :) >>>> >>>> The series you're posting will require rebasing on the current MMC DT series >>>> that is being discussed last couple of weeks on the mailing list which were >>>> waiting until now as DMA support was missing. Now that DMA support is pulled in, >>>> it is safe to apply those patches so I will be reposting them shortly. >>>> >>>> Please hold off any changes until those patches are posted. This will avoid >>>> unnecessary conflicts. >>> >>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine. >>> >> >> That's fair enough, since Kevin Acked and Benoit is pulling it, I'm fine with >> rebasing on top of it and we avoid any merge conflicts. >> > > I noticed - there were still some comments from Felipe on the v4 series of this > patch regarding RF cape and HDMI may be breaking it. How are you addressing that? Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP. Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line.
On 09/09/2013 03:00 PM, Koen Kooi wrote: > > Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: > >> On 09/09/2013 01:51 PM, Joel Fernandes wrote: >>> On 09/09/2013 01:43 PM, Koen Kooi wrote: >>>> >>>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: >>>> >>>>> On 09/09/2013 10:51 AM, Koen Kooi wrote: >>>>>> >>>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: >>>>>> >>>>>>> Koen Kooi <koen@dominion.thruhere.net> writes: >>>>>>> >>>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >>>>>>>> so create a common dtsi both can use. >>>>>>>> >>>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >>>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >>>>>>>> of 1.8. >>>>>>>> >>>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added. >>>>>>>> >>>>>>>> Cc: stable@vger.kernel.org >>>>>>>> >>>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>>>>> Tested-by: Tom Rini <trini@ti.com> >>>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org> >>>>>>> >>>>>>> I guess the subject should've included v5? >>>>>> >>>>>> Yes, I blame it on being monday :) >>>>> >>>>> The series you're posting will require rebasing on the current MMC DT series >>>>> that is being discussed last couple of weeks on the mailing list which were >>>>> waiting until now as DMA support was missing. Now that DMA support is pulled in, >>>>> it is safe to apply those patches so I will be reposting them shortly. >>>>> >>>>> Please hold off any changes until those patches are posted. This will avoid >>>>> unnecessary conflicts. >>>> >>>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine. >>>> >>> >>> That's fair enough, since Kevin Acked and Benoit is pulling it, I'm fine with >>> rebasing on top of it and we avoid any merge conflicts. >>> >> >> I noticed - there were still some comments from Felipe on the v4 series of this >> patch regarding RF cape and HDMI may be breaking it. How are you addressing that? > > Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP. > > Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line. > We don't merge things in hurry and focus is to do things the right way.. I just want to make sure that all possible comments have been addressed. Otherwise patch looks OK and hope everyone else thinks so too. I am dealing with some merge conflicts right now with my series on top of this though, but they should be easy enough to fix up. That's delaying my testing, but otherwise as such I don't have any objection to this patch (provided the conclusion is that all comments have been addressed..). Thanks! Regards, -Joel
On 09/09/2013 03:12 PM, Joel Fernandes wrote: > On 09/09/2013 03:00 PM, Koen Kooi wrote: >> >> Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: >> >>> On 09/09/2013 01:51 PM, Joel Fernandes wrote: >>>> On 09/09/2013 01:43 PM, Koen Kooi wrote: >>>>> >>>>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: >>>>> >>>>>> On 09/09/2013 10:51 AM, Koen Kooi wrote: >>>>>>> >>>>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: >>>>>>> >>>>>>>> Koen Kooi <koen@dominion.thruhere.net> writes: >>>>>>>> >>>>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >>>>>>>>> so create a common dtsi both can use. >>>>>>>>> >>>>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >>>>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >>>>>>>>> of 1.8. >>>>>>>>> >>>>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added. >>>>>>>>> >>>>>>>>> Cc: stable@vger.kernel.org >>>>>>>>> >>>>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>>>>>> Tested-by: Tom Rini <trini@ti.com> >>>>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org> >>>>>>>> >>>>>>>> I guess the subject should've included v5? >>>>>>> >>>>>>> Yes, I blame it on being monday :) >>>>>> >>>>>> The series you're posting will require rebasing on the current MMC DT series >>>>>> that is being discussed last couple of weeks on the mailing list which were >>>>>> waiting until now as DMA support was missing. Now that DMA support is pulled in, >>>>>> it is safe to apply those patches so I will be reposting them shortly. >>>>>> >>>>>> Please hold off any changes until those patches are posted. This will avoid >>>>>> unnecessary conflicts. >>>>> >>>>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine. >>>>> >>>> >>>> That's fair enough, since Kevin Acked and Benoit is pulling it, I'm fine with >>>> rebasing on top of it and we avoid any merge conflicts. >>>> >>> >>> I noticed - there were still some comments from Felipe on the v4 series of this >>> patch regarding RF cape and HDMI may be breaking it. How are you addressing that? >> >> Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP. >> >> Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line. >> > > We don't merge things in hurry and focus is to do things the right way.. I just > want to make sure that all possible comments have been addressed. > > Otherwise patch looks OK and hope everyone else thinks so too. I am dealing with > some merge conflicts right now with my series on top of this though, but they > should be easy enough to fix up. That's delaying my testing, but otherwise as > such I don't have any objection to this patch (provided the conclusion is that > all comments have been addressed..). Thanks! Koen, One note though, since I don't use HDMI (or BBB much for that matter), I was ok with taking a risk of upping the ldo3 regulator voltage to 3.3v on my board which I needed to do to get to the boot prompt. I applied my AM335x DMA and MMC patches and tried to boot with rootfs as MMC1. With 1.8v, I get the following during boot: [ 2.236043] mmc0: host doesn't support card's voltages [ 2.241659] mmc0: error -22 whilst initialising SD card That's strange because I do have an SDHC card. With 3.3v it works fine. I will add a note about this to my series. Since this more of an MMC issue than anything, and your patch series doesn't enable MMC, you can add my tested-by: Tested-by: Joel Fernandes <joelf@ti.com> Later on, the regulator voltage may need to be tweaked for MMC support. Regards, -Joel
Op 10 sep. 2013, om 01:42 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: > On 09/09/2013 03:12 PM, Joel Fernandes wrote: >> On 09/09/2013 03:00 PM, Koen Kooi wrote: >>> >>> Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: >>> >>>> On 09/09/2013 01:51 PM, Joel Fernandes wrote: >>>>> On 09/09/2013 01:43 PM, Koen Kooi wrote: >>>>>> >>>>>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: >>>>>> >>>>>>> On 09/09/2013 10:51 AM, Koen Kooi wrote: >>>>>>>> >>>>>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: >>>>>>>> >>>>>>>>> Koen Kooi <koen@dominion.thruhere.net> writes: >>>>>>>>> >>>>>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >>>>>>>>>> so create a common dtsi both can use. >>>>>>>>>> >>>>>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >>>>>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >>>>>>>>>> of 1.8. >>>>>>>>>> >>>>>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added. >>>>>>>>>> >>>>>>>>>> Cc: stable@vger.kernel.org >>>>>>>>>> >>>>>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>>>>>>> Tested-by: Tom Rini <trini@ti.com> >>>>>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org> >>>>>>>>> >>>>>>>>> I guess the subject should've included v5? >>>>>>>> >>>>>>>> Yes, I blame it on being monday :) >>>>>>> >>>>>>> The series you're posting will require rebasing on the current MMC DT series >>>>>>> that is being discussed last couple of weeks on the mailing list which were >>>>>>> waiting until now as DMA support was missing. Now that DMA support is pulled in, >>>>>>> it is safe to apply those patches so I will be reposting them shortly. >>>>>>> >>>>>>> Please hold off any changes until those patches are posted. This will avoid >>>>>>> unnecessary conflicts. >>>>>> >>>>>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine. >>>>>> >>>>> >>>>> That's fair enough, since Kevin Acked and Benoit is pulling it, I'm fine with >>>>> rebasing on top of it and we avoid any merge conflicts. >>>>> >>>> >>>> I noticed - there were still some comments from Felipe on the v4 series of this >>>> patch regarding RF cape and HDMI may be breaking it. How are you addressing that? >>> >>> Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP. >>> >>> Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line. >>> >> >> We don't merge things in hurry and focus is to do things the right way.. I just >> want to make sure that all possible comments have been addressed. >> >> Otherwise patch looks OK and hope everyone else thinks so too. I am dealing with >> some merge conflicts right now with my series on top of this though, but they >> should be easy enough to fix up. That's delaying my testing, but otherwise as >> such I don't have any objection to this patch (provided the conclusion is that >> all comments have been addressed..). Thanks! > > Koen, > > One note though, since I don't use HDMI (or BBB much for that matter), I was ok > with taking a risk of upping the ldo3 regulator voltage to 3.3v on my board > which I needed to do to get to the boot prompt. > I applied my AM335x DMA and MMC patches and tried to boot with rootfs as MMC1. > > With 1.8v, I get the following during boot: > [ 2.236043] mmc0: host doesn't support card's voltages > [ 2.241659] mmc0: error -22 whilst initialising SD card > > That's strange because I do have an SDHC card. With 3.3v it works fine. > > I will add a note about this to my series. Since this more of an MMC issue than > anything, and your patch series doesn't enable MMC, you can add my tested-by: > > Tested-by: Joel Fernandes <joelf@ti.com> > > Later on, the regulator voltage may need to be tweaked for MMC support. See https://lkml.org/lkml/2013/9/6/95 and https://lkml.org/lkml/2013/9/6/183
On Sep 10, 2013, at 12:45 AM, "Koen Kooi" <koen@dominion.thruhere.net> wrote: > > Op 10 sep. 2013, om 01:42 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: > >> On 09/09/2013 03:12 PM, Joel Fernandes wrote: >>> On 09/09/2013 03:00 PM, Koen Kooi wrote: >>>> >>>> Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: >>>> >>>>> On 09/09/2013 01:51 PM, Joel Fernandes wrote: >>>>>> On 09/09/2013 01:43 PM, Koen Kooi wrote: >>>>>>> >>>>>>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven: >>>>>>> >>>>>>>> On 09/09/2013 10:51 AM, Koen Kooi wrote: >>>>>>>>> >>>>>>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven: >>>>>>>>> >>>>>>>>>> Koen Kooi <koen@dominion.thruhere.net> writes: >>>>>>>>>> >>>>>>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added, >>>>>>>>>>> so create a common dtsi both can use. >>>>>>>>>>> >>>>>>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver >>>>>>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead >>>>>>>>>>> of 1.8. >>>>>>>>>>> >>>>>>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added. >>>>>>>>>>> >>>>>>>>>>> Cc: stable@vger.kernel.org >>>>>>>>>>> >>>>>>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>>>>>>>> Tested-by: Tom Rini <trini@ti.com> >>>>>>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org> >>>>>>>>>> >>>>>>>>>> I guess the subject should've included v5? >>>>>>>>> >>>>>>>>> Yes, I blame it on being monday :) >>>>>>>> >>>>>>>> The series you're posting will require rebasing on the current MMC DT series >>>>>>>> that is being discussed last couple of weeks on the mailing list which were >>>>>>>> waiting until now as DMA support was missing. Now that DMA support is pulled in, >>>>>>>> it is safe to apply those patches so I will be reposting them shortly. >>>>>>>> >>>>>>>> Please hold off any changes until those patches are posted. This will avoid >>>>>>>> unnecessary conflicts. >>>>>>> >>>>>>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine. >>>>>> >>>>>> That's fair enough, since Kevin Acked and Benoit is pulling it, I'm fine with >>>>>> rebasing on top of it and we avoid any merge conflicts. >>>>> >>>>> I noticed - there were still some comments from Felipe on the v4 series of this >>>>> patch regarding RF cape and HDMI may be breaking it. How are you addressing that? >>>> >>>> Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP. >>>> >>>> Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line. >>> >>> We don't merge things in hurry and focus is to do things the right way.. I just >>> want to make sure that all possible comments have been addressed. >>> >>> Otherwise patch looks OK and hope everyone else thinks so too. I am dealing with >>> some merge conflicts right now with my series on top of this though, but they >>> should be easy enough to fix up. That's delaying my testing, but otherwise as >>> such I don't have any objection to this patch (provided the conclusion is that >>> all comments have been addressed..). Thanks! >> >> Koen, >> >> One note though, since I don't use HDMI (or BBB much for that matter), I was ok >> with taking a risk of upping the ldo3 regulator voltage to 3.3v on my board >> which I needed to do to get to the boot prompt. >> I applied my AM335x DMA and MMC patches and tried to boot with rootfs as MMC1. >> >> With 1.8v, I get the following during boot: >> [ 2.236043] mmc0: host doesn't support card's voltages >> [ 2.241659] mmc0: error -22 whilst initialising SD card >> >> That's strange because I do have an SDHC card. With 3.3v it works fine. >> >> I will add a note about this to my series. Since this more of an MMC issue than >> anything, and your patch series doesn't enable MMC, you can add my tested-by: >> >> Tested-by: Joel Fernandes <joelf@ti.com> >> >> Later on, the regulator voltage may need to be tweaked for MMC support. > > See https://lkml.org/lkml/2013/9/6/95 and https://lkml.org/lkml/2013/9/6/183 Ok since you said in above thread you'll rebase the card detect and the regulator fixes , I'll let you do that and drop my drop my hacked mmc1 patch for BBB from my series. Regards, -Joel
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 000cf76..d515c54 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -183,6 +183,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ am335x-evm.dtb \ am335x-evmsk.dtb \ am335x-bone.dtb \ + am335x-boneblack.dtb \ am3517-evm.dtb \ am3517_mt_ventoux.dtb \ am43x-epos-evm.dtb diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi new file mode 100644 index 0000000..2f66ded --- /dev/null +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -0,0 +1,262 @@ +/* + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/ { + model = "TI AM335x BeagleBone"; + compatible = "ti,am335x-bone", "ti,am33xx"; + + cpus { + cpu@0 { + cpu0-supply = <&dcdc2_reg>; + }; + }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x10000000>; /* 256 MB */ + }; + + am33xx_pinmux: pinmux@44e10800 { + pinctrl-names = "default"; + pinctrl-0 = <&clkout2_pin>; + + user_leds_s0: user_leds_s0 { + pinctrl-single,pins = < + 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */ + 0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a6.gpio1_22 */ + 0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a7.gpio1_23 */ + 0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a8.gpio1_24 */ + >; + }; + + i2c0_pins: pinmux_i2c0_pins { + pinctrl-single,pins = < + 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */ + 0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */ + >; + }; + + uart0_pins: pinmux_uart0_pins { + pinctrl-single,pins = < + 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */ + 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */ + >; + }; + + clkout2_pin: pinmux_clkout2_pin { + pinctrl-single,pins = < + 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */ + >; + }; + + cpsw_default: cpsw_default { + pinctrl-single,pins = < + /* Slave 1 */ + 0x110 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxerr.mii1_rxerr */ + 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txen.mii1_txen */ + 0x118 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxdv.mii1_rxdv */ + 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd3.mii1_txd3 */ + 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd2.mii1_txd2 */ + 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd1.mii1_txd1 */ + 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd0.mii1_txd0 */ + 0x12c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_txclk.mii1_txclk */ + 0x130 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxclk.mii1_rxclk */ + 0x134 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd3.mii1_rxd3 */ + 0x138 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd2.mii1_rxd2 */ + 0x13c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd1.mii1_rxd1 */ + 0x140 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd0.mii1_rxd0 */ + >; + }; + + cpsw_sleep: cpsw_sleep { + pinctrl-single,pins = < + /* Slave 1 reset value */ + 0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + davinci_mdio_default: davinci_mdio_default { + pinctrl-single,pins = < + /* MDIO */ + 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ + 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ + >; + }; + + davinci_mdio_sleep: davinci_mdio_sleep { + pinctrl-single,pins = < + /* MDIO reset value */ + 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + }; + + ocp { + uart0: serial@44e09000 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + + status = "okay"; + }; + + musb: usb@47400000 { + status = "okay"; + + control@44e10000 { + status = "okay"; + }; + + usb-phy@47401300 { + status = "okay"; + }; + + usb-phy@47401b00 { + status = "okay"; + }; + + usb@47401000 { + status = "okay"; + }; + + usb@47401800 { + status = "okay"; + dr_mode = "host"; + }; + + dma-controller@07402000 { + status = "okay"; + }; + }; + + i2c0: i2c@44e0b000 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + + status = "okay"; + clock-frequency = <400000>; + + tps: tps@24 { + reg = <0x24>; + }; + + }; + }; + + leds { + pinctrl-names = "default"; + pinctrl-0 = <&user_leds_s0>; + + compatible = "gpio-leds"; + + led@2 { + label = "beaglebone:green:heartbeat"; + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + + led@3 { + label = "beaglebone:green:mmc0"; + gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "mmc0"; + default-state = "off"; + }; + + led@4 { + label = "beaglebone:green:usr2"; + gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + + led@5 { + label = "beaglebone:green:usr3"; + gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + }; +}; + +/include/ "tps65217.dtsi" + +&tps { + regulators { + dcdc1_reg: regulator@0 { + regulator-always-on; + }; + + dcdc2_reg: regulator@1 { + /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ + regulator-name = "vdd_mpu"; + regulator-min-microvolt = <925000>; + regulator-max-microvolt = <1325000>; + regulator-boot-on; + regulator-always-on; + }; + + dcdc3_reg: regulator@2 { + /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ + regulator-name = "vdd_core"; + regulator-min-microvolt = <925000>; + regulator-max-microvolt = <1150000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo1_reg: regulator@3 { + regulator-always-on; + }; + + ldo2_reg: regulator@4 { + regulator-always-on; + }; + + ldo3_reg: regulator@5 { + regulator-always-on; + }; + + ldo4_reg: regulator@6 { + regulator-always-on; + }; + }; +}; + +&cpsw_emac0 { + phy_id = <&davinci_mdio>, <0>; + phy-mode = "mii"; +}; + +&cpsw_emac1 { + phy_id = <&davinci_mdio>, <1>; + phy-mode = "mii"; +}; + +&mac { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cpsw_default>; + pinctrl-1 = <&cpsw_sleep>; + +}; + +&davinci_mdio { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&davinci_mdio_default>; + pinctrl-1 = <&davinci_mdio_sleep>; +}; diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index d318987..7993c48 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -8,258 +8,4 @@ /dts-v1/; #include "am33xx.dtsi" - -/ { - model = "TI AM335x BeagleBone"; - compatible = "ti,am335x-bone", "ti,am33xx"; - - cpus { - cpu@0 { - cpu0-supply = <&dcdc2_reg>; - }; - }; - - memory { - device_type = "memory"; - reg = <0x80000000 0x10000000>; /* 256 MB */ - }; - - am33xx_pinmux: pinmux@44e10800 { - pinctrl-names = "default"; - pinctrl-0 = <&clkout2_pin>; - - user_leds_s0: user_leds_s0 { - pinctrl-single,pins = < - 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */ - 0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a6.gpio1_22 */ - 0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a7.gpio1_23 */ - 0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a8.gpio1_24 */ - >; - }; - - i2c0_pins: pinmux_i2c0_pins { - pinctrl-single,pins = < - 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */ - 0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */ - >; - }; - - uart0_pins: pinmux_uart0_pins { - pinctrl-single,pins = < - 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */ - 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */ - >; - }; - - clkout2_pin: pinmux_clkout2_pin { - pinctrl-single,pins = < - 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */ - >; - }; - - cpsw_default: cpsw_default { - pinctrl-single,pins = < - /* Slave 1 */ - 0x110 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxerr.mii1_rxerr */ - 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txen.mii1_txen */ - 0x118 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxdv.mii1_rxdv */ - 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd3.mii1_txd3 */ - 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd2.mii1_txd2 */ - 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd1.mii1_txd1 */ - 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd0.mii1_txd0 */ - 0x12c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_txclk.mii1_txclk */ - 0x130 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxclk.mii1_rxclk */ - 0x134 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd3.mii1_rxd3 */ - 0x138 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd2.mii1_rxd2 */ - 0x13c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd1.mii1_rxd1 */ - 0x140 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd0.mii1_rxd0 */ - >; - }; - - cpsw_sleep: cpsw_sleep { - pinctrl-single,pins = < - /* Slave 1 reset value */ - 0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7) - >; - }; - - davinci_mdio_default: davinci_mdio_default { - pinctrl-single,pins = < - /* MDIO */ - 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ - 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ - >; - }; - - davinci_mdio_sleep: davinci_mdio_sleep { - pinctrl-single,pins = < - /* MDIO reset value */ - 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7) - 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) - >; - }; - }; - - ocp { - uart0: serial@44e09000 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins>; - - status = "okay"; - }; - - musb: usb@47400000 { - status = "okay"; - - control@44e10000 { - status = "okay"; - }; - - usb-phy@47401300 { - status = "okay"; - }; - - usb-phy@47401b00 { - status = "okay"; - }; - - usb@47401000 { - status = "okay"; - }; - - usb@47401800 { - status = "okay"; - dr_mode = "host"; - }; - - dma-controller@07402000 { - status = "okay"; - }; - }; - - i2c0: i2c@44e0b000 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; - - status = "okay"; - clock-frequency = <400000>; - - tps: tps@24 { - reg = <0x24>; - }; - - }; - }; - - leds { - pinctrl-names = "default"; - pinctrl-0 = <&user_leds_s0>; - - compatible = "gpio-leds"; - - led@2 { - label = "beaglebone:green:heartbeat"; - gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - default-state = "off"; - }; - - led@3 { - label = "beaglebone:green:mmc0"; - gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "mmc0"; - default-state = "off"; - }; - - led@4 { - label = "beaglebone:green:usr2"; - gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; - default-state = "off"; - }; - - led@5 { - label = "beaglebone:green:usr3"; - gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>; - default-state = "off"; - }; - }; -}; - -/include/ "tps65217.dtsi" - -&tps { - regulators { - dcdc1_reg: regulator@0 { - regulator-always-on; - }; - - dcdc2_reg: regulator@1 { - /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ - regulator-name = "vdd_mpu"; - regulator-min-microvolt = <925000>; - regulator-max-microvolt = <1325000>; - regulator-boot-on; - regulator-always-on; - }; - - dcdc3_reg: regulator@2 { - /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ - regulator-name = "vdd_core"; - regulator-min-microvolt = <925000>; - regulator-max-microvolt = <1150000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo1_reg: regulator@3 { - regulator-always-on; - }; - - ldo2_reg: regulator@4 { - regulator-always-on; - }; - - ldo3_reg: regulator@5 { - regulator-always-on; - }; - - ldo4_reg: regulator@6 { - regulator-always-on; - }; - }; -}; - -&cpsw_emac0 { - phy_id = <&davinci_mdio>, <0>; - phy-mode = "mii"; -}; - -&cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; - phy-mode = "mii"; -}; - -&mac { - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&cpsw_default>; - pinctrl-1 = <&cpsw_sleep>; - -}; - -&davinci_mdio { - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&davinci_mdio_default>; - pinctrl-1 = <&davinci_mdio_sleep>; -}; +#include "am335x-bone-common.dtsi" diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts new file mode 100644 index 0000000..197cadf --- /dev/null +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +/dts-v1/; + +#include "am33xx.dtsi" +#include "am335x-bone-common.dtsi" + +&ldo3_reg { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; +};