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

Commit 38971083 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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

Merge "at91: fixes for 3.17 #1" from Nicols Ferre:

First AT91 fixes batch for 3.17:
- compatibility string precision
- clock registration and USB DT fix for at91rm9200

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

:
  ARM: at91/dt: rm9200: fix usb clock definition
  ARM: at91: rm9200: fix clock registration
  ARM: at91/dt: sam9g20: set at91sam9g20 pllb driver

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 8fb22264 ea4fc621

arch/arm/boot/dts/at91rm9200.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 
				usb: usbck {

					compatible = "atmel,at91rm9200-clk-usb";

					#clock-cells = <0>;

					atmel,clk-divisors = <1 2>;

					atmel,clk-divisors = <1 2 0 0>;

					clocks = <&pllb>;

				};

arch/arm/boot/dts/at91sam9g20.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
				};



				pllb: pllbck {

					compatible = "atmel,at91sam9g20-clk-pllb";

					atmel,clk-input-range = <2000000 32000000>;

					atmel,pll-clk-output-ranges = <30000000 100000000 0 0>;

				};

arch/arm/mach-at91/board-dt-rm9200.c

+10 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/gpio.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/clk-provider.h>



#include <asm/setup.h>

#include <asm/irq.h>
@@ -35,13 +36,21 @@ static void __init at91rm9200_dt_init_irq(void) 
	of_irq_init(irq_of_match);

}



static void __init at91rm9200_dt_timer_init(void)

{

#if defined(CONFIG_COMMON_CLK)

	of_clk_init(NULL);

#endif

	at91rm9200_timer_init();

}



static const char *at91rm9200_dt_board_compat[] __initdata = {

	"atmel,at91rm9200",

	NULL

};



DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")

	.init_time      = at91rm9200_timer_init,

	.init_time      = at91rm9200_dt_timer_init,

	.map_io		= at91_map_io,

	.handle_irq	= at91_aic_handle_irq,

	.init_early	= at91rm9200_dt_initialize,