Commit 606d5313 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt 

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

First batch of DT changes for 3.20:
- little typo and a LED declared
- addition of the Special Function Registers (SFR) + its binding
- RTC & SRAM nodes
- the at91sam9xe has its own .dtsi now. Not combined with at91sam9260 anymore
- addition of the Image Sensor Interface (ISI) DT part and supported sensors

* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

:
  ARM: at91: dts: sama5d3: add ov2640 camera sensor support
  ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK
  ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}
  ARM: at91: dts: sama5d3: move the isi mck pin to mb
  ARM: at91: dts: sama5d3: add missing pins of isi
  ARM: at91: dts: sama5d3: split isi pinctrl
  ARM: at91: dts: sama5d3: add isi clock
  ARM: at91/dt: ethernut5: use at91sam9xe.dtsi
  ARM: at91/dt: Add a dtsi for at91sam9xe
  ARM: at91/dt: add SRAM nodes
  ARM: at91/dt: at91rm9200ek: enable RTC
  ARM: at91/dt: rm9200: add RTC node
  ARM: at91/dt: at91sam9n12: Add RTC node
  ARM: at91: sama5d4: Add SFR
  ARM: at91: sama5d3: Add SFR
  ARM: at91: Add Special Function Registers binding documentation
  ARM: at91/dt: sam9263: Fix typo: ac91_clk -> ac97_clk
  ARM: at91/dt: sama5d3: enable D2 as the heartbeat LED

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e2a77c7c 4dd32e6d

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

+17 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ compatible: must be one of: 
    o "atmel,at91sam9g45"

    o "atmel,at91sam9n12"

    o "atmel,at91sam9rl"

    o "atmel,at91sam9xe"

 * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific

   SoC family:

    o "atmel,sama5d3" shall be extended with the specific SoC compatible:
@@ -136,3 +137,19 @@ Example: 
		compatible = "atmel,at91sam9260-rstc";

		reg = <0xfffffd00 0x10>;

	};



Special Function Registers (SFR)



Special Function Registers (SFR) manage specific aspects of the integrated

memory, bridge implementations, processor and other functionality not controlled

elsewhere.



required properties:

- compatible: Should be "atmel,<chip>-sfr", "syscon".

  <chip> can be "sama5d3" or "sama5d4".

- reg: Should contain registers location and length



	sfr@f0038000 {

		compatible = "atmel,sama5d3-sfr", "syscon";

		reg = <0xf0038000 0x60>;

	};

arch/arm/boot/dts/at91rm9200.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ 
		};

	};



	sram: sram@00200000 {

		compatible = "mmio-sram";

		reg = <0x00200000 0x4000>;

	};



	ahb {

		compatible = "simple-bus";

		#address-cells = <1>;
@@ -356,6 +361,13 @@ 
				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

			};



			rtc: rtc@fffffe00 {

				compatible = "atmel,at91rm9200-rtc";

				reg = <0xfffffe00 0x40>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				status = "disabled";

			};



			tcb0: timer@fffa0000 {

				compatible = "atmel,at91rm9200-tcb";

				reg = <0xfffa0000 0x100>;

arch/arm/boot/dts/at91rm9200ek.dts

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ 
			dbgu: serial@fffff200 {

				status = "okay";

			};



			rtc: rtc@fffffe00 {

				status = "okay";

			};

		};



		usb0: ohci@00300000 {

arch/arm/boot/dts/at91sam9260.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,11 @@ 
		};

	};



	sram0: sram@002ff000 {

		compatible = "mmio-sram";

		reg = <0x002ff000 0x2000>;

	};



	ahb {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arm/boot/dts/at91sam9261.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ 
		};

	};



	sram: sram@00300000 {

		compatible = "mmio-sram";

		reg = <0x00300000 0x28000>;

	};



	ahb {

		compatible = "simple-bus";

		#address-cells = <1>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE