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

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

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

Pull Microblaze updates from Michal Simek:
 - use asm-generic/io.h and fix intc/timer code
 - clean platform handling
 - enable some syscalls

* tag 'microblaze-3.15-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Use asm-generic/io.h
  microblaze: Remove platform folder
  microblaze: Remove generic platform
  microblaze: Sort Kconfig options
  microblaze: Move DTS file to common location at boot/dts folder
  microblaze: Fix compilation failure because of release_thread
  microblaze: Fix sparse warning because of missing cpu.h header
  microblaze: Make timer driver endian aware
  microblaze: Make intc driver endian aware
  microblaze: Wire-up new system calls sched_setattr/getattr
  microblaze: Wire-up preadv/pwritev in syscall table
  microblaze: Enable pselect6 syscall
  microblaze: Drop architecture-specific declaration of early_printk
  microblaze: Rename global function heartbeat()
parents 9e897e13 a66a6265

arch/microblaze/Kconfig

+27 −27
Original line number Diff line number Diff line 
config MICROBLAZE

	def_bool y

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select HAVE_OPROFILE

	select HAVE_ARCH_KGDB

	select HAVE_DMA_ATTRS

	select HAVE_DMA_API_DEBUG

	select TRACING_SUPPORT

	select OF

	select OF_EARLY_FLATTREE

	select ARCH_WANT_IPC_PARSE_VERSION

	select HAVE_DEBUG_KMEMLEAK

	select IRQ_DOMAIN

	select VIRT_TO_BUS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select BUILDTIME_EXTABLE_SORT

	select CLKSRC_OF

	select CLONE_BACKWARDS3

	select COMMON_CLK

	select GENERIC_ATOMIC64

	select GENERIC_CLOCKEVENTS

	select GENERIC_CPU_DEVICES

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_PCI_IOMAP

	select GENERIC_CPU_DEVICES

	select GENERIC_ATOMIC64

	select GENERIC_CLOCKEVENTS

	select COMMON_CLK

	select GENERIC_SCHED_CLOCK

	select GENERIC_IDLE_POLL_SETUP

	select HAVE_ARCH_KGDB

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FUNCTION_TRACER

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_OPROFILE

	select IRQ_DOMAIN

	select MODULES_USE_ELF_RELA

	select CLONE_BACKWARDS3

	select CLKSRC_OF

	select BUILDTIME_EXTABLE_SORT

	select OF

	select OF_EARLY_FLATTREE

	select TRACING_SUPPORT

	select VIRT_TO_BUS



config SWAP

	def_bool n
@@ -74,7 +74,7 @@ source "init/Kconfig" 


source "kernel/Kconfig.freezer"



source "arch/microblaze/platform/Kconfig.platform"

source "arch/microblaze/Kconfig.platform"



menu "Processor type and features"

arch/microblaze/platform/Kconfig.platform→arch/microblaze/Kconfig.platform

+40 −15
Original line number Diff line number Diff line
@@ -5,18 +5,6 @@ 
#



menu "Platform options"

choice

	prompt "Platform"

	default PLATFORM_MICROBLAZE_AUTO

	help

	  Choose which hardware board/platform you are targeting.



config PLATFORM_GENERIC

	bool "Generic"

	help

	  Choose this option for the Generic platform.



endchoice



config OPT_LIB_FUNCTION

	bool "Optimalized lib function"
@@ -37,8 +25,45 @@ config OPT_LIB_ASM 
	  Allows turn on optimalized library function (memcpy and memmove).

	  Function are written in asm code.



if PLATFORM_GENERIC=y

	source "arch/microblaze/platform/generic/Kconfig.auto"

endif

# Definitions for MICROBLAZE0

comment "Definitions for MICROBLAZE0"



config KERNEL_BASE_ADDR

	hex "Physical address where Linux Kernel is"

	default "0x90000000"

	help

	  BASE Address for kernel



config XILINX_MICROBLAZE0_FAMILY

	string "Targeted FPGA family"

	default "virtex5"



config XILINX_MICROBLAZE0_USE_MSR_INSTR

	int "USE_MSR_INSTR range (0:1)"

	default 0



config XILINX_MICROBLAZE0_USE_PCMP_INSTR

	int "USE_PCMP_INSTR range (0:1)"

	default 0



config XILINX_MICROBLAZE0_USE_BARREL

	int "USE_BARREL range (0:1)"

	default 0



config XILINX_MICROBLAZE0_USE_DIV

	int "USE_DIV range (0:1)"

	default 0



config XILINX_MICROBLAZE0_USE_HW_MUL

	int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)"

	default 0



config XILINX_MICROBLAZE0_USE_FPU

	int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)"

	default 0



config XILINX_MICROBLAZE0_HW_VER

	string "Core version number"

	default 7.10.d



endmenu

arch/microblaze/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ head-y := arch/microblaze/kernel/head.o 
libs-y += arch/microblaze/lib/

core-y += arch/microblaze/kernel/

core-y += arch/microblaze/mm/

core-y += arch/microblaze/platform/

core-$(CONFIG_PCI) += arch/microblaze/pci/



drivers-$(CONFIG_OPROFILE) += arch/microblaze/oprofile/

arch/microblaze/boot/dts/system.dts

deleted120000 → 0
+366 −1
Original line number Diff line number Diff line 
../../platform/generic/system.dts
 
 No newline at end of file

arch/microblaze/boot/dts/system.dts

0 → 100644
+366 −1
Original line number Diff line number Diff line 
/*

 * Device Tree Generator version: 1.1

 *

 * (C) Copyright 2007-2008 Xilinx, Inc.

 * (C) Copyright 2007-2009 Michal Simek

 *

 * Michal SIMEK <monstr@monstr.eu>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation; either version 2 of

 * the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,

 * MA 02111-1307 USA

 *

 * CAUTION: This file is automatically generated by libgen.

 * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6

 *

 * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101

 */



/dts-v1/;

/ {

	#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";

		reg = < 0x90000000 0x10000000 >;

	} ;

	aliases {

		ethernet0 = &Hard_Ethernet_MAC;

		serial0 = &RS232_Uart_1;

	} ;

	chosen {

		bootargs = "console=ttyUL0,115200 highres=on";

		linux,stdout-path = "/plb@0/serial@84000000";

	} ;

	cpus {

		#address-cells = <1>;

		#cpus = <0x1>;

		#size-cells = <0>;

		microblaze_0: cpu@0 {

			clock-frequency = <125000000>;

			compatible = "xlnx,microblaze-7.10.d";

			d-cache-baseaddr = <0x90000000>;

			d-cache-highaddr = <0x9fffffff>;

			d-cache-line-size = <0x10>;

			d-cache-size = <0x2000>;

			device_type = "cpu";

			i-cache-baseaddr = <0x90000000>;

			i-cache-highaddr = <0x9fffffff>;

			i-cache-line-size = <0x10>;

			i-cache-size = <0x2000>;

			model = "microblaze,7.10.d";

			reg = <0>;

			timebase-frequency = <125000000>;

			xlnx,addr-tag-bits = <0xf>;

			xlnx,allow-dcache-wr = <0x1>;

			xlnx,allow-icache-wr = <0x1>;

			xlnx,area-optimized = <0x0>;

			xlnx,cache-byte-size = <0x2000>;

			xlnx,d-lmb = <0x1>;

			xlnx,d-opb = <0x0>;

			xlnx,d-plb = <0x1>;

			xlnx,data-size = <0x20>;

			xlnx,dcache-addr-tag = <0xf>;

			xlnx,dcache-always-used = <0x1>;

			xlnx,dcache-byte-size = <0x2000>;

			xlnx,dcache-line-len = <0x4>;

			xlnx,dcache-use-fsl = <0x1>;

			xlnx,debug-enabled = <0x1>;

			xlnx,div-zero-exception = <0x1>;

			xlnx,dopb-bus-exception = <0x0>;

			xlnx,dynamic-bus-sizing = <0x1>;

			xlnx,edge-is-positive = <0x1>;

			xlnx,family = "virtex5";

			xlnx,endianness = <0x1>;

			xlnx,fpu-exception = <0x1>;

			xlnx,fsl-data-size = <0x20>;

			xlnx,fsl-exception = <0x0>;

			xlnx,fsl-links = <0x0>;

			xlnx,i-lmb = <0x1>;

			xlnx,i-opb = <0x0>;

			xlnx,i-plb = <0x1>;

			xlnx,icache-always-used = <0x1>;

			xlnx,icache-line-len = <0x4>;

			xlnx,icache-use-fsl = <0x1>;

			xlnx,ill-opcode-exception = <0x1>;

			xlnx,instance = "microblaze_0";

			xlnx,interconnect = <0x1>;

			xlnx,interrupt-is-edge = <0x0>;

			xlnx,iopb-bus-exception = <0x0>;

			xlnx,mmu-dtlb-size = <0x4>;

			xlnx,mmu-itlb-size = <0x2>;

			xlnx,mmu-tlb-access = <0x3>;

			xlnx,mmu-zones = <0x10>;

			xlnx,number-of-pc-brk = <0x1>;

			xlnx,number-of-rd-addr-brk = <0x0>;

			xlnx,number-of-wr-addr-brk = <0x0>;

			xlnx,opcode-0x0-illegal = <0x1>;

			xlnx,pvr = <0x2>;

			xlnx,pvr-user1 = <0x0>;

			xlnx,pvr-user2 = <0x0>;

			xlnx,reset-msr = <0x0>;

			xlnx,sco = <0x0>;

			xlnx,unaligned-exceptions = <0x1>;

			xlnx,use-barrel = <0x1>;

			xlnx,use-dcache = <0x1>;

			xlnx,use-div = <0x1>;

			xlnx,use-ext-brk = <0x1>;

			xlnx,use-ext-nm-brk = <0x1>;

			xlnx,use-extended-fsl-instr = <0x0>;

			xlnx,use-fpu = <0x2>;

			xlnx,use-hw-mul = <0x2>;

			xlnx,use-icache = <0x1>;

			xlnx,use-interrupt = <0x1>;

			xlnx,use-mmu = <0x3>;

			xlnx,use-msr-instr = <0x1>;

			xlnx,use-pcmp-instr = <0x1>;

		} ;

	} ;

	mb_plb: plb@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus";

		ranges ;

		FLASH: flash@a0000000 {

			bank-width = <2>;

			compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";

			reg = < 0xa0000000 0x2000000 >;

			xlnx,family = "virtex5";

			xlnx,include-datawidth-matching-0 = <0x1>;

			xlnx,include-datawidth-matching-1 = <0x0>;

			xlnx,include-datawidth-matching-2 = <0x0>;

			xlnx,include-datawidth-matching-3 = <0x0>;

			xlnx,include-negedge-ioregs = <0x0>;

			xlnx,include-plb-ipif = <0x1>;

			xlnx,include-wrbuf = <0x1>;

			xlnx,max-mem-width = <0x10>;

			xlnx,mch-native-dwidth = <0x20>;

			xlnx,mch-plb-clk-period-ps = <0x1f40>;

			xlnx,mch-splb-awidth = <0x20>;

			xlnx,mch0-accessbuf-depth = <0x10>;

			xlnx,mch0-protocol = <0x0>;

			xlnx,mch0-rddatabuf-depth = <0x10>;

			xlnx,mch1-accessbuf-depth = <0x10>;

			xlnx,mch1-protocol = <0x0>;

			xlnx,mch1-rddatabuf-depth = <0x10>;

			xlnx,mch2-accessbuf-depth = <0x10>;

			xlnx,mch2-protocol = <0x0>;

			xlnx,mch2-rddatabuf-depth = <0x10>;

			xlnx,mch3-accessbuf-depth = <0x10>;

			xlnx,mch3-protocol = <0x0>;

			xlnx,mch3-rddatabuf-depth = <0x10>;

			xlnx,mem0-width = <0x10>;

			xlnx,mem1-width = <0x20>;

			xlnx,mem2-width = <0x20>;

			xlnx,mem3-width = <0x20>;

			xlnx,num-banks-mem = <0x1>;

			xlnx,num-channels = <0x0>;

			xlnx,priority-mode = <0x0>;

			xlnx,synch-mem-0 = <0x0>;

			xlnx,synch-mem-1 = <0x0>;

			xlnx,synch-mem-2 = <0x0>;

			xlnx,synch-mem-3 = <0x0>;

			xlnx,synch-pipedelay-0 = <0x2>;

			xlnx,synch-pipedelay-1 = <0x2>;

			xlnx,synch-pipedelay-2 = <0x2>;

			xlnx,synch-pipedelay-3 = <0x2>;

			xlnx,tavdv-ps-mem-0 = <0x1adb0>;

			xlnx,tavdv-ps-mem-1 = <0x3a98>;

			xlnx,tavdv-ps-mem-2 = <0x3a98>;

			xlnx,tavdv-ps-mem-3 = <0x3a98>;

			xlnx,tcedv-ps-mem-0 = <0x1adb0>;

			xlnx,tcedv-ps-mem-1 = <0x3a98>;

			xlnx,tcedv-ps-mem-2 = <0x3a98>;

			xlnx,tcedv-ps-mem-3 = <0x3a98>;

			xlnx,thzce-ps-mem-0 = <0x88b8>;

			xlnx,thzce-ps-mem-1 = <0x1b58>;

			xlnx,thzce-ps-mem-2 = <0x1b58>;

			xlnx,thzce-ps-mem-3 = <0x1b58>;

			xlnx,thzoe-ps-mem-0 = <0x1b58>;

			xlnx,thzoe-ps-mem-1 = <0x1b58>;

			xlnx,thzoe-ps-mem-2 = <0x1b58>;

			xlnx,thzoe-ps-mem-3 = <0x1b58>;

			xlnx,tlzwe-ps-mem-0 = <0x88b8>;

			xlnx,tlzwe-ps-mem-1 = <0x0>;

			xlnx,tlzwe-ps-mem-2 = <0x0>;

			xlnx,tlzwe-ps-mem-3 = <0x0>;

			xlnx,twc-ps-mem-0 = <0x2af8>;

			xlnx,twc-ps-mem-1 = <0x3a98>;

			xlnx,twc-ps-mem-2 = <0x3a98>;

			xlnx,twc-ps-mem-3 = <0x3a98>;

			xlnx,twp-ps-mem-0 = <0x11170>;

			xlnx,twp-ps-mem-1 = <0x2ee0>;

			xlnx,twp-ps-mem-2 = <0x2ee0>;

			xlnx,twp-ps-mem-3 = <0x2ee0>;

			xlnx,xcl0-linesize = <0x4>;

			xlnx,xcl0-writexfer = <0x1>;

			xlnx,xcl1-linesize = <0x4>;

			xlnx,xcl1-writexfer = <0x1>;

			xlnx,xcl2-linesize = <0x4>;

			xlnx,xcl2-writexfer = <0x1>;

			xlnx,xcl3-linesize = <0x4>;

			xlnx,xcl3-writexfer = <0x1>;

		} ;

		Hard_Ethernet_MAC: xps-ll-temac@81c00000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "xlnx,compound";

			ranges ;

			ethernet@81c00000 {

				compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";

				interrupt-parent = <&xps_intc_0>;

				interrupts = < 5 2 >;

				llink-connected = <&PIM3>;

				local-mac-address = [ 00 0a 35 00 00 00 ];

				reg = < 0x81c00000 0x40 >;

				xlnx,bus2core-clk-ratio = <0x1>;

				xlnx,phy-type = <0x1>;

				xlnx,phyaddr = <0x1>;

				xlnx,rxcsum = <0x0>;

				xlnx,rxfifo = <0x1000>;

				xlnx,temac-type = <0x0>;

				xlnx,txcsum = <0x0>;

				xlnx,txfifo = <0x1000>;

			} ;

		} ;

		IIC_EEPROM: i2c@81600000 {

			compatible = "xlnx,xps-iic-2.00.a";

			interrupt-parent = <&xps_intc_0>;

			interrupts = < 6 2 >;

			reg = < 0x81600000 0x10000 >;

			xlnx,clk-freq = <0x7735940>;

			xlnx,family = "virtex5";

			xlnx,gpo-width = <0x1>;

			xlnx,iic-freq = <0x186a0>;

			xlnx,scl-inertial-delay = <0x0>;

			xlnx,sda-inertial-delay = <0x0>;

			xlnx,ten-bit-adr = <0x0>;

		} ;

		LEDs_8Bit: gpio@81400000 {

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

			interrupt-parent = <&xps_intc_0>;

			interrupts = < 7 2 >;

			reg = < 0x81400000 0x10000 >;

			xlnx,all-inputs = <0x0>;

			xlnx,all-inputs-2 = <0x0>;

			xlnx,dout-default = <0x0>;

			xlnx,dout-default-2 = <0x0>;

			xlnx,family = "virtex5";

			xlnx,gpio-width = <0x8>;

			xlnx,interrupt-present = <0x1>;

			xlnx,is-bidir = <0x1>;

			xlnx,is-bidir-2 = <0x1>;

			xlnx,is-dual = <0x0>;

			xlnx,tri-default = <0xffffffff>;

			xlnx,tri-default-2 = <0xffffffff>;

			#gpio-cells = <2>;

			gpio-controller;

		} ;



		gpio-leds {

			compatible = "gpio-leds";



			heartbeat {

				label = "Heartbeat";

				gpios = <&LEDs_8Bit 4 1>;

				linux,default-trigger = "heartbeat";

			};



			yellow {

				label = "Yellow";

				gpios = <&LEDs_8Bit 5 1>;

			};



			red {

				label = "Red";

				gpios = <&LEDs_8Bit 6 1>;

			};



			green {

				label = "Green";

				gpios = <&LEDs_8Bit 7 1>;

			};

		} ;

		RS232_Uart_1: serial@84000000 {

			clock-frequency = <125000000>;

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

			current-speed = <115200>;

			device_type = "serial";

			interrupt-parent = <&xps_intc_0>;

			interrupts = < 8 0 >;

			port-number = <0>;

			reg = < 0x84000000 0x10000 >;

			xlnx,baudrate = <0x1c200>;

			xlnx,data-bits = <0x8>;

			xlnx,family = "virtex5";

			xlnx,odd-parity = <0x0>;

			xlnx,use-parity = <0x0>;

		} ;

		SysACE_CompactFlash: sysace@83600000 {

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

			interrupt-parent = <&xps_intc_0>;

			interrupts = < 4 2 >;

			reg = < 0x83600000 0x10000 >;

			xlnx,family = "virtex5";

			xlnx,mem-width = <0x10>;

		} ;

		debug_module: debug@84400000 {

			compatible = "xlnx,mdm-1.00.d";

			reg = < 0x84400000 0x10000 >;

			xlnx,family = "virtex5";

			xlnx,interconnect = <0x1>;

			xlnx,jtag-chain = <0x2>;

			xlnx,mb-dbg-ports = <0x1>;

			xlnx,uart-width = <0x8>;

			xlnx,use-uart = <0x1>;

			xlnx,write-fsl-ports = <0x0>;

		} ;

		mpmc@90000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "xlnx,mpmc-4.02.a";

			ranges ;

			PIM3: sdma@84600180 {

				compatible = "xlnx,ll-dma-1.00.a";

				interrupt-parent = <&xps_intc_0>;

				interrupts = < 2 2 1 2 >;

				reg = < 0x84600180 0x80 >;

			} ;

		} ;

		xps_intc_0: interrupt-controller@81800000 {

			#interrupt-cells = <0x2>;

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

			interrupt-controller ;

			reg = < 0x81800000 0x10000 >;

			xlnx,kind-of-intr = <0x100>;

			xlnx,num-intr-inputs = <0x9>;

		} ;

		xps_timer_1: timer@83c00000 {

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

			interrupt-parent = <&xps_intc_0>;

			interrupts = < 3 2 >;

			reg = < 0x83c00000 0x10000 >;

			xlnx,count-width = <0x20>;

			xlnx,family = "virtex5";

			xlnx,gen0-assert = <0x1>;

			xlnx,gen1-assert = <0x1>;

			xlnx,one-timer-only = <0x0>;

			xlnx,trig0-assert = <0x1>;

			xlnx,trig1-assert = <0x1>;

		} ;

	} ;

}  ;