Skip to contentSkip to conversation

ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding

PATCH Superseded Jarkko Nikula 3 participants 6 messages Sep 7, 2015 – Sep 21, 2015

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding

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")

---
v2: Added Fixes tag suggested by Robert Jarzmik

---
 arch/arm/plat-pxa/ssp.c | 1 -
 1 file changed, 1 deletion(-)
arch/arm/plat-pxa/ssp.c +0 -1
index ad9529cc4203..daa1a65f2eb7 100644
@@ -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);
Signature · 1 line
2.5.1
#1 lore raw

PATCH v2 1/1 ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding

Quoted 8 lines · Jarkko Nikula

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.

Quoted 8 lines

Fix the build error by removing this incorrect binding.

Fixes 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types")

---
v2: Added Fixes tag suggested by Robert Jarzmik

Queued into pxa/fixes, thanks.

Cheers.

--
Robert

#2 lore raw

PATCH v2 1/1 ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding

Hi

Quoted 12 lines · Robert Jarzmik
Quoted 10 lines · Jarkko Nikula

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.

Quoted 9 lines
Quoted 6 lines
Fixes 03fbf488cece ("spi: pxa2xx: Differentiate Intel LPSS types")

---
v2: Added Fixes tag suggested by Robert Jarzmik

Queued into pxa/fixes, thanks.

Gentle reminder, is this going to 4.3-rc3?

Signature · 1 line
Jarkko
#3 lore raw

PATCH v2 1/1 ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding

Quoted 11 lines · Jarkko Nikula

Hi

Quoted 7 lines · Robert Jarzmik
Quoted 3 lines · Jarkko Nikula

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.

Signature · 1 line
Robert
#4 lore raw

PATCH v2 1/1 ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding

Quoted 12 lines · Robert Jarzmik
Quoted 10 lines · Jarkko Nikula

Hi

Quoted 7 lines · Robert Jarzmik
Quoted 3 lines · Jarkko Nikula

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.

Quoted 8 lines
Quoted 1 line

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...

Signature · 1 line
~Vinod
#5 lore raw

PATCH v2 1/1 ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding

Quoted 7 lines · Vinod Koul
Quoted 5 lines

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.

Signature · 1 line
Robert