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

Commit 3060817f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes 

From Nicolas Ferre:
AT91: second round of fixes for 3.13
- reduce IP frequency for I2C on sama5d3
- missing aliases directive for USART3 on 9x5 family
- a PM symbol is missing if !CONFIG_PM

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
  ARM: at91: add usart3 alias to dtsi
  ARM: at91: sama5d3: reduce TWI internal clock frequency
parents c0c3350c 7093bf2b

arch/arm/boot/dts/at91sam9x5_usart3.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 
#include <dt-bindings/interrupt-controller/irq.h>



/ {

	aliases {

		serial4 = &usart3;

	};



	ahb {

		apb {

			pinctrl@fffff400 {

arch/arm/mach-at91/pm.h

+4 −0
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ 
#include <mach/at91_ramc.h>

#include <mach/at91rm9200_sdramc.h>



#ifdef CONFIG_PM

extern void at91_pm_set_standby(void (*at91_standby)(void));

#else

static inline void at91_pm_set_standby(void (*at91_standby)(void)) { }

#endif



/*

 * The AT91RM9200 goes into self-refresh mode with this command, and will

arch/arm/mach-at91/sama5d3.c

+3 −3
Original line number Diff line number Diff line
@@ -95,19 +95,19 @@ static struct clk twi0_clk = { 
	.name		= "twi0_clk",

	.pid		= SAMA5D3_ID_TWI0,

	.type		= CLK_TYPE_PERIPHERAL,

	.div		= AT91_PMC_PCR_DIV2,

	.div		= AT91_PMC_PCR_DIV8,

};

static struct clk twi1_clk = {

	.name		= "twi1_clk",

	.pid		= SAMA5D3_ID_TWI1,

	.type		= CLK_TYPE_PERIPHERAL,

	.div		= AT91_PMC_PCR_DIV2,

	.div		= AT91_PMC_PCR_DIV8,

};

static struct clk twi2_clk = {

	.name		= "twi2_clk",

	.pid		= SAMA5D3_ID_TWI2,

	.type		= CLK_TYPE_PERIPHERAL,

	.div		= AT91_PMC_PCR_DIV2,

	.div		= AT91_PMC_PCR_DIV8,

};

static struct clk mmc0_clk = {

	.name		= "mci0_clk",