Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (c93212f3) · Commits · 戴 / test

arch/arm/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -468,7 +468,7 @@ config ARCH_IXP4XX

		config ARCH_DOVE
		bool "Marvell Dove"
		select CPU_V6K
		select CPU_V7
		select PCI
		select ARCH_REQUIRE_GPIOLIB
		select GENERIC_CLOCKEVENTS

arch/arm/boot/compressed/head.S

+0 −6

Original line number	Diff line number	Diff line
		@@ -735,12 +735,6 @@ proc_types:
		W(b) __armv4_mmu_cache_off
		W(b) __armv6_mmu_cache_flush

		.word 0x560f5810 @ Marvell PJ4 ARMv6
		.word 0xff0ffff0
		W(b) __armv4_mmu_cache_on
		W(b) __armv4_mmu_cache_off
		W(b) __armv6_mmu_cache_flush

		.word 0x000f0000 @ new CPU Id
		.word 0x000f0000
		W(b) __armv7_mmu_cache_on

arch/arm/configs/dove_defconfig

+1 −11

Original line number	Diff line number	Diff line
		@@ -8,8 +8,6 @@ CONFIG_MODULE_UNLOAD=y
		# CONFIG_BLK_DEV_BSG is not set
		CONFIG_ARCH_DOVE=y
		CONFIG_MACH_DOVE_DB=y
		CONFIG_CPU_V6=y
		CONFIG_CPU_32v6K=y
		CONFIG_NO_HZ=y
		CONFIG_HIGH_RES_TIMERS=y
		CONFIG_AEABI=y
		@@ -44,7 +42,6 @@ CONFIG_MTD_UBI=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_COUNT=1
		# CONFIG_MISC_DEVICES is not set
		# CONFIG_SCSI_PROC_FS is not set
		CONFIG_BLK_DEV_SD=y
		# CONFIG_SCSI_LOWLEVEL is not set
		@@ -59,12 +56,12 @@ CONFIG_INPUT_EVDEV=y
		# CONFIG_KEYBOARD_ATKBD is not set
		# CONFIG_MOUSE_PS2 is not set
		# CONFIG_SERIO is not set
		CONFIG_LEGACY_PTY_COUNT=16
		# CONFIG_DEVKMEM is not set
		CONFIG_SERIAL_8250=y
		CONFIG_SERIAL_8250_CONSOLE=y
		# CONFIG_SERIAL_8250_PCI is not set
		CONFIG_SERIAL_8250_RUNTIME_UARTS=2
		CONFIG_LEGACY_PTY_COUNT=16
		# CONFIG_HW_RANDOM is not set
		CONFIG_I2C=y
		CONFIG_I2C_CHARDEV=y
		@@ -72,12 +69,10 @@ CONFIG_I2C_MV64XXX=y
		CONFIG_SPI=y
		CONFIG_SPI_ORION=y
		# CONFIG_HWMON is not set
		# CONFIG_VGA_CONSOLE is not set
		CONFIG_USB=y
		CONFIG_USB_DEVICEFS=y
		CONFIG_USB_EHCI_HCD=y
		CONFIG_USB_EHCI_ROOT_HUB_TT=y
		CONFIG_USB_EHCI_TT_NEWSCHED=y
		CONFIG_USB_STORAGE=y
		CONFIG_RTC_CLASS=y
		CONFIG_RTC_DRV_MV=y
		@@ -86,7 +81,6 @@ CONFIG_MV_XOR=y
		CONFIG_EXT2_FS=y
		CONFIG_EXT3_FS=y
		# CONFIG_EXT3_FS_XATTR is not set
		CONFIG_INOTIFY=y
		CONFIG_ISO9660_FS=y
		CONFIG_JOLIET=y
		CONFIG_UDF_FS=m
		@@ -110,23 +104,19 @@ CONFIG_DEBUG_KERNEL=y
		CONFIG_TIMER_STATS=y
		# CONFIG_DEBUG_BUGVERBOSE is not set
		CONFIG_DEBUG_INFO=y
		# CONFIG_RCU_CPU_STALL_DETECTOR is not set
		CONFIG_SYSCTL_SYSCALL_CHECK=y
		CONFIG_DEBUG_USER=y
		CONFIG_DEBUG_ERRORS=y
		CONFIG_CRYPTO_NULL=y
		CONFIG_CRYPTO_CBC=y
		CONFIG_CRYPTO_ECB=m
		CONFIG_CRYPTO_PCBC=m
		CONFIG_CRYPTO_HMAC=y
		CONFIG_CRYPTO_MD4=y
		CONFIG_CRYPTO_MD5=y
		CONFIG_CRYPTO_SHA1=y
		CONFIG_CRYPTO_SHA256=y
		CONFIG_CRYPTO_SHA512=y
		CONFIG_CRYPTO_AES=y
		CONFIG_CRYPTO_BLOWFISH=y
		CONFIG_CRYPTO_DES=y
		CONFIG_CRYPTO_TEA=y
		CONFIG_CRYPTO_TWOFISH=y
		CONFIG_CRYPTO_DEFLATE=y

arch/arm/mm/proc-v6.S

+0 −34

Original line number	Diff line number	Diff line
		@@ -175,11 +175,6 @@ cpu_v6_name:
		.asciz "ARMv6-compatible processor"
		.size cpu_v6_name, . - cpu_v6_name

		.type cpu_pj4_name, #object
		cpu_pj4_name:
		.asciz "Marvell PJ4 processor"
		.size cpu_pj4_name, . - cpu_pj4_name

		.align

		__CPUINIT
		@@ -305,32 +300,3 @@ __v6_proc_info:
		.long v6_user_fns
		.long v6_cache_fns
		.size __v6_proc_info, . - __v6_proc_info

		.type __pj4_v6_proc_info, #object
		__pj4_v6_proc_info:
		.long 0x560f5810
		.long 0xff0ffff0
		ALT_SMP(.long \
		PMD_TYPE_SECT \| \
		PMD_SECT_AP_WRITE \| \
		PMD_SECT_AP_READ \| \
		PMD_FLAGS_SMP)
		ALT_UP(.long \
		PMD_TYPE_SECT \| \
		PMD_SECT_AP_WRITE \| \
		PMD_SECT_AP_READ \| \
		PMD_FLAGS_UP)
		.long PMD_TYPE_SECT \| \
		PMD_SECT_XN \| \
		PMD_SECT_AP_WRITE \| \
		PMD_SECT_AP_READ
		b __v6_setup
		.long cpu_arch_name
		.long cpu_elf_name
		.long HWCAP_SWP\|HWCAP_HALF\|HWCAP_THUMB\|HWCAP_FAST_MULT\|HWCAP_EDSP\|HWCAP_TLS
		.long cpu_pj4_name
		.long v6_processor_functions
		.long v6wbi_tlb_fns
		.long v6_user_fns
		.long v6_cache_fns
		.size __pj4_v6_proc_info, . - __pj4_v6_proc_info

Admin message