Commit 89d70e99 authored Jul 12, 2014 by Olof Johansson

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

Merge "at91: dt for 3.17 #1" from Nicolas Ferre:

First DT update for 3.17:
- move of crystals DT definitions to the /clocks node
- addition of clock entries for sound for CCF enabled platforms
- addition of DMA and DMA + nand on at91sam9rl
- move to CCF for all not-converted-yet AT91 SoCs: at91rm9200, at91sam9260/9g20,
  at91sam9g45 family and at91sam9263

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

: (43 commits)
  ARM: at91/dt: usb_a9263: define crystals frequencies
  ARM: at91/dt: tny_a9263: define crystals frequencies
  ARM: at91/dt: sam9263ek: define crystals frequencies
  ARM: at91: move at91sam9263 SoC to the CCF
  ARM: at91/dt: sam9263: define clocks
  ARM: at91: prepare common clk transition for sam9263
  ARM: at91/dt: cosino define crystals frequencies
  ARM: at91/dt: pm9g45: crystals frequencies
  ARM: at91/dt: sam9m10g45ek: define crystals frequencies
  ARM: at91: move at91sam9g45 SoC to the CCF
  ARM: at91/dt: sam9g45: define clocks
  ARM: at91: prepare common clk transition for sam9g45
  ARM: at91/dt: kizbox: define main crystal frequency
  ARM: at91/dt: animeo_ip: define crystals frequencies
  ARM: at91/dt: ethernut5: define crystals frequencies
  ARM: at91/dt: evk-pro3: define slow crytal frequency
  ARM: at91/dt: aks-cdu: define slow crytal frequency
  ARM: at91/dt: ge863-pro3: define main crystal frequency
  ARM: at91/dt: mpa1600: define crytals frequencies
  ARM: at91/dt: qil_a9260: define crystals frequencies
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

parents c38114f3 bf4d997a

Documentation/devicetree/bindings/arm/atmel-pmc.txt

+4 −1

Original line number	Diff line number	Diff line
		* Power Management Controller (PMC)

		Required properties:
		- compatible: Should be "atmel,at91rm9200-pmc"
		- compatible: Should be "atmel,<chip>-pmc".
		<chip> can be: at91rm9200, at91sam9260, at91sam9g45, at91sam9n12,
		at91sam9x5, sama5d3

		- reg: Should contain PMC registers location and length

		Examples:

arch/arm/boot/dts/aks-cdu.dts

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,12 @@
		bootargs = "console=ttyS0,115200 ubi.mtd=4 root=ubi0:rootfs rootfstype=ubifs";
		};

		clocks {
		slow_xtal {
		clock-frequency = <32768>;
		};
		};

		ahb {
		apb {
		usart0: serial@fffb0000 {

arch/arm/boot/dts/animeo_ip.dts

+8 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,14 @@
		compatible = "atmel,osc", "fixed-clock";
		clock-frequency = <18432000>;
		};

		slow_xtal {
		clock-frequency = <32768>;
		};

		main_xtal {
		clock-frequency = <18432000>;
		};
		};

		ahb {

arch/arm/boot/dts/at91-ariag25.dts

+8 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,14 @@
		compatible = "atmel,osc", "fixed-clock";
		clock-frequency = <12000000>;
		};

		slow_xtal {
		clock-frequency = <32768>;
		};

		main_xtal {
		clock-frequency = <12000000>;
		};
		};

		ahb {

arch/arm/boot/dts/at91-cosino.dtsi

+8 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,14 @@
		compatible = "atmel,osc", "fixed-clock";
		clock-frequency = <12000000>;
		};

		slow_xtal {
		clock-frequency = <32768>;
		};

		main_xtal {
		clock-frequency = <12000000>;
		};
		};

		ahb {