Commit 5ef30d74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v5.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

 - Atari Falcon IDE platform driver conversion for module autoload

 - defconfig updates (including enablement of Amiga ICY I2C)

 - small fixes and cleanups

* tag 'm68k-for-v5.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/atari: Convert Falcon IDE drivers to platform drivers
  m68k: defconfig: Enable ICY I2C and LTC2990 on Amiga
  m68k: defconfig: Update defconfigs for v5.4-rc1
  m68k: q40: Fix info-leak in rtc_ioctl
  nubus: Remove cast to void pointer
parents 28fcb77b 5ed0794c

arch/m68k/atari/config.c

+27 −0
Original line number Diff line number Diff line
@@ -869,8 +869,28 @@ static const struct resource atari_scsi_tt_rsrc[] __initconst = { 
};

#endif



/*

 * Falcon IDE interface

 */



#define FALCON_IDE_BASE	0xfff00000



static const struct resource atari_falconide_rsrc[] __initconst = {

	{

		.flags = IORESOURCE_MEM,

		.start = FALCON_IDE_BASE,

		.end   = FALCON_IDE_BASE + 0x39,

	},

	{

		.flags = IORESOURCE_IRQ,

		.start = IRQ_MFP_FSCSI,

		.end   = IRQ_MFP_FSCSI,

	},

};



int __init atari_platform_init(void)

{

	struct platform_device *pdev;

	int rv = 0;



	if (!MACH_IS_ATARI)
@@ -912,6 +932,13 @@ int __init atari_platform_init(void) 
			atari_scsi_tt_rsrc, ARRAY_SIZE(atari_scsi_tt_rsrc));

#endif



	if (ATARIHW_PRESENT(IDE)) {

		pdev = platform_device_register_simple("atari-falcon-ide", -1,

			atari_falconide_rsrc, ARRAY_SIZE(atari_falconide_rsrc));

		if (IS_ERR(pdev))

			rv = PTR_ERR(pdev);

	}



	return rv;

}

arch/m68k/configs/amiga_defconfig

+7 −7
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ CONFIG_DM_SNAPSHOT=m 
CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_WRITECACHE=m

CONFIG_DM_ERA=m

CONFIG_DM_CLONE=m

CONFIG_DM_MIRROR=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m
@@ -420,11 +421,15 @@ CONFIG_INPUT_M68K_BEEP=m 
# CONFIG_LEGACY_PTYS is not set

CONFIG_PRINTER=m

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=m

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_ICY=m

CONFIG_NTP_PPS=y

CONFIG_PPS_CLIENT_LDISC=m

CONFIG_PPS_CLIENT_PARPORT=m

CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

CONFIG_HWMON=m

CONFIG_SENSORS_LTC2990=m

CONFIG_FB=y

CONFIG_FB_CIRRUS=y

CONFIG_FB_AMIGA=y
@@ -432,8 +437,6 @@ CONFIG_FB_AMIGA_OCS=y 
CONFIG_FB_AMIGA_ECS=y

CONFIG_FB_AMIGA_AGA=y

CONFIG_FB_FM2=y

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=m
@@ -490,6 +493,7 @@ CONFIG_QNX4FS_FS=m 
CONFIG_QNX6FS_FS=m

CONFIG_SYSV_FS=m

CONFIG_UFS_FS=m

CONFIG_EROFS_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_V4=m

CONFIG_NFS_SWAP=y
@@ -560,10 +564,6 @@ CONFIG_CRYPTO_ECDH=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m

CONFIG_CRYPTO_AEGIS256=m

CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

arch/m68k/configs/apollo_defconfig

+2 −6
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ CONFIG_DM_SNAPSHOT=m 
CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_WRITECACHE=m

CONFIG_DM_ERA=m

CONFIG_DM_CLONE=m

CONFIG_DM_MIRROR=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m
@@ -393,8 +394,6 @@ CONFIG_PPS_CLIENT_LDISC=m 
CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

CONFIG_FB=y

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -450,6 +449,7 @@ CONFIG_QNX4FS_FS=m 
CONFIG_QNX6FS_FS=m

CONFIG_SYSV_FS=m

CONFIG_UFS_FS=m

CONFIG_EROFS_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_V4=m

CONFIG_NFS_SWAP=y
@@ -520,10 +520,6 @@ CONFIG_CRYPTO_ECDH=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m

CONFIG_CRYPTO_AEGIS256=m

CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

arch/m68k/configs/atari_defconfig

+2 −6
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ CONFIG_DM_SNAPSHOT=m 
CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_WRITECACHE=m

CONFIG_DM_ERA=m

CONFIG_DM_CLONE=m

CONFIG_DM_MIRROR=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m
@@ -417,8 +418,6 @@ CONFIG_PTP_1588_CLOCK=m 
# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_ATARI=y

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=m
@@ -472,6 +471,7 @@ CONFIG_QNX4FS_FS=m 
CONFIG_QNX6FS_FS=m

CONFIG_SYSV_FS=m

CONFIG_UFS_FS=m

CONFIG_EROFS_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_V4=m

CONFIG_NFS_SWAP=y
@@ -542,10 +542,6 @@ CONFIG_CRYPTO_ECDH=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m

CONFIG_CRYPTO_AEGIS256=m

CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

arch/m68k/configs/bvme6000_defconfig

+2 −6
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ CONFIG_DM_SNAPSHOT=m 
CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_WRITECACHE=m

CONFIG_DM_ERA=m

CONFIG_DM_CLONE=m

CONFIG_DM_MIRROR=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m
@@ -390,8 +391,6 @@ CONFIG_NTP_PPS=y 
CONFIG_PPS_CLIENT_LDISC=m

CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

CONFIG_HID=m

CONFIG_HIDRAW=y

CONFIG_UHID=m
@@ -443,6 +442,7 @@ CONFIG_QNX4FS_FS=m 
CONFIG_QNX6FS_FS=m

CONFIG_SYSV_FS=m

CONFIG_UFS_FS=m

CONFIG_EROFS_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_V4=m

CONFIG_NFS_SWAP=y
@@ -513,10 +513,6 @@ CONFIG_CRYPTO_ECDH=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m

CONFIG_CRYPTO_AEGIS256=m

CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE