Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5184d449 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-v5.4-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull Microblaze updates from Michal Simek:

 - clean up reset gpio handler

 - defconfig updates

 - add support for 8 byte get_user()

 - switch to generic dma code

* tag 'microblaze-v5.4-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Switch to standard restart handler
  microblaze: defconfig synchronization
  microblaze: Enable Xilinx AXI emac driver by default
  arch/microblaze: support get_user() of size 8 bytes
  microblaze: remove ioremap_fullcache
  microblaze: use the generic dma coherent remap allocator
  microblaze/nommu: use the generic uncached segment support
parents baff384b 7cca9b8b

arch/microblaze/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -5,15 +5,18 @@ config MICROBLAZE 
	select ARCH_NO_SWAP

	select ARCH_HAS_BINFMT_FLAT if !MMU

	select ARCH_HAS_DMA_COHERENT_TO_PFN if MMU

	select ARCH_HAS_DMA_PREP_COHERENT

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select ARCH_HAS_UNCACHED_SEGMENT if !MMU

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_WANT_IPC_PARSE_VERSION

	select BUILDTIME_EXTABLE_SORT

	select TIMER_OF

	select CLONE_BACKWARDS3

	select COMMON_CLK

	select DMA_DIRECT_REMAP if MMU

	select GENERIC_ATOMIC64

	select GENERIC_CLOCKEVENTS

	select GENERIC_CPU_DEVICES

arch/microblaze/boot/dts/system.dts

+15 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
	#address-cells = <1>;

	#size-cells = <1>;

	compatible = "xlnx,microblaze";

	hard-reset-gpios = <&LEDs_8Bit 2 1>;

	model = "testing";

	DDR2_SDRAM: memory@90000000 {

		device_type = "memory";
@@ -281,6 +280,21 @@ 
				gpios = <&LEDs_8Bit 7 1>;

			};

		} ;



		gpio-restart {

			compatible = "gpio-restart";

			/*

			 * FIXME: is this active low or active high?

			 * the current flag (1) indicates active low.

			 * delay measures are templates, should be adjusted

			 * to datasheet or trial-and-error with real hardware.

			 */

			gpios = <&LEDs_8Bit 2 1>;

			active-delay = <100>;

			inactive-delay = <10>;

			wait-delay = <100>;

		};



		RS232_Uart_1: serial@84000000 {

			clock-frequency = <125000000>;

			compatible = "xlnx,xps-uartlite-1.00.a";

arch/microblaze/configs/mmu_defconfig

+11 −11
Original line number Diff line number Diff line
@@ -5,15 +5,10 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_BASE_FULL is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1

CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1

CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
@@ -25,14 +20,19 @@ CONFIG_MMU=y 
CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE_FORCE=y

CONFIG_HIGHMEM=y

CONFIG_PCI=y

CONFIG_PCI_XILINX=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_BRIDGE=m

CONFIG_PCI=y

CONFIG_MTD=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y
@@ -41,6 +41,7 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_NETDEVICES=y

CONFIG_XILINX_EMACLITE=y

CONFIG_XILINX_AXI_EMAC=y

CONFIG_XILINX_LL_TEMAC=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set
@@ -59,6 +60,8 @@ CONFIG_SPI_XILINX=y 
CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_XILINX=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_GPIO_RESTART=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_XILINX_WATCHDOG=y
@@ -74,8 +77,8 @@ CONFIG_CRAMFS=y 
CONFIG_ROMFS_FS=y

CONFIG_NFS_FS=y

CONFIG_CIFS=y

CONFIG_CIFS_STATS=y

CONFIG_CIFS_STATS2=y

CONFIG_ENCRYPTED_KEYS=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y
@@ -83,6 +86,3 @@ CONFIG_DEBUG_SPINLOCK=y 
CONFIG_KGDB=y

CONFIG_KGDB_TESTS=y

CONFIG_KGDB_KDB=y
 
CONFIG_EARLY_PRINTK=y

CONFIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=y

arch/microblaze/configs/nommu_defconfig

+13 −12
Original line number Diff line number Diff line
@@ -7,15 +7,10 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_BASE_FULL is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1

CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1

CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
@@ -25,13 +20,18 @@ CONFIG_XILINX_MICROBLAZE0_USE_FPU=2 
CONFIG_HZ_100=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE_FORCE=y

CONFIG_PCI=y

CONFIG_PCI_XILINX=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_PCI=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y
@@ -62,6 +62,8 @@ CONFIG_SPI_XILINX=y 
CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_XILINX=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_GPIO_RESTART=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_XILINX_WATCHDOG=y
@@ -75,11 +77,6 @@ CONFIG_ROMFS_FS=y 
CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NLS=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_EARLY_PRINTK=y

CONFIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=y

CONFIG_CRYPTO_ECB=y
@@ -87,3 +84,7 @@ CONFIG_CRYPTO_MD4=y 
CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_DES=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK=y

arch/microblaze/include/asm/io.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ extern void iounmap(volatile void __iomem *addr); 


extern void __iomem *ioremap(phys_addr_t address, unsigned long size);

#define ioremap_nocache(addr, size)		ioremap((addr), (size))

#define ioremap_fullcache(addr, size)		ioremap((addr), (size))

#define ioremap_wc(addr, size)			ioremap((addr), (size))

#define ioremap_wt(addr, size)			ioremap((addr), (size))