History

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

Linus Torvalds committed 2 months ago

Commit 874b43b2 parents 1b78070 de0dab25 files · +130 −2Browse files

Unified · Split

5 files
  1. arch/m68k/coldfire/device.c +1 −1
  2. arch/m68k/coldfire/m5441x.c +25 −0
  3. arch/m68k/configs/m5235evb_defconfig +52 −0
  4. arch/m68k/configs/m5282evb_defconfig +51 −0
  5. arch/m68k/include/asm/mcfgpio.h +1 −1
arch/m68k/coldfire/device.c+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 #include <linux/init.h>
1313 #include <linux/io.h>
1414 #include <linux/spi/spi.h>
15−#include <linux/gpio.h>
15+#include <linux/gpio/legacy.h>
1616 #include <linux/fec.h>
1717 #include <linux/dmaengine.h>
1818 #include <asm/traps.h>
arch/m68k/coldfire/m5441x.c+25−0
@@ -11,6 +11,7 @@ · 10 unmodified lines
1111 #include <linux/init.h>
1212 #include <linux/io.h>
1313 #include <linux/clk.h>
14+#include <linux/platform_device.h>
1415 #include <asm/machdep.h>
1516 #include <asm/coldfire.h>
1617 #include <asm/mcfsim.h>
@@ -242,6 +243,30 @@ static void __init m5441x_fec_init(void) · 225 unmodified lines
242243 mcf_write8(0x03, MCFGPIO_PAR_FEC);
243244 }
244245
246+/*
247+ * Reset Controller Module status register. Exposed to userspace as
248+ * /sys/devices/platform/mcf-rcm-reset/power_on_reason by the mcf-rcm-reset
249+ * driver (drivers/power/reset/mcf-rcm-reset.c).
250+ */
251+static struct resource m5441x_rcm_resource[] = {
252+ {
253+ .start = MCF_RSR,
254+ .end = MCF_RSR,
255+ .flags = IORESOURCE_MEM,
256+ },
257+};
258+
259+static int __init m5441x_rcm_init(void)
260+{
261+ struct platform_device *pdev;
262+
263+ pdev = platform_device_register_simple("mcf-rcm-reset", -1,
264+ m5441x_rcm_resource,
265+ ARRAY_SIZE(m5441x_rcm_resource));
266+ return PTR_ERR_OR_ZERO(pdev);
267+}
268+arch_initcall(m5441x_rcm_init);
269+
245270 void __init config_BSP(char *commandp, int size)
246271 {
247272 m5441x_clk_init();
arch/m68k/configs/m5235evb_defconfig+52−0
@@ -0,0 +1,52 @@
1+CONFIG_LOG_BUF_SHIFT=14
2+CONFIG_EXPERT=y
3+# CONFIG_FUTEX is not set
4+# CONFIG_EPOLL is not set
5+# CONFIG_SIGNALFD is not set
6+# CONFIG_TIMERFD is not set
7+# CONFIG_EVENTFD is not set
8+# CONFIG_AIO is not set
9+# CONFIG_KALLSYMS is not set
10+# CONFIG_MMU is not set
11+CONFIG_M523x=y
12+CONFIG_M5235EVB=y
13+CONFIG_RAMBASE=0x00000000
14+CONFIG_RAMSIZE=0x01000000
15+CONFIG_VECTORBASE=0x00000000
16+CONFIG_IPSBAR=0x40000000
17+CONFIG_KERNELBASE=0x00020000
18+CONFIG_MODULES=y
19+CONFIG_MODULE_UNLOAD=y
20+CONFIG_BINFMT_FLAT=y
21+# CONFIG_VM_EVENT_COUNTERS is not set
22+CONFIG_NET=y
23+CONFIG_PACKET=y
24+CONFIG_UNIX=y
25+CONFIG_INET=y
26+# CONFIG_INET_DIAG is not set
27+# CONFIG_IPV6 is not set
28+# CONFIG_FW_LOADER is not set
29+CONFIG_MTD=y
30+CONFIG_MTD_BLOCK=y
31+CONFIG_MTD_RAM=y
32+CONFIG_MTD_UCLINUX=y
33+CONFIG_BLK_DEV_RAM=y
34+CONFIG_NETDEVICES=y
35+CONFIG_FEC=y
36+# CONFIG_INPUT is not set
37+# CONFIG_SERIO is not set
38+# CONFIG_VT is not set
39+# CONFIG_UNIX98_PTYS is not set
40+CONFIG_SERIAL_MCF=y
41+CONFIG_SERIAL_MCF_CONSOLE=y
42+# CONFIG_HWMON is not set
43+# CONFIG_USB_SUPPORT is not set
44+CONFIG_EXT2_FS=y
45+# CONFIG_FILE_LOCKING is not set
46+# CONFIG_DNOTIFY is not set
47+CONFIG_ROMFS_FS=y
48+CONFIG_ROMFS_BACKED_BY_MTD=y
49+# CONFIG_NETWORK_FILESYSTEMS is not set
50+# CONFIG_SLUB_DEBUG is not set
51+CONFIG_BOOTPARAM=y
52+CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
arch/m68k/configs/m5282evb_defconfig+51−0
@@ -0,0 +1,51 @@
1+CONFIG_LOG_BUF_SHIFT=14
2+CONFIG_EXPERT=y
3+# CONFIG_FUTEX is not set
4+# CONFIG_EPOLL is not set
5+# CONFIG_SIGNALFD is not set
6+# CONFIG_TIMERFD is not set
7+# CONFIG_EVENTFD is not set
8+# CONFIG_AIO is not set
9+# CONFIG_KALLSYMS is not set
10+# CONFIG_MMU is not set
11+CONFIG_M528x=y
12+CONFIG_RAMBASE=0x00000000
13+CONFIG_RAMSIZE=0x00800000
14+CONFIG_VECTORBASE=0x00000000
15+CONFIG_IPSBAR=0x40000000
16+CONFIG_KERNELBASE=0x00020000
17+CONFIG_MODULES=y
18+CONFIG_MODULE_UNLOAD=y
19+CONFIG_BINFMT_FLAT=y
20+# CONFIG_VM_EVENT_COUNTERS is not set
21+CONFIG_NET=y
22+CONFIG_PACKET=y
23+CONFIG_UNIX=y
24+CONFIG_INET=y
25+# CONFIG_INET_DIAG is not set
26+# CONFIG_IPV6 is not set
27+# CONFIG_FW_LOADER is not set
28+CONFIG_MTD=y
29+CONFIG_MTD_BLOCK=y
30+CONFIG_MTD_RAM=y
31+CONFIG_MTD_UCLINUX=y
32+CONFIG_BLK_DEV_RAM=y
33+CONFIG_NETDEVICES=y
34+CONFIG_FEC=y
35+# CONFIG_INPUT is not set
36+# CONFIG_SERIO is not set
37+# CONFIG_VT is not set
38+# CONFIG_UNIX98_PTYS is not set
39+CONFIG_SERIAL_MCF=y
40+CONFIG_SERIAL_MCF_CONSOLE=y
41+# CONFIG_HWMON is not set
42+# CONFIG_USB_SUPPORT is not set
43+CONFIG_EXT2_FS=y
44+# CONFIG_FILE_LOCKING is not set
45+# CONFIG_DNOTIFY is not set
46+CONFIG_ROMFS_FS=y
47+CONFIG_ROMFS_BACKED_BY_MTD=y
48+# CONFIG_NETWORK_FILESYSTEMS is not set
49+# CONFIG_SLUB_DEBUG is not set
50+CONFIG_BOOTPARAM=y
51+CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
arch/m68k/include/asm/mcfgpio.h+1−1
@@ -16,7 +16,7 @@ int __mcfgpio_request(unsigned gpio); · 15 unmodified lines
1616 void __mcfgpio_free(unsigned gpio);
1717
1818 #ifdef CONFIG_GPIOLIB
19−#include <linux/gpio.h>
19+#include <linux/gpio/legacy.h>
2020 #else
2121
2222 /* our alternate 'gpiolib' functions */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t