Commit 7b557376 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Input Serio: Blackfin doesnt support I8042 - make sure it doesnt get selected
  Blackfin arch: add BF54x I2C/TWI TWI0 driver support
  Blackfin On-Chip RTC driver update for supporting BF54x
  Blackfin Ethernet MAC driver: fix bug Report returned -ENOMEM upwards (in case L1/uncached memory alloc fails)
  Blackfin arch: add error message when IRQ no available
  Blackfin arch: Initialize the exception vectors early in the boot process
  Blackfin arch: fix a compiling warning about dma-mapping
  Blackfin arch: switch to using proper defines this time THREAD_SIZE and PAGE_SIZE instead of just PAGE_SIZE everywhere
  Blackfin arch: fix bug which unaligns the init thread's stack and causes the current macro to fail.
  Blackfin arch: Load P0 before storing through it
  Blackfin arch: fix KGDB bug, dont forget last parameter.
  Blackfin arch: add selections for BF544 and BF542
  Blackfin arch: use bfin_read_SWRST() now that BF561 provides it
  Blackfin arch: setup aliases for some core Core A MMRs
parents 8e8ef297 27b92bdb

arch/blackfin/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ machine-$(CONFIG_BF533) := bf533 
machine-$(CONFIG_BF534) := bf537

machine-$(CONFIG_BF536) := bf537

machine-$(CONFIG_BF537) := bf537

machine-$(CONFIG_BF542) := bf548

machine-$(CONFIG_BF544) := bf548

machine-$(CONFIG_BF548) := bf548

machine-$(CONFIG_BF549) := bf548

machine-$(CONFIG_BF561) := bf561
@@ -36,6 +38,8 @@ cpu-$(CONFIG_BF533) := bf533 
cpu-$(CONFIG_BF534) := bf534

cpu-$(CONFIG_BF536) := bf536

cpu-$(CONFIG_BF537) := bf537

cpu-$(CONFIG_BF542) := bf542

cpu-$(CONFIG_BF544) := bf544

cpu-$(CONFIG_BF548) := bf548

cpu-$(CONFIG_BF549) := bf549

cpu-$(CONFIG_BF561) := bf561

arch/blackfin/kernel/dma-mapping.c

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, 
	BUG_ON(direction == DMA_NONE);



	for (i = 0; i < nents; i++, sg++) {

		sg->dma_address = page_address(sg->page) + sg->offset;

		sg->dma_address = (dma_addr_t)(page_address(sg->page) +

					sg->offset);



		invalidate_dcache_range(sg_dma_address(sg),

					sg_dma_address(sg) +

arch/blackfin/kernel/setup.c

+1 −4
Original line number Diff line number Diff line
@@ -402,11 +402,7 @@ void __init setup_arch(char **cmdline_p) 
	if (l1_length > L1_DATA_A_LENGTH)

		panic("L1 data memory overflow\n");



#ifdef BF561_FAMILY

	_bfin_swrst = bfin_read_SICA_SWRST();

#else

	_bfin_swrst = bfin_read_SWRST();

#endif



	/* Copy atomic sequences to their fixed location, and sanity check that

	   these locations are the ones that we advertise to userspace.  */
@@ -429,6 +425,7 @@ void __init setup_arch(char **cmdline_p) 
	BUG_ON((char *)&atomic_xor32 - (char *)&fixed_code_start

	       != ATOMIC_XOR32 - FIXED_CODE_START);



	init_exception_vectors();

	bf53x_cache_init();

}

arch/blackfin/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ asmlinkage void trap_c(struct pt_regs *fp) 
#ifdef CONFIG_KGDB

# define CHK_DEBUGGER_TRAP() \

	do { \

		CHK_DEBUGGER(trapnr, sig, info.si_code, fp); \

		CHK_DEBUGGER(trapnr, sig, info.si_code, fp, ); \

	} while (0)

# define CHK_DEBUGGER_TRAP_MAYBE() \

	do { \

arch/blackfin/kernel/vmlinux.lds.S

+10 −6
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <asm-generic/vmlinux.lds.h>

#include <asm/mem_map.h>

#include <asm/page.h>

#include <asm/thread_info.h>



OUTPUT_FORMAT("elf32-bfin")

ENTRY(__start)
@@ -64,8 +65,12 @@ SECTIONS 


	.data :

	{

		. = ALIGN(PAGE_SIZE);

		/* make sure the init_task is aligned to the

		 * kernel thread size so we can locate the kernel

		 * stack properly and quickly.

		 */

		__sdata = .;

		. = ALIGN(THREAD_SIZE);

		*(.data.init_task)

		DATA_DATA

		CONSTRUCTORS
@@ -73,14 +78,14 @@ SECTIONS 
		. = ALIGN(32);

		*(.data.cacheline_aligned)



		. = ALIGN(PAGE_SIZE);

		. = ALIGN(THREAD_SIZE);

		__edata = .;

	}



	. = ALIGN(PAGE_SIZE);

	___init_begin = .;

	.init :

	{

		. = ALIGN(PAGE_SIZE);

		__sinittext = .;

		*(.init.text)

		__einittext = .;
@@ -153,10 +158,9 @@ SECTIONS 
		__ebss_b_l1 = .;

	}



	. = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);

	___init_end = ALIGN(PAGE_SIZE);

	___init_end = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);



	.bss ___init_end :

	.bss LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1) :

	{

		. = ALIGN(4);

		___bss_start = .;

CRA Git | Maintained and supported by SUSTech CRA and CCSE