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

Commit 25498e5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 

* 'next/driver' of git://git.linaro.org/people/arnd/arm-soc:
  hw_random: add driver for atmel true hardware random number generator
  ARM: at91: at91sam9g45: add trng clock and platform device
  MX53 Enable the AHCI SATA on MX53 SMD board
  MX53 Enable the AHCI SATA on MX53 LOCO board
  MX53 Enable the AHCI SATA on MX53 ARD board
  AHCI Add the AHCI SATA feature on the MX53 platforms
  Fix pata imx resource
  ARM: imx: Define functions for registering PATA
  ARM: imx: Add PATA clock support
  ARM: imx: Add PATA resources for other i.MX processors
  imx: efika: Enable pata.
  imx51: add pata clock
  imx51: add pata device

Fix up trivial conflict (new selects next to each other from separate
branches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig
parents 95241450 995a0605

arch/arm/mach-at91/at91sam9g45.c

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,11 @@ static struct clk pioDE_clk = { 
	.pmc_mask	= 1 << AT91SAM9G45_ID_PIODE,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk trng_clk = {

	.name		= "trng_clk",

	.pmc_mask	= 1 << AT91SAM9G45_ID_TRNG,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart0_clk = {

	.name		= "usart0_clk",

	.pmc_mask	= 1 << AT91SAM9G45_ID_US0,
@@ -177,6 +182,7 @@ static struct clk *periph_clocks[] __initdata = { 
	&pioB_clk,

	&pioC_clk,

	&pioDE_clk,

	&trng_clk,

	&usart0_clk,

	&usart1_clk,

	&usart2_clk,
@@ -216,6 +222,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID(NULL, "atmel-trng", &trng_clk),

};



static struct clk_lookup usart_clocks_lookups[] = {

arch/arm/mach-at91/at91sam9g45_devices.c

+29 −0
Original line number Diff line number Diff line
@@ -1094,6 +1094,34 @@ static void __init at91_add_device_rtt(void) 
}





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

 *  TRNG

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



#if defined(CONFIG_HW_RANDOM_ATMEL) || defined(CONFIG_HW_RANDOM_ATMEL_MODULE)

static struct resource trng_resources[] = {

	{

		.start	= AT91SAM9G45_BASE_TRNG,

		.end	= AT91SAM9G45_BASE_TRNG + SZ_16K - 1,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device at91sam9g45_trng_device = {

	.name		= "atmel-trng",

	.id		= -1,

	.resource	= trng_resources,

	.num_resources	= ARRAY_SIZE(trng_resources),

};



static void __init at91_add_device_trng(void)

{

	platform_device_register(&at91sam9g45_trng_device);

}

#else

static void __init at91_add_device_trng(void) {}

#endif



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

 *  Watchdog

 * -------------------------------------------------------------------- */
@@ -1583,6 +1611,7 @@ static int __init at91_add_standard_devices(void) 
	at91_add_device_hdmac();

	at91_add_device_rtc();

	at91_add_device_rtt();

	at91_add_device_trng();

	at91_add_device_watchdog();

	at91_add_device_tc();

	return 0;

arch/arm/mach-imx/clock-imx27.c

+2 −2
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ DEFINE_CLOCK(emi_clk, 0, PCCR1, 19, NULL, NULL, &ahb_clk); 
DEFINE_CLOCK(dma_clk1,     0, PCCR1, 20, NULL, NULL, &ahb_clk);

DEFINE_CLOCK(csi_clk1,     0, PCCR1, 21, NULL, NULL, &ahb_clk);

DEFINE_CLOCK(brom_clk,     0, PCCR1, 22, NULL, NULL, &ahb_clk);

DEFINE_CLOCK(ata_clk,      0, PCCR1, 23, NULL, NULL, &ahb_clk);

DEFINE_CLOCK(pata_clk,      0, PCCR1, 23, NULL, NULL, &ahb_clk);

DEFINE_CLOCK(wdog_clk,     0, PCCR1, 24, NULL, NULL, &ipg_clk);

DEFINE_CLOCK(usb_clk,      0, PCCR1, 25, get_rate_usb, &usb_clk1, &spll_clk);

DEFINE_CLOCK(uart6_clk1,   0, PCCR1, 26, NULL, NULL, &ipg_clk);
@@ -666,7 +666,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk)

	_REGISTER_CLOCK(NULL, "emi", emi_clk)

	_REGISTER_CLOCK(NULL, "sahara2", sahara2_clk)

	_REGISTER_CLOCK(NULL, "ata", ata_clk)

	_REGISTER_CLOCK("pata_imx", NULL, pata_clk)

	_REGISTER_CLOCK(NULL, "mstick", mstick_clk)

	_REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)

	_REGISTER_CLOCK(NULL, "gpio", gpio_clk)

arch/arm/mach-imx/clock-imx31.c

+2 −2
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ DEFINE_CLOCK(gpt_clk, 0, MXC_CCM_CGR0, 4, NULL, NULL, &perclk_clk); 
DEFINE_CLOCK(epit1_clk,   0, MXC_CCM_CGR0,  6, NULL, NULL, &perclk_clk);

DEFINE_CLOCK(epit2_clk,   1, MXC_CCM_CGR0,  8, NULL, NULL, &perclk_clk);

DEFINE_CLOCK(iim_clk,     0, MXC_CCM_CGR0, 10, NULL, NULL, &ipg_clk);

DEFINE_CLOCK(ata_clk,     0, MXC_CCM_CGR0, 12, NULL, NULL, &ipg_clk);

DEFINE_CLOCK(pata_clk,     0, MXC_CCM_CGR0, 12, NULL, NULL, &ipg_clk);

DEFINE_CLOCK(sdma_clk1,   0, MXC_CCM_CGR0, 14, NULL, NULL, &ahb_clk);

DEFINE_CLOCK(cspi3_clk,   2, MXC_CCM_CGR0, 16, NULL, NULL, &ipg_clk);

DEFINE_CLOCK(rng_clk,     0, MXC_CCM_CGR0, 18, NULL, NULL, &ipg_clk);
@@ -562,7 +562,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)

	_REGISTER_CLOCK(NULL, "firi", firi_clk)

	_REGISTER_CLOCK(NULL, "ata", ata_clk)

	_REGISTER_CLOCK("pata_imx", NULL, pata_clk)

	_REGISTER_CLOCK(NULL, "rtic", rtic_clk)

	_REGISTER_CLOCK(NULL, "rng", rng_clk)

	_REGISTER_CLOCK("imx31-sdma", NULL, sdma_clk1)

arch/arm/mach-imx/clock-imx35.c

+2 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static void clk_cgr_disable(struct clk *clk) 
	}



DEFINE_CLOCK(asrc_clk,   0, CCM_CGR0,  0, NULL, NULL);

DEFINE_CLOCK(ata_clk,    0, CCM_CGR0,  2, get_rate_ipg, NULL);

DEFINE_CLOCK(pata_clk,    0, CCM_CGR0,  2, get_rate_ipg, NULL);

/* DEFINE_CLOCK(audmux_clk, 0, CCM_CGR0,  4, NULL, NULL); */

DEFINE_CLOCK(can1_clk,   0, CCM_CGR0,  6, get_rate_ipg, NULL);

DEFINE_CLOCK(can2_clk,   1, CCM_CGR0,  8, get_rate_ipg, NULL);
@@ -447,7 +447,7 @@ static struct clk nfc_clk = { 


static struct clk_lookup lookups[] = {

	_REGISTER_CLOCK(NULL, "asrc", asrc_clk)

	_REGISTER_CLOCK(NULL, "ata", ata_clk)

	_REGISTER_CLOCK("pata_imx", NULL, pata_clk)

	_REGISTER_CLOCK("flexcan.0", NULL, can1_clk)

	_REGISTER_CLOCK("flexcan.1", NULL, can2_clk)

	_REGISTER_CLOCK("imx35-cspi.0", NULL, cspi1_clk)