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

Commit 7f6e2d99 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 4231/1: AT91: Merge and typo fixes. 



The duplicate file "include/asm-arm/arch-at91rm9200/entry-macro.S" can
be removed - it was already moved to include/asm-arm/arch-at91/.

Fix 3 small typo's - two in comments, and the incorrect clock was
specified for the LCD device.

Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f8dbf45f

arch/arm/mach-at91/at91sam9263.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static struct clk isi_clk = { 
};

static struct clk lcdc_clk = {

	.name		= "lcdc_clk",

	.pmc_mask	= 1 << AT91SAM9263_ID_ISI,

	.pmc_mask	= 1 << AT91SAM9263_ID_LCDC,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ohci_clk = {

arch/arm/mach-at91/at91sam9263_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) 
	if (enable_spi0) {

		at91_set_B_periph(AT91_PIN_PA0, 0);	/* SPI0_MISO */

		at91_set_B_periph(AT91_PIN_PA1, 0);	/* SPI0_MOSI */

		at91_set_B_periph(AT91_PIN_PA2, 0);	/* SPI1_SPCK */

		at91_set_B_periph(AT91_PIN_PA2, 0);	/* SPI0_SPCK */



		at91_clock_associate("spi0_clk", &at91sam9263_spi0_device.dev, "spi_clk");

		platform_device_register(&at91sam9263_spi0_device);

include/asm-arm/arch-at91/hardware.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


/*

 * Remap the peripherals from address 0xFFF78000 .. 0xFFFFFFFF

 * to 0xFEF78000 .. 0xFF000000.  (5444Kb)

 * to 0xFEF78000 .. 0xFF000000.  (544Kb)

 */

#define AT91_IO_PHYS_BASE	0xFFF78000

#define AT91_IO_SIZE		(0xFFFFFFFF - AT91_IO_PHYS_BASE + 1)

include/asm-arm/arch-at91rm9200/entry-macro.S

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

 * include/asm-arm/arch-at91rm9200/entry-macro.S

 *

 *  Copyright (C) 2003-2005 SAN People

 *

 * Low-level IRQ helper macros for AT91RM9200 platforms

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#include <asm/hardware.h>

#include <asm/arch/at91_aic.h>



	.macro	disable_fiq

	.endm



	.macro  get_irqnr_preamble, base, tmp

	.endm



	.macro  arch_ret_to_user, tmp1, tmp2

	.endm



	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

	ldr	\base, =(AT91_VA_BASE_SYS)		@ base virtual address of SYS peripherals

	ldr	\irqnr, [\base, #AT91_AIC_IVR]		@ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt)

	ldr	\irqstat, [\base, #AT91_AIC_ISR]	@ read interrupt source number

	teq	\irqstat, #0				@ ISR is 0 when no current interrupt, or spurious interrupt

	streq	\tmp, [\base, #AT91_AIC_EOICR]		@ not going to be handled further, then ACK it now.

	.endm