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

Commit 4342d647 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

ARM: at91: make matrix register base soc independent 



Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Reviewed-by: default avatarRyan Mallon <rmallon@gmail.com>
Cc: linux-usb@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fac36a5a

arch/arm/mach-at91/at91sam9260.c

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ static void __init at91sam9260_ioremap_registers(void) 
	at91_ioremap_rstc(AT91SAM9260_BASE_RSTC);

	at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);

	at91_ioremap_matrix(AT91SAM9260_BASE_MATRIX);

}



static void __init at91sam9260_initialize(void)

arch/arm/mach-at91/at91sam9260_devices.c

+5 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <mach/cpu.h>

#include <mach/at91sam9260.h>

#include <mach/at91sam9260_matrix.h>

#include <mach/at91_matrix.h>

#include <mach/at91sam9_smc.h>



#include "generic.h"
@@ -422,8 +423,8 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) 
	if (!data)

		return;



	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);

	csa = at91_matrix_read(AT91_MATRIX_EBICSA);

	at91_matrix_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);



	/* enable pin */

	if (gpio_is_valid(data->enable_pin))
@@ -1265,7 +1266,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data) 
	if (!data)

		return;



	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	csa = at91_matrix_read(AT91_MATRIX_EBICSA);



	switch (data->chipselect) {

	case 4:
@@ -1288,7 +1289,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data) 
		return;

	}



	at91_sys_write(AT91_MATRIX_EBICSA, csa);

	at91_matrix_write(AT91_MATRIX_EBICSA, csa);



	if (gpio_is_valid(data->rst_pin)) {

		at91_set_multi_drive(data->rst_pin, 0);

arch/arm/mach-at91/at91sam9261.c

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ static void __init at91sam9261_ioremap_registers(void) 
	at91_ioremap_rstc(AT91SAM9261_BASE_RSTC);

	at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);

	at91_ioremap_matrix(AT91SAM9261_BASE_MATRIX);

}



static void __init at91sam9261_initialize(void)

arch/arm/mach-at91/at91sam9261_devices.c

+3 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <mach/board.h>

#include <mach/at91sam9261.h>

#include <mach/at91sam9261_matrix.h>

#include <mach/at91_matrix.h>

#include <mach/at91sam9_smc.h>



#include "generic.h"
@@ -236,8 +237,8 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) 
	if (!data)

		return;



	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);

	csa = at91_matrix_read(AT91_MATRIX_EBICSA);

	at91_matrix_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);



	/* enable pin */

	if (gpio_is_valid(data->enable_pin))

arch/arm/mach-at91/at91sam9263.c

+1 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ static void __init at91sam9263_ioremap_registers(void) 
	at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);

	at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);

	at91_ioremap_matrix(AT91SAM9263_BASE_MATRIX);

}



static void __init at91sam9263_initialize(void)