* [PATCH] ARM: pxa: Fix resource properties
@ 2019-12-03 10:41 Linus Walleij
2019-12-03 10:48 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Linus Walleij @ 2019-12-03 10:41 UTC (permalink / raw)
To: arm, soc; +Cc: Linus Walleij, Andy Shevchenko, linux-arm-kernel
The conversion to properties changed one assignment and
missed three other assignments in the same file, fix it
up so the platform compiles.
The bug was reported by a few build bots but noone noticed.
I noticed it when making other changes to the PXA platforms.
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Fixes: 50ec88120ea1 ("can: mcp251x: get rid of legacy platform data")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ARM SoC folks: please apply this directly for fixes.
---
arch/arm/mach-pxa/icontrol.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
index 0474a4b1394d..151e26ec0696 100644
--- a/arch/arm/mach-pxa/icontrol.c
+++ b/arch/arm/mach-pxa/icontrol.c
@@ -89,7 +89,7 @@ static struct spi_board_info mcp251x_board_info[] = {
.max_speed_hz = 6500000,
.bus_num = 3,
.chip_select = 1,
- .platform_data = &mcp251x_info,
+ .properties = mcp251x_properties,
.controller_data = &mcp251x_chip_info2,
.irq = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ2)
},
@@ -98,7 +98,7 @@ static struct spi_board_info mcp251x_board_info[] = {
.max_speed_hz = 6500000,
.bus_num = 4,
.chip_select = 0,
- .platform_data = &mcp251x_info,
+ .properties = mcp251x_properties,
.controller_data = &mcp251x_chip_info3,
.irq = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ3)
},
@@ -107,7 +107,7 @@ static struct spi_board_info mcp251x_board_info[] = {
.max_speed_hz = 6500000,
.bus_num = 4,
.chip_select = 1,
- .platform_data = &mcp251x_info,
+ .properties = mcp251x_properties,
.controller_data = &mcp251x_chip_info4,
.irq = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ4)
}
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: pxa: Fix resource properties
2019-12-03 10:41 [PATCH] ARM: pxa: Fix resource properties Linus Walleij
@ 2019-12-03 10:48 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2019-12-03 10:48 UTC (permalink / raw)
To: Linus Walleij; +Cc: soc, arm, linux-arm-kernel
On Tue, Dec 03, 2019 at 11:41:17AM +0100, Linus Walleij wrote:
> The conversion to properties changed one assignment and
> missed three other assignments in the same file, fix it
> up so the platform compiles.
>
> The bug was reported by a few build bots but noone noticed.
> I noticed it when making other changes to the PXA platforms.
Ah, indeed, I compiled it on x86.
Thanks!
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Fixes: 50ec88120ea1 ("can: mcp251x: get rid of legacy platform data")
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ARM SoC folks: please apply this directly for fixes.
> ---
> arch/arm/mach-pxa/icontrol.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
> index 0474a4b1394d..151e26ec0696 100644
> --- a/arch/arm/mach-pxa/icontrol.c
> +++ b/arch/arm/mach-pxa/icontrol.c
> @@ -89,7 +89,7 @@ static struct spi_board_info mcp251x_board_info[] = {
> .max_speed_hz = 6500000,
> .bus_num = 3,
> .chip_select = 1,
> - .platform_data = &mcp251x_info,
> + .properties = mcp251x_properties,
> .controller_data = &mcp251x_chip_info2,
> .irq = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ2)
> },
> @@ -98,7 +98,7 @@ static struct spi_board_info mcp251x_board_info[] = {
> .max_speed_hz = 6500000,
> .bus_num = 4,
> .chip_select = 0,
> - .platform_data = &mcp251x_info,
> + .properties = mcp251x_properties,
> .controller_data = &mcp251x_chip_info3,
> .irq = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ3)
> },
> @@ -107,7 +107,7 @@ static struct spi_board_info mcp251x_board_info[] = {
> .max_speed_hz = 6500000,
> .bus_num = 4,
> .chip_select = 1,
> - .platform_data = &mcp251x_info,
> + .properties = mcp251x_properties,
> .controller_data = &mcp251x_chip_info4,
> .irq = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ4)
> }
> --
> 2.23.0
>
--
With Best Regards,
Andy Shevchenko
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-03 10:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-03 10:41 [PATCH] ARM: pxa: Fix resource properties Linus Walleij
2019-12-03 10:48 ` Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).