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

Commit 00e98a99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  8250 Serial Driver: revert extra IRQ flag definition patch
  Blackfin arch: update anomaly headers from toolchain trunk
  Blackfin arch: Remove bad and usless code
  Blackfin arch: Fix bug - set corret SSEL and IRQ to enable AD7877 on BF527
  Blackfin arch: Fix typo. it should be _outsw_8
  Blackfin arch: Cleanup no functional changes
parents f365ad5f a4ed1e41

arch/blackfin/kernel/gptimers.c

+1 −1
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 


#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/io.h>



#include <asm/io.h>

#include <asm/blackfin.h>

#include <asm/gptimers.h>

arch/blackfin/lib/outs.S

+1 −1
Original line number Diff line number Diff line
@@ -76,4 +76,4 @@ ENTRY(_outsw_8) 
		R0 = R0 + R1;

.Lword8_loop_e: W[P0] = R0;

	RTS;

ENDPROC(_outsw)
 
ENDPROC(_outsw_8)

arch/blackfin/mach-bf527/boards/ezkit.c

+2 −2
Original line number Diff line number Diff line
@@ -647,10 +647,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	{

		.modalias		= "ad7877",

		.platform_data		= &bfin_ad7877_ts_info,

		.irq			= IRQ_PF6,

		.irq			= IRQ_PF8,

		.max_speed_hz	= 12500000,     /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select  = 1,

		.chip_select  = 2,

		.controller_data = &spi_ad7877_chip_info,

	},

#endif

arch/blackfin/mach-bf537/boards/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



obj-$(CONFIG_GENERIC_BF537_BOARD)      += generic_board.o

obj-$(CONFIG_BFIN537_STAMP)            += stamp.o led.o

obj-$(CONFIG_BFIN537_STAMP)            += stamp.o

obj-$(CONFIG_BFIN537_BLUETECHNIX_CM)   += cm_bf537.o

obj-$(CONFIG_PNAV10)                   += pnav10.o

obj-$(CONFIG_CAMSIG_MINOTAUR)          += minotaur.o

arch/blackfin/mach-bf537/boards/led.S

deleted100644 → 0
+0 −183
Original line number Diff line number Diff line 
/****************************************************

 * LED1 ---- PF6        LED2 ---- PF7               *

 * LED3 ---- PF8        LED4 ---- PF9               *

 * LED5 ---- PF10       LED6 ---- PF11              *

 ****************************************************/



#include <linux/linkage.h>

#include <asm/blackfin.h>



/* All functions in this file save the registers they uses.

   So there is no need to save any registers before calling them.  */



	.text;



/* Initialize LEDs.  */



ENTRY(_led_init)

	LINK 12;

	[--SP] = P0;

	[--SP] = R0;

	[--SP] = R1;

	[--SP] = R2;

	R1 = PF6|PF7|PF8|PF9|PF10|PF11 (Z);

	R2 = ~R1;



	P0.H = hi(PORTF_FER);

	P0.L = lo(PORTF_FER);

	R0 = W[P0](Z);

	SSYNC;

	R0 = R0 & R2;

	W[P0] = R0.L;

	SSYNC;



	P0.H = hi(PORTFIO_DIR);

	P0.L = lo(PORTFIO_DIR);

	R0 = W[P0](Z);

	SSYNC;

	R0 = R0 | R1;

	W[P0] = R0.L;

	SSYNC;



	P0.H = hi(PORTFIO_INEN);

	P0.L = lo(PORTFIO_INEN);

	R0 = W[P0](Z);

	SSYNC;

	R0 = R0 & R2;

	W[P0] = R0.L;

	SSYNC;



	R2 = [SP++];

	R1 = [SP++];

	R0 = [SP++];

	P0 = [SP++];

	UNLINK;

	RTS;

	.size	_led_init, .-_led_init



/* Set one LED on. Leave other LEDs unchanged.

   It expects the LED number passed through R0.  */



ENTRY(_led_on)

	LINK 12;

	[--SP] = P0;

	[--SP] = R1;

	CALL _led_init;

	R1 = 1;

	R0 += 5;

	R1 <<= R0;

	P0.H = hi(PORTFIO);

	P0.L = lo(PORTFIO);

	R0 = W[P0](Z);

	SSYNC;

	R0 = R0 | R1;

	W[P0] = R0.L;

	SSYNC;

	R1 = [SP++];

	P0 = [SP++];

	UNLINK;

	RTS;

	.size	_led_on, .-_led_on



/* Set one LED off. Leave other LEDs unchanged.  */



ENTRY(_led_off)

	LINK 12;

	[--SP] = P0;

	[--SP] = R1;

	CALL _led_init;

	R1 = 1;

	R0 += 5;

	R1 <<= R0;

	R1 = ~R1;

	P0.H = hi(PORTFIO);

	P0.L = lo(PORTFIO);

	R0 = W[P0](Z);

	SSYNC;

	R0 = R0 & R1;

	W[P0] = R0.L;

	SSYNC;

	R1 = [SP++];

	P0 = [SP++];

	UNLINK;

	RTS;

	.size	_led_off, .-_led_off



/* Toggle one LED. Leave other LEDs unchanged.  */



ENTRY(_led_toggle)

	LINK 12;

	[--SP] = P0;

	[--SP] = R1;

	CALL _led_init;

	R1 = 1;

	R0 += 5;

	R1 <<= R0;

	P0.H = hi(PORTFIO);

	P0.L = lo(PORTFIO);

	R0 = W[P0](Z);

	SSYNC;

	R0 = R0 ^ R1;

	W[P0] = R0.L;

	SSYNC;

	R1 = [SP++];

	P0 = [SP++];

	UNLINK;

	RTS;

	.size	_led_toggle, .-_led_toggle



/* Display the number using LEDs in binary format.  */



ENTRY(_led_disp_num)

	LINK 12;

	[--SP] = P0;

	[--SP] = R1;

	[--SP] = R2;

	CALL _led_init;

	R1 = 0x3f(X);

	R0 = R0 & R1;

	R2 = 6(X);

	R0 <<= R2;

	R1 <<= R2;

	P0.H = hi(PORTFIO);

	P0.L = lo(PORTFIO);

	R2 = W[P0](Z);

	SSYNC;

	R1 = ~R1;

	R2 = R2 & R1;

	R2 = R2 | R0;

	W[P0] = R2.L;

	SSYNC;

	R2 = [SP++];

	R1 = [SP++];

	P0 = [SP++];

	UNLINK;

	RTS;

	.size	_led_disp_num, .-_led_disp_num



/* Toggle the number using LEDs in binary format.  */



ENTRY(_led_toggle_num)

	LINK 12;

	[--SP] = P0;

	[--SP] = R1;

	[--SP] = R2;

	CALL _led_init;

	R1 = 0x3f(X);

	R0 = R0 & R1;

	R1 = 6(X);

	R0 <<= R1;

	P0.H = hi(PORTFIO);

	P0.L = lo(PORTFIO);

	R1 = W[P0](Z);

	SSYNC;

	R1 = R1 ^ R0;

	W[P0] = R1.L;

	SSYNC;

	R2 = [SP++];

	R1 = [SP++];

	P0 = [SP++];

	UNLINK;

	RTS;

	.size	_led_toggle_num, .-_led_toggle_num