github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-12 20:53:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

m68knommu: updates and fixes for v7.3

Browse Source 
, new defconfigs for 2 more ColdFire boards
 . change to use linux/gpio/legacy.h
 . add platform setup for reset device of the 5441x SoC boards
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEEmsfM6tQwfNjBOxr3TiQVqaG9L4AFAmqQ02gQHGdlcmdAa2Vy
 bmVsLm9yZwAKCRBOJBWpob0vgLezD/9e8dYKwAtkclfd6wkSBVoBIG2f3yFWKDaf
 0lAV/oZJjvo4lEAbS4ADzQUnFjn+MIQBRi9QL4TaekDJx612BNK3OF71etOT/7o6
 h0EylRBoZ6SDSjFlm9jEtf+nu1XzlfAwRkE229pKAmPK0OBI9+z0/XQTjCh8Ag8h
 1afRS3DoPDpku8vIU24LlbUtD89m1YjesRayL2KI7mBS4TTatGo+IeGPNlmJGIcz
 03SytqwhxK3r1QNecOOVDOpxx9efPHWNkgo5fDi+N3XkPRm2X3ruAlsGbfvbNeZG
 pi30nugw57oAzBrUGSKYetdd9v/452Q336+CiDG1rVTQiJomgcW6Gu+Ps5jS9JpD
 b8aujjCnGVmfD7r3VQG4o96dgQFvB2hM4zQtslTagbTAWUYOBcDNSgtClGkfS2OB
 gxBTPGS0Ulos2CzQWoPW4LqP3k+8EcEsLUb5CNZGX3XlAWeoFOunS4lmtdxqJ7hD
 ndtINEBUE74C6+ns3RvIKhUKKZOIqwkqxYdw2ScsPxJlupDZssFdBEVEh4AQkFz8
 UywfPwG6pWXD2Qj/FPpX3miU79jl9gawfnZv+KT9VZy+KjoZrS05WfrFFu9AB4rI
 BR8kXnynUCpn4RWqWVF+z+sJSPwWqJbQmZU5uyithMUb0OFyWzKFvggVja4B0Qit
 nbb09BEuWA==
 =JjnP
 -----END PGP SIGNATURE-----

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

Pull m68knommu updates from Greg Ungerer:
 "This includes a couple more new defconfigs to improve test build
  coverage, changes to use the more correct linux/gpio/legacy.h and
  platform setup for the reset device of the ColdFire 5441x SoC
  hardware.

   - new defconfigs for 2 more ColdFire boards

   - change to use linux/gpio/legacy.h

   - add platform setup for reset device of the 5441x SoC boards"

* tag 'm68knommu-for-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: coldfire/5441x: register mcf-rcm-reset platform device
  m68k/coldfire: replace linux/gpio.h inclusions
  m68k: defconfig: add config for M5282EVB board
  m68k: defconfig: add config for M52358EVB board
This commit is contained in:
Linus Torvalds 2026-08-28 08:44:36 -07:00
commit 874b43b9f3
5 changed files with 130 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/spi/spi.h>
#include <linux/gpio.h>
#include <linux/gpio/legacy.h>
#include <linux/fec.h>
#include <linux/dmaengine.h>
#include <asm/traps.h>

25
arch/m68k/coldfire/m5441x.c
View File

@ -11,6 +11,7 @@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/clk.h>
#include <linux/platform_device.h>
#include <asm/machdep.h>
#include <asm/coldfire.h>
#include <asm/mcfsim.h>
@ -242,6 +243,30 @@ static void __init m5441x_fec_init(void)
mcf_write8(0x03, MCFGPIO_PAR_FEC);
}
/*
* Reset Controller Module status register. Exposed to userspace as
* /sys/devices/platform/mcf-rcm-reset/power_on_reason by the mcf-rcm-reset
* driver (drivers/power/reset/mcf-rcm-reset.c).
*/
static struct resource m5441x_rcm_resource[] = {
{
.start = MCF_RSR,
.end = MCF_RSR,
.flags = IORESOURCE_MEM,
},
};
static int __init m5441x_rcm_init(void)
{
struct platform_device *pdev;
pdev = platform_device_register_simple("mcf-rcm-reset", -1,
m5441x_rcm_resource,
ARRAY_SIZE(m5441x_rcm_resource));
return PTR_ERR_OR_ZERO(pdev);
}
arch_initcall(m5441x_rcm_init);
void __init config_BSP(char *commandp, int size)
{
m5441x_clk_init();

52
arch/m68k/configs/m5235evb_defconfig Normal file
View File

@ -0,0 +1,52 @@
CONFIG_LOG_BUF_SHIFT=14
CONFIG_EXPERT=y
# CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set
# CONFIG_TIMERFD is not set
# CONFIG_EVENTFD is not set
# CONFIG_AIO is not set
# CONFIG_KALLSYMS is not set
# CONFIG_MMU is not set
CONFIG_M523x=y
CONFIG_M5235EVB=y
CONFIG_RAMBASE=0x00000000
CONFIG_RAMSIZE=0x01000000
CONFIG_VECTORBASE=0x00000000
CONFIG_IPSBAR=0x40000000
CONFIG_KERNELBASE=0x00020000
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_BINFMT_FLAT=y
# CONFIG_VM_EVENT_COUNTERS is not set
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
# CONFIG_INET_DIAG is not set
# CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_RAM=y
CONFIG_MTD_UCLINUX=y
CONFIG_BLK_DEV_RAM=y
CONFIG_NETDEVICES=y
CONFIG_FEC=y
# CONFIG_INPUT is not set
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_UNIX98_PTYS is not set
CONFIG_SERIAL_MCF=y
CONFIG_SERIAL_MCF_CONSOLE=y
# CONFIG_HWMON is not set
# CONFIG_USB_SUPPORT is not set
CONFIG_EXT2_FS=y
# CONFIG_FILE_LOCKING is not set
# CONFIG_DNOTIFY is not set
CONFIG_ROMFS_FS=y
CONFIG_ROMFS_BACKED_BY_MTD=y
# CONFIG_NETWORK_FILESYSTEMS is not set
# CONFIG_SLUB_DEBUG is not set
CONFIG_BOOTPARAM=y
CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"

51
arch/m68k/configs/m5282evb_defconfig Normal file
View File

@ -0,0 +1,51 @@
CONFIG_LOG_BUF_SHIFT=14
CONFIG_EXPERT=y
# CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set
# CONFIG_TIMERFD is not set
# CONFIG_EVENTFD is not set
# CONFIG_AIO is not set
# CONFIG_KALLSYMS is not set
# CONFIG_MMU is not set
CONFIG_M528x=y
CONFIG_RAMBASE=0x00000000
CONFIG_RAMSIZE=0x00800000
CONFIG_VECTORBASE=0x00000000
CONFIG_IPSBAR=0x40000000
CONFIG_KERNELBASE=0x00020000
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_BINFMT_FLAT=y
# CONFIG_VM_EVENT_COUNTERS is not set
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
# CONFIG_INET_DIAG is not set
# CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_RAM=y
CONFIG_MTD_UCLINUX=y
CONFIG_BLK_DEV_RAM=y
CONFIG_NETDEVICES=y
CONFIG_FEC=y
# CONFIG_INPUT is not set
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_UNIX98_PTYS is not set
CONFIG_SERIAL_MCF=y
CONFIG_SERIAL_MCF_CONSOLE=y
# CONFIG_HWMON is not set
# CONFIG_USB_SUPPORT is not set
CONFIG_EXT2_FS=y
# CONFIG_FILE_LOCKING is not set
# CONFIG_DNOTIFY is not set
CONFIG_ROMFS_FS=y
CONFIG_ROMFS_BACKED_BY_MTD=y
# CONFIG_NETWORK_FILESYSTEMS is not set
# CONFIG_SLUB_DEBUG is not set
CONFIG_BOOTPARAM=y
CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"

2
arch/m68k/include/asm/mcfgpio.h
View File

@ -16,7 +16,7 @@ int __mcfgpio_request(unsigned gpio);
void __mcfgpio_free(unsigned gpio);
#ifdef CONFIG_GPIOLIB
#include <linux/gpio.h>
#include <linux/gpio/legacy.h>
#else
/* our alternate 'gpiolib' functions */