[git pull] m68knommu changes for v5.15
From: Greg Ungerer
Date: Wed Sep 01 2021 - 20:09:27 EST
Hi Linus,
Please pull the m68knommu changes for v5.15.
As per the tag comment, changes include:
. flexcan platform support (for m5441x)
. fix CONFIG_ROMKERNEL linking
. fix compilation when CONFIG_ISA_DMA_API is set
. fix local ColdFire clk_enable() for NULL clk
Regards
Greg
The following changes since commit e22ce8eb631bdc47a4a4ea7ecf4e4ba499db4f93:
Linux 5.14-rc7 (2021-08-22 14:24:56 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git tags/m68knommu-for-v5.15
for you to fetch changes up to db87db65c1059f3be04506d122f8ec9b2fa3b05e:
m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch (2021-08-23 08:40:05 +1000)
----------------------------------------------------------------
m68knommu: collection of fixes for 5.15
. flexcan platform support (for m5441x)
. fix CONFIG_ROMKERNEL linking
. fix compilation when CONFIG_ISA_DMA_API is set
. fix local ColdFire clk_enable() for NULL clk
----------------------------------------------------------------
Angelo Dureghello (2):
m68k: stmark2: update board setup
m68k: m5441x: add flexcan support
Arnd Bergmann (1):
m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch
Dan Carpenter (1):
m68k: coldfire: return success for clk_enable(NULL)
Randy Dunlap (1):
m68k/nommu: prevent setting ROMKERNEL when ROM is not set
arch/m68k/Kconfig.bus | 2 +-
arch/m68k/Kconfig.machine | 1 +
arch/m68k/coldfire/clk.c | 2 +-
arch/m68k/coldfire/device.c | 44 +++++++++++++++++++++++++++++++++++++++
arch/m68k/coldfire/m5441x.c | 8 +++----
arch/m68k/coldfire/stmark2.c | 6 ++++--
arch/m68k/include/asm/m5441xsim.h | 19 +++++++++++++++++
7 files changed, 74 insertions(+), 8 deletions(-)