Commit b31706a2 authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

ARM: at91: remove clock data in at91sam9n12.c and at91sam9x5.c files 



As the CONFIG_OLD_CLK_AT91 option is gone, let's completely remove the AT91
old clock driver related data.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarBoris BREZILLON <boris.brezillon@free-electrons.com>
parent ef7eda2c

arch/arm/mach-at91/at91sam9n12.c

+2 −211
Original line number Diff line number Diff line
@@ -6,219 +6,11 @@ 
 * Licensed under GPLv2 or later.

 */



#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <linux/clk/at91_pmc.h>

#include <asm/system_misc.h>

#include <mach/hardware.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/at91sam9n12.h>

#include <mach/cpu.h>



#include "board.h"

#include "soc.h"

#include "generic.h"

#include "sam9_smc.h"



#if defined(CONFIG_OLD_CLK_AT91)

#include "clock.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(NULL, "f0010000.ssc", &ssc_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("spi_clk", "f0000000.spi", &spi0_clk),

	CLKDEV_CON_DEV_ID("spi_clk", "f0004000.spi", &spi1_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),

	CLKDEV_CON_DEV_ID(NULL, "f8034000.pwm", &pwm_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));



}

#else

#define at91sam9n12_register_clocks NULL

#endif



/* --------------------------------------------------------------------

 *  AT91SAM9N12 processor initialization
@@ -236,6 +28,5 @@ static void __init at91sam9n12_initialize(void) 


AT91_SOC_START(at91sam9n12)

	.map_io = at91sam9n12_map_io,

	.register_clocks = at91sam9n12_register_clocks,

	.init = at91sam9n12_initialize,

AT91_SOC_END

arch/arm/mach-at91/at91sam9x5.c

+2 −309
Original line number Diff line number Diff line
@@ -6,317 +6,11 @@ 
 * Licensed under GPLv2 or later.

 */



#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <linux/clk/at91_pmc.h>

#include <asm/system_misc.h>

#include <mach/hardware.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/at91sam9x5.h>

#include <mach/cpu.h>



#include "board.h"

#include "soc.h"

#include "generic.h"

#include "sam9_smc.h"



#if defined(CONFIG_OLD_CLK_AT91)

#include "clock.h"

/* --------------------------------------------------------------------

 *  Clocks

 * -------------------------------------------------------------------- */



/*

 * The peripheral clocks.

 */

static struct clk pioAB_clk = {

	.name		= "pioAB_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_PIOAB,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pioCD_clk = {

	.name		= "pioCD_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_PIOCD,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk smd_clk = {

	.name		= "smd_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_SMD,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart0_clk = {

	.name		= "usart0_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_USART0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart1_clk = {

	.name		= "usart1_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_USART1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart2_clk = {

	.name		= "usart2_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_USART2,

	.type		= CLK_TYPE_PERIPHERAL,

};

/* USART3 clock - Only for sam9g25/sam9x25 */

static struct clk usart3_clk = {

	.name		= "usart3_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_USART3,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk twi0_clk = {

	.name		= "twi0_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_TWI0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk twi1_clk = {

	.name		= "twi1_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_TWI1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk twi2_clk = {

	.name		= "twi2_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_TWI2,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk mmc0_clk = {

	.name		= "mci0_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_MCI0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk spi0_clk = {

	.name		= "spi0_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_SPI0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk spi1_clk = {

	.name		= "spi1_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_SPI1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk uart0_clk = {

	.name		= "uart0_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_UART0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk uart1_clk = {

	.name		= "uart1_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_UART1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tcb0_clk = {

	.name		= "tcb0_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_TCB,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pwm_clk = {

	.name		= "pwm_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_PWM,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk adc_clk = {

	.name		= "adc_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_ADC,

	.type	= CLK_TYPE_PERIPHERAL,

};

static struct clk adc_op_clk = {

	.name		= "adc_op_clk",

	.type		= CLK_TYPE_PERIPHERAL,

	.rate_hz	= 5000000,

};

static struct clk dma0_clk = {

	.name		= "dma0_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_DMA0,

	.type	= CLK_TYPE_PERIPHERAL,

};

static struct clk dma1_clk = {

	.name		= "dma1_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_DMA1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk uhphs_clk = {

	.name		= "uhphs",

	.pmc_mask	= 1 << AT91SAM9X5_ID_UHPHS,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk udphs_clk = {

	.name		= "udphs_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_UDPHS,

	.type		= CLK_TYPE_PERIPHERAL,

};

/* emac0 clock - Only for sam9g25/sam9x25/sam9g35/sam9x35 */

static struct clk macb0_clk = {

	.name		= "pclk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_EMAC0,

	.type		= CLK_TYPE_PERIPHERAL,

};

/* lcd clock - Only for sam9g15/sam9g35/sam9x35 */

static struct clk lcdc_clk = {

	.name		= "lcdc_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_LCDC,

	.type		= CLK_TYPE_PERIPHERAL,

};

/* isi clock - Only for sam9g25 */

static struct clk isi_clk = {

	.name		= "isi_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_ISI,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk mmc1_clk = {

	.name		= "mci1_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_MCI1,

	.type		= CLK_TYPE_PERIPHERAL,

};

/* emac1 clock - Only for sam9x25 */

static struct clk macb1_clk = {

	.name		= "pclk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_EMAC1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ssc_clk = {

	.name		= "ssc_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_SSC,

	.type		= CLK_TYPE_PERIPHERAL,

};

/* can0 clock - Only for sam9x35 */

static struct clk can0_clk = {

	.name		= "can0_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_CAN0,

	.type		= CLK_TYPE_PERIPHERAL,

};

/* can1 clock - Only for sam9x35 */

static struct clk can1_clk = {

	.name		= "can1_clk",

	.pmc_mask	= 1 << AT91SAM9X5_ID_CAN1,

	.type		= CLK_TYPE_PERIPHERAL,

};



static struct clk *periph_clocks[] __initdata = {

	&pioAB_clk,

	&pioCD_clk,

	&smd_clk,

	&usart0_clk,

	&usart1_clk,

	&usart2_clk,

	&twi0_clk,

	&twi1_clk,

	&twi2_clk,

	&mmc0_clk,

	&spi0_clk,

	&spi1_clk,

	&uart0_clk,

	&uart1_clk,

	&tcb0_clk,

	&pwm_clk,

	&adc_clk,

	&adc_op_clk,

	&dma0_clk,

	&dma1_clk,

	&uhphs_clk,

	&udphs_clk,

	&mmc1_clk,

	&ssc_clk,

	// irq0

};



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("usart", "f8040000.serial", &uart0_clk),

	CLKDEV_CON_DEV_ID("usart", "f8044000.serial", &uart1_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb0_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "f0008000.mmc", &mmc0_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "f000c000.mmc", &mmc1_clk),

	CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk),

	CLKDEV_CON_DEV_ID("dma_clk", "ffffee00.dma-controller", &dma1_clk),

	CLKDEV_CON_DEV_ID("pclk", "f0010000.ssc", &ssc_clk),

	CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),

	CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),

	CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk),

	CLKDEV_CON_DEV_ID("spi_clk", "f0000000.spi", &spi0_clk),

	CLKDEV_CON_DEV_ID("spi_clk", "f0004000.spi", &spi1_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", "f802c000.ethernet", &macb0_clk),

	CLKDEV_CON_DEV_ID("hclk", "f8030000.ethernet", &macb1_clk),

	CLKDEV_CON_DEV_ID("hclk", "600000.ohci", &uhphs_clk),

	CLKDEV_CON_DEV_ID("ohci_clk", "600000.ohci", &uhphs_clk),

	CLKDEV_CON_DEV_ID("ehci_clk", "700000.ehci", &uhphs_clk),

	CLKDEV_CON_DEV_ID("hclk", "500000.gadget", &utmi_clk),

	CLKDEV_CON_DEV_ID("pclk", "500000.gadget", &udphs_clk),

	CLKDEV_CON_DEV_ID(NULL, "f8034000.pwm", &pwm_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 at91sam9x5_register_clocks(void)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)

		clk_register(periph_clocks[i]);



	clkdev_add_table(periph_clocks_lookups,

			 ARRAY_SIZE(periph_clocks_lookups));



	if (cpu_is_at91sam9g25()

	|| cpu_is_at91sam9x25())

		clk_register(&usart3_clk);



	if (cpu_is_at91sam9g25()

	|| cpu_is_at91sam9x25()

	|| cpu_is_at91sam9g35()

	|| cpu_is_at91sam9x35())

		clk_register(&macb0_clk);



	if (cpu_is_at91sam9g15()

	|| cpu_is_at91sam9g35()

	|| cpu_is_at91sam9x35())

		clk_register(&lcdc_clk);



	if (cpu_is_at91sam9g25())

		clk_register(&isi_clk);



	if (cpu_is_at91sam9x25())

		clk_register(&macb1_clk);



	if (cpu_is_at91sam9x25()

	|| cpu_is_at91sam9x35()) {

		clk_register(&can0_clk);

		clk_register(&can1_clk);

	}



	clk_register(&pck0);

	clk_register(&pck1);

}

#else

#define at91sam9x5_register_clocks	NULL

#endif



/* --------------------------------------------------------------------

 *  AT91SAM9x5 processor initialization
@@ -338,6 +32,5 @@ static void __init at91sam9x5_initialize(void) 


AT91_SOC_START(at91sam9x5)

	.map_io = at91sam9x5_map_io,

	.register_clocks = at91sam9x5_register_clocks,

	.init = at91sam9x5_initialize,

AT91_SOC_END