mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'm68knommu-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Browse Source 
Pull m68knommu fixes from Greg Ungerer:

 - spelling in comment

 - compilation when flexcan driver enabled

 - sparse warning

* tag 'm68knommu-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: Fix syntax errors in comments
  m68k: coldfire: make symbol m523x_clk_lookup static
  m68k: coldfire/device.c: protect FLEXCAN blocks
This commit is contained in:
Linus Torvalds
2022-08-09 09:39:25 -07:00
parent 5318b987fe 472e68df4a
commit 15886321a4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/m68k/coldfire/device.c
View File

@@ -581,7 +581,7 @@ static struct platform_device mcf_esdhc = {
}; };
#endif /* MCFSDHC_BASE */ #endif /* MCFSDHC_BASE */
#if IS_ENABLED(CONFIG_CAN_FLEXCAN) #ifdef MCFFLEXCAN_SIZE
#include <linux/can/platform/flexcan.h> #include <linux/can/platform/flexcan.h>
@@ -620,7 +620,7 @@ static struct platform_device mcf_flexcan0 = {
.resource = mcf5441x_flexcan0_resource, .resource = mcf5441x_flexcan0_resource,
.dev.platform_data = &mcf5441x_flexcan_info, .dev.platform_data = &mcf5441x_flexcan_info,
}; };
#endif /* IS_ENABLED(CONFIG_CAN_FLEXCAN) */ #endif /* MCFFLEXCAN_SIZE */
static struct platform_device *mcf_devices[] __initdata = { static struct platform_device *mcf_devices[] __initdata = {
&mcf_uart, &mcf_uart,
@@ -657,7 +657,7 @@ static struct platform_device *mcf_devices[] __initdata = {
#ifdef MCFSDHC_BASE #ifdef MCFSDHC_BASE
&mcf_esdhc, &mcf_esdhc,
#endif #endif
#if IS_ENABLED(CONFIG_CAN_FLEXCAN) #ifdef MCFFLEXCAN_SIZE
&mcf_flexcan0, &mcf_flexcan0,
#endif #endif
}; };

2
arch/m68k/coldfire/intc-2.c
View File

@@ -7,7 +7,7 @@
* family, the 5270, 5271, 5274, 5275, and the 528x family which have two such * family, the 5270, 5271, 5274, 5275, and the 528x family which have two such
* controllers, and the 547x and 548x families which have only one of them. * controllers, and the 547x and 548x families which have only one of them.
* *
* The external 7 fixed interrupts are part the the Edge Port unit of these * The external 7 fixed interrupts are part of the Edge Port unit of these
* ColdFire parts. They can be configured as level or edge triggered. * ColdFire parts. They can be configured as level or edge triggered.
* *
* (C) Copyright 2009-2011, Greg Ungerer <gerg@snapgear.com> * (C) Copyright 2009-2011, Greg Ungerer <gerg@snapgear.com>

2
arch/m68k/coldfire/m523x.c
View File

@@ -28,7 +28,7 @@
DEFINE_CLK(pll, "pll.0", MCF_CLK); DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK); DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
struct clk_lookup m523x_clk_lookup[] = { static struct clk_lookup m523x_clk_lookup[] = {
CLKDEV_INIT(NULL, "pll.0", &clk_pll), CLKDEV_INIT(NULL, "pll.0", &clk_pll),
CLKDEV_INIT(NULL, "sys.0", &clk_sys), CLKDEV_INIT(NULL, "sys.0", &clk_sys),
CLKDEV_INIT("mcfpit.0", NULL, &clk_pll), CLKDEV_INIT("mcfpit.0", NULL, &clk_pll),