Commit dbcda58a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - ioremap() cleanups

 - defconfig updates

 - small fixes and cleanups

* tag 'm68k-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Remove ioremap_fullcache()
  m68k: Simplify ioremap_nocache()
  m68k: defconfig: Update defconfigs for v5.3-rc2
  m68k: atari: Rename shifter to shifter_st to avoid conflict
  m68k: Prevent some compiler warnings in Coldfire builds
  m68k: mac: Revisit floppy disc controller base addresses
parents e77fafe9 0f1979b4

arch/m68k/atari/config.c

+3 −3
Original line number Diff line number Diff line
@@ -246,9 +246,9 @@ void __init config_atari(void) 
	} else if (hwreg_present(tt_palette)) {

		ATARIHW_SET(TT_SHIFTER);

		pr_cont(" TT_SHIFTER");

	} else if (hwreg_present(&shifter.bas_hi)) {

		if (hwreg_present(&shifter.bas_lo) &&

		    (shifter.bas_lo = 0x0aau, shifter.bas_lo == 0x0aau)) {

	} else if (hwreg_present(&shifter_st.bas_hi)) {

		if (hwreg_present(&shifter_st.bas_lo) &&

		    (shifter_st.bas_lo = 0x0aau, shifter_st.bas_lo == 0x0aau)) {

			ATARIHW_SET(EXTD_SHIFTER);

			pr_cont(" EXTD_SHIFTER");

		} else {

arch/m68k/configs/amiga_defconfig

+10 −3
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ CONFIG_NFT_XFRM=m 
CONFIG_NFT_SOCKET=m

CONFIG_NFT_OSF=m

CONFIG_NFT_TPROXY=m

CONFIG_NFT_SYNPROXY=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m
@@ -250,9 +251,11 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m

CONFIG_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -330,7 +333,6 @@ CONFIG_RAID_ATTRS=m 
CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=m
@@ -450,7 +452,6 @@ CONFIG_RTC_DRV_RP5C01=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

# CONFIG_VALIDATE_FS_PARSER is not set

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m
@@ -573,6 +574,7 @@ CONFIG_CRYPTO_KEYWRAP=m 
CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m
@@ -582,8 +584,10 @@ CONFIG_CRYPTO_SHA3=m 
CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m
@@ -618,6 +622,7 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m
@@ -636,6 +641,7 @@ CONFIG_TEST_IDA=m 
CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_BLACKHOLE_DEV=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m
@@ -644,4 +650,5 @@ CONFIG_TEST_STATIC_KEYS=m 
CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_EARLY_PRINTK=y

arch/m68k/configs/apollo_defconfig

+10 −3
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ CONFIG_NFT_XFRM=m 
CONFIG_NFT_SOCKET=m

CONFIG_NFT_OSF=m

CONFIG_NFT_TPROXY=m

CONFIG_NFT_SYNPROXY=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m
@@ -246,9 +247,11 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m

CONFIG_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -315,7 +318,6 @@ CONFIG_RAID_ATTRS=m 
CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=m
@@ -410,7 +412,6 @@ CONFIG_RTC_DRV_GENERIC=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

# CONFIG_VALIDATE_FS_PARSER is not set

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m
@@ -533,6 +534,7 @@ CONFIG_CRYPTO_KEYWRAP=m 
CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m
@@ -542,8 +544,10 @@ CONFIG_CRYPTO_SHA3=m 
CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m
@@ -578,6 +582,7 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m
@@ -596,6 +601,7 @@ CONFIG_TEST_IDA=m 
CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_BLACKHOLE_DEV=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m
@@ -604,4 +610,5 @@ CONFIG_TEST_STATIC_KEYS=m 
CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_EARLY_PRINTK=y

arch/m68k/configs/atari_defconfig

+10 −3
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ CONFIG_NFT_XFRM=m 
CONFIG_NFT_SOCKET=m

CONFIG_NFT_OSF=m

CONFIG_NFT_TPROXY=m

CONFIG_NFT_SYNPROXY=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m
@@ -253,9 +254,11 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m

CONFIG_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -330,7 +333,6 @@ CONFIG_RAID_ATTRS=m 
CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=m
@@ -432,7 +434,6 @@ CONFIG_RTC_DRV_GENERIC=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

# CONFIG_VALIDATE_FS_PARSER is not set

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m
@@ -555,6 +556,7 @@ CONFIG_CRYPTO_KEYWRAP=m 
CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m
@@ -564,8 +566,10 @@ CONFIG_CRYPTO_SHA3=m 
CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m
@@ -600,6 +604,7 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m
@@ -618,6 +623,7 @@ CONFIG_TEST_IDA=m 
CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_BLACKHOLE_DEV=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m
@@ -626,4 +632,5 @@ CONFIG_TEST_STATIC_KEYS=m 
CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_EARLY_PRINTK=y

arch/m68k/configs/bvme6000_defconfig

+10 −3
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ CONFIG_NFT_XFRM=m 
CONFIG_NFT_SOCKET=m

CONFIG_NFT_OSF=m

CONFIG_NFT_TPROXY=m

CONFIG_NFT_SYNPROXY=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m
@@ -243,9 +244,11 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m

CONFIG_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -312,7 +315,6 @@ CONFIG_RAID_ATTRS=m 
CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=m
@@ -403,7 +405,6 @@ CONFIG_RTC_DRV_GENERIC=m 
# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

# CONFIG_VALIDATE_FS_PARSER is not set

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m

CONFIG_JFS_FS=m
@@ -526,6 +527,7 @@ CONFIG_CRYPTO_KEYWRAP=m 
CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m
@@ -535,8 +537,10 @@ CONFIG_CRYPTO_SHA3=m 
CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m
@@ -571,6 +575,7 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m
@@ -589,6 +594,7 @@ CONFIG_TEST_IDA=m 
CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_BLACKHOLE_DEV=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m
@@ -597,4 +603,5 @@ CONFIG_TEST_STATIC_KEYS=m 
CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_EARLY_PRINTK=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE