 8287361abc
			
		
	
	
	8287361abc
	
	
	
		
			
			This is a collection of header file cleanups, mostly for OMAP and AT91, that keeps moving the platforms in the direction of multiplatform by removing the need for mach-dependent header files used in drivers and other places. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQx2reAAoJEIwa5zzehBx3Z/oQAIHp8aXbUD0GvbBPQ2vIydZ8 Qfdh2ypbyFB9GSLmPP6BhurEFUcwmW3MH2r9Kq68omPt4XxrFEt1SdEn3TgZlhTY YYzEv2DLbWfmKCDBFAEFullsfVkrpggyou5ty30YVp/u2lVLvChpkciE5/9HADy5 uoh/W2KZcLE51tvnbRy/1DBaOtxEdCjJ9hTaef7FCB9ugOG+yMDYwIPRW/b4fNA6 o/1NuZTWp0H4ePRG2oqLxYnjSiF63DVTJZjSJ+c5gW34bWgh8+/xzaLFA9U++/ig meGUD1Oe65+ctr+Wk2mV29eb02jauUe6qvkwt+iFIDDopgc2mn5BcW+ENpgpjhe3 6l3ClRd94qh4cMWzqDa5PZCdetshiKqSH2IGpKS/dHNB1h5sBP7CCbvbalwzWd5n qjfkPC7kSFyU3XV+9SEAXE6HLKsiMQy9kRcKOMdTE5BA4FEAZk0wfiG9WcVCvS2D 9tDC3X0aScyXx4Mkd4wIAZVhY68QuI17fPft9zZSj691YiUW5cR2yF1qbCka0yd5 pHu/QSZg1+dUitMUvMPQmWJ15jnAtEYUtV/8zQFFVchgkxlrW+UtvW3zxghB6D+J ZwcjAMfQQz9fLoMQXlVovjQIhYsjw3SlV62ReBH7eyPs3+KfPIBn7Ks6mVQs3dS5 AMUWORsB5u92XHl9EL9C =aggA -----END PGP SIGNATURE----- Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC Header cleanups from Olof Johansson: "This is a collection of header file cleanups, mostly for OMAP and AT91, that keeps moving the platforms in the direction of multiplatform by removing the need for mach-dependent header files used in drivers and other places." Fix up mostly trivial conflicts as per Olof. * tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (106 commits) ARM: OMAP2+: Move iommu/iovmm headers to platform_data ARM: OMAP2+: Make some definitions local ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h ARM: OMAP2+: Move iopgtable header to drivers/iommu/ ARM: OMAP: Merge iommu2.h into iommu.h atmel: move ATMEL_MAX_UART to platform_data/atmel.h ARM: OMAP: Remove omap_init_consistent_dma_size() arm: at91: move at91rm9200 rtc header in drivers/rtc arm: at91: move reset controller header to arm/arm/mach-at91 arm: at91: move pit define to the driver arm: at91: move at91_shdwc.h to arch/arm/mach-at91 arm: at91: move board header to arch/arm/mach-at91 arn: at91: move at91_tc.h to arch/arm/mach-at91 arm: at91 move at91_aic.h to arch/arm/mach-at91 arm: at91 move board.h to arch/arm/mach-at91 arm: at91: move platfarm_data to include/linux/platform_data/atmel.h arm: at91: drop machine defconfig ARM: OMAP: Remove NEED_MACH_GPIO_H ARM: OMAP: Remove unnecessary mach and plat includes ...
		
			
				
	
	
		
			233 lines
		
	
	
	
		
			5.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			233 lines
		
	
	
	
		
			5.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * SoC specific setup code for the AT91SAM9N12
 | |
|  *
 | |
|  * Copyright (C) 2012 Atmel Corporation.
 | |
|  *
 | |
|  * Licensed under GPLv2 or later.
 | |
|  */
 | |
| 
 | |
| #include <linux/module.h>
 | |
| #include <linux/dma-mapping.h>
 | |
| 
 | |
| #include <asm/irq.h>
 | |
| #include <asm/mach/arch.h>
 | |
| #include <asm/mach/map.h>
 | |
| #include <mach/at91sam9n12.h>
 | |
| #include <mach/at91_pmc.h>
 | |
| #include <mach/cpu.h>
 | |
| 
 | |
| #include "board.h"
 | |
| #include "soc.h"
 | |
| #include "generic.h"
 | |
| #include "clock.h"
 | |
| #include "sam9_smc.h"
 | |
| 
 | |
| /* --------------------------------------------------------------------
 | |
|  *  Clocks
 | |
|  * -------------------------------------------------------------------- */
 | |
| 
 | |
| /*
 | |
|  * The peripheral clocks.
 | |
|  */
 | |
| static struct clk pioAB_clk = {
 | |
| 	.name		= "pioAB_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_PIOAB,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk pioCD_clk = {
 | |
| 	.name		= "pioCD_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_PIOCD,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk usart0_clk = {
 | |
| 	.name		= "usart0_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_USART0,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk usart1_clk = {
 | |
| 	.name		= "usart1_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_USART1,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk usart2_clk = {
 | |
| 	.name		= "usart2_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_USART2,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk usart3_clk = {
 | |
| 	.name		= "usart3_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_USART3,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk twi0_clk = {
 | |
| 	.name		= "twi0_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_TWI0,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk twi1_clk = {
 | |
| 	.name		= "twi1_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_TWI1,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk mmc_clk = {
 | |
| 	.name		= "mci_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_MCI,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk spi0_clk = {
 | |
| 	.name		= "spi0_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_SPI0,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk spi1_clk = {
 | |
| 	.name		= "spi1_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_SPI1,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk uart0_clk = {
 | |
| 	.name		= "uart0_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_UART0,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk uart1_clk = {
 | |
| 	.name		= "uart1_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_UART1,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk tcb_clk = {
 | |
| 	.name		= "tcb_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_TCB,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk pwm_clk = {
 | |
| 	.name		= "pwm_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_PWM,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk adc_clk = {
 | |
| 	.name		= "adc_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_ADC,
 | |
| 	.type	= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk dma_clk = {
 | |
| 	.name		= "dma_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_DMA,
 | |
| 	.type	= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk uhp_clk = {
 | |
| 	.name		= "uhp",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_UHP,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk udp_clk = {
 | |
| 	.name		= "udp_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_UDP,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk lcdc_clk = {
 | |
| 	.name		= "lcdc_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_LCDC,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| static struct clk ssc_clk = {
 | |
| 	.name		= "ssc_clk",
 | |
| 	.pmc_mask	= 1 << AT91SAM9N12_ID_SSC,
 | |
| 	.type		= CLK_TYPE_PERIPHERAL,
 | |
| };
 | |
| 
 | |
| static struct clk *periph_clocks[] __initdata = {
 | |
| 	&pioAB_clk,
 | |
| 	&pioCD_clk,
 | |
| 	&usart0_clk,
 | |
| 	&usart1_clk,
 | |
| 	&usart2_clk,
 | |
| 	&usart3_clk,
 | |
| 	&twi0_clk,
 | |
| 	&twi1_clk,
 | |
| 	&mmc_clk,
 | |
| 	&spi0_clk,
 | |
| 	&spi1_clk,
 | |
| 	&lcdc_clk,
 | |
| 	&uart0_clk,
 | |
| 	&uart1_clk,
 | |
| 	&tcb_clk,
 | |
| 	&pwm_clk,
 | |
| 	&adc_clk,
 | |
| 	&dma_clk,
 | |
| 	&uhp_clk,
 | |
| 	&udp_clk,
 | |
| 	&ssc_clk,
 | |
| };
 | |
| 
 | |
| static struct clk_lookup periph_clocks_lookups[] = {
 | |
| 	/* lookup table for DT entries */
 | |
| 	CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),
 | |
| 	CLKDEV_CON_DEV_ID("usart", "f801c000.serial", &usart0_clk),
 | |
| 	CLKDEV_CON_DEV_ID("usart", "f8020000.serial", &usart1_clk),
 | |
| 	CLKDEV_CON_DEV_ID("usart", "f8024000.serial", &usart2_clk),
 | |
| 	CLKDEV_CON_DEV_ID("usart", "f8028000.serial", &usart3_clk),
 | |
| 	CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb_clk),
 | |
| 	CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb_clk),
 | |
| 	CLKDEV_CON_DEV_ID("mci_clk", "f0008000.mmc", &mmc_clk),
 | |
| 	CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma_clk),
 | |
| 	CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
 | |
| 	CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
 | |
| 	CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioAB_clk),
 | |
| 	CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioAB_clk),
 | |
| 	CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCD_clk),
 | |
| 	CLKDEV_CON_DEV_ID(NULL, "fffffa00.gpio", &pioCD_clk),
 | |
| 	/* additional fake clock for macb_hclk */
 | |
| 	CLKDEV_CON_DEV_ID("hclk", "500000.ohci", &uhp_clk),
 | |
| 	CLKDEV_CON_DEV_ID("ohci_clk", "500000.ohci", &uhp_clk),
 | |
| };
 | |
| 
 | |
| /*
 | |
|  * The two programmable clocks.
 | |
|  * You must configure pin multiplexing to bring these signals out.
 | |
|  */
 | |
| static struct clk pck0 = {
 | |
| 	.name		= "pck0",
 | |
| 	.pmc_mask	= AT91_PMC_PCK0,
 | |
| 	.type		= CLK_TYPE_PROGRAMMABLE,
 | |
| 	.id		= 0,
 | |
| };
 | |
| static struct clk pck1 = {
 | |
| 	.name		= "pck1",
 | |
| 	.pmc_mask	= AT91_PMC_PCK1,
 | |
| 	.type		= CLK_TYPE_PROGRAMMABLE,
 | |
| 	.id		= 1,
 | |
| };
 | |
| 
 | |
| static void __init at91sam9n12_register_clocks(void)
 | |
| {
 | |
| 	int i;
 | |
| 
 | |
| 	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
 | |
| 		clk_register(periph_clocks[i]);
 | |
| 	clk_register(&pck0);
 | |
| 	clk_register(&pck1);
 | |
| 
 | |
| 	clkdev_add_table(periph_clocks_lookups,
 | |
| 			 ARRAY_SIZE(periph_clocks_lookups));
 | |
| 
 | |
| }
 | |
| 
 | |
| /* --------------------------------------------------------------------
 | |
|  *  AT91SAM9N12 processor initialization
 | |
|  * -------------------------------------------------------------------- */
 | |
| 
 | |
| static void __init at91sam9n12_map_io(void)
 | |
| {
 | |
| 	at91_init_sram(0, AT91SAM9N12_SRAM_BASE, AT91SAM9N12_SRAM_SIZE);
 | |
| }
 | |
| 
 | |
| void __init at91sam9n12_initialize(void)
 | |
| {
 | |
| 	at91_extern_irq = (1 << AT91SAM9N12_ID_IRQ0);
 | |
| }
 | |
| 
 | |
| AT91_SOC_START(sam9n12)
 | |
| 	.map_io = at91sam9n12_map_io,
 | |
| 	.register_clocks = at91sam9n12_register_clocks,
 | |
| 	.init = at91sam9n12_initialize,
 | |
| AT91_SOC_END
 |