| Message ID | 1441610581-11434-1-git-send-email-jarkko.nikula@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Jarkko Nikula <jarkko.nikula@linux.intel.com> writes: > Commit 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types") caused > build error here because it removed the type LPSS_SSP and I didn't notice > the type was used here too. > > I believe commit a6e56c28a178 ("ARM: pxa: ssp: add DT bindings") added it > accidentally by copying all enum pxa_ssp_type types from > include/linux/pxa2xx_ssp.h even LPSS_SSP was for Intel LPSS SPI devices. > > Fix the build error by removing this incorrect binding. > > Fixes: 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types") > Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> > Reported-by: Axel Lin <axel.lin@ingics.com> > Cc: <stable@vger.kernel.org> # 4.2 > --- > v2: Added Fixes tag suggested by Robert Jarzmik Queued into pxa/fixes, thanks. Cheers. -- Robert
Hi On 09/12/2015 04:43 PM, Robert Jarzmik wrote: > Jarkko Nikula <jarkko.nikula@linux.intel.com> writes: > >> Commit 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types") caused >> build error here because it removed the type LPSS_SSP and I didn't notice >> the type was used here too. >> >> I believe commit a6e56c28a178 ("ARM: pxa: ssp: add DT bindings") added it >> accidentally by copying all enum pxa_ssp_type types from >> include/linux/pxa2xx_ssp.h even LPSS_SSP was for Intel LPSS SPI devices. >> >> Fix the build error by removing this incorrect binding. >> >> Fixes: 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types") >> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> >> Reported-by: Axel Lin <axel.lin@ingics.com> >> Cc: <stable@vger.kernel.org> # 4.2 >> --- >> v2: Added Fixes tag suggested by Robert Jarzmik > > Queued into pxa/fixes, thanks. > Gentle reminder, is this going to 4.3-rc3?
Jarkko Nikula <jarkko.nikula@linux.intel.com> writes: > Hi > > On 09/12/2015 04:43 PM, Robert Jarzmik wrote: >> Jarkko Nikula <jarkko.nikula@linux.intel.com> writes: >> >>> Commit 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types") caused >>> build error here because it removed the type LPSS_SSP and I didn't notice >>> the type was used here too. >> Queued into pxa/fixes, thanks. >> > Gentle reminder, is this going to 4.3-rc3? It is going into v4.3. Now knowing if it is v4.3-rc3 is another story, as currently the pxa platform is broken because of a dmaengine regression. And if the necessary fix is not applied through dmaengine tree (by lack of time from Vinod), I'll want to carry it through my tree, which is the reason why I have not made the pull request yet. Cheers.
On Mon, Sep 21, 2015 at 11:03:18AM +0200, Robert Jarzmik wrote: > Jarkko Nikula <jarkko.nikula@linux.intel.com> writes: > > > Hi > > > > On 09/12/2015 04:43 PM, Robert Jarzmik wrote: > >> Jarkko Nikula <jarkko.nikula@linux.intel.com> writes: > >> > >>> Commit 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types") caused > >>> build error here because it removed the type LPSS_SSP and I didn't notice > >>> the type was used here too. > >> Queued into pxa/fixes, thanks. > >> > > Gentle reminder, is this going to 4.3-rc3? > It is going into v4.3. > > Now knowing if it is v4.3-rc3 is another story, as currently the pxa platform is > broken because of a dmaengine regression. And if the necessary fix is not > applied through dmaengine tree (by lack of time from Vinod), I'll want to carry > it through my tree, which is the reason why I have not made the pull request > yet. Which ones are required for fixing, I will priortize those...
Vinod Koul <vinod.koul@intel.com> writes: >> Now knowing if it is v4.3-rc3 is another story, as currently the pxa platform is >> broken because of a dmaengine regression. And if the necessary fix is not >> applied through dmaengine tree (by lack of time from Vinod), I'll want to carry >> it through my tree, which is the reason why I have not made the pull request >> yet. > > Which ones are required for fixing, I will priortize those... Hi Vinod, My favorite (which fixes it fully) is : - https://lkml.org/lkml/2015/9/6/112 (ie. only 1/3) As a fallback plan, if the above patch is too risky for a -rc serie, my fallback plan is : - https://lkml.org/lkml/2015/9/21/128 PXA can sustain only the fallback for v4.3, but the favorite has to be in v4.4, with its 2 other brothers, in a form or another. Fallback plan is compatible with the favorite, ie. fallback should not be reverted after favorite is applied. Cheers.
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c index ad9529cc4203..daa1a65f2eb7 100644 --- a/arch/arm/plat-pxa/ssp.c +++ b/arch/arm/plat-pxa/ssp.c @@ -107,7 +107,6 @@ static const struct of_device_id pxa_ssp_of_ids[] = { { .compatible = "mvrl,pxa168-ssp", .data = (void *) PXA168_SSP }, { .compatible = "mrvl,pxa910-ssp", .data = (void *) PXA910_SSP }, { .compatible = "mrvl,ce4100-ssp", .data = (void *) CE4100_SSP }, - { .compatible = "mrvl,lpss-ssp", .data = (void *) LPSS_SSP }, { }, }; MODULE_DEVICE_TABLE(of, pxa_ssp_of_ids);
Commit 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types") caused build error here because it removed the type LPSS_SSP and I didn't notice the type was used here too. I believe commit a6e56c28a178 ("ARM: pxa: ssp: add DT bindings") added it accidentally by copying all enum pxa_ssp_type types from include/linux/pxa2xx_ssp.h even LPSS_SSP was for Intel LPSS SPI devices. Fix the build error by removing this incorrect binding. Fixes: 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types") Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Reported-by: Axel Lin <axel.lin@ingics.com> Cc: <stable@vger.kernel.org> # 4.2 --- v2: Added Fixes tag suggested by Robert Jarzmik --- arch/arm/plat-pxa/ssp.c | 1 - 1 file changed, 1 deletion(-)