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

Commit eca6f172 authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

Merge tag 'at91-dt' into at91-3.20-cleanup

parents bd873732 4dd32e6d

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

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

    o "atmel,at91sam9g45"

    o "atmel,at91sam9n12"

    o "atmel,at91sam9n12"

    o "atmel,at91sam9rl"

    o "atmel,at91sam9rl"

    o "atmel,at91sam9xe"

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

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

   SoC family:

   SoC family:

    o "atmel,sama5d3" shall be extended with the specific SoC compatible:

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

		compatible = "atmel,at91sam9260-rstc";

		reg = <0xfffffd00 0x10>;

		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 Original line Diff line number Diff line
@@ -66,6 +66,11 @@ 
		};

		};

	};

	};





	sram: sram@00200000 {

		compatible = "mmio-sram";

		reg = <0x00200000 0x4000>;

	};



	ahb {

	ahb {

		compatible = "simple-bus";

		compatible = "simple-bus";

		#address-cells = <1>;

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

				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 {

			tcb0: timer@fffa0000 {

				compatible = "atmel,at91rm9200-tcb";

				compatible = "atmel,at91rm9200-tcb";

				reg = <0xfffa0000 0x100>;

				reg = <0xfffa0000 0x100>;

arch/arm/boot/dts/at91rm9200ek.dts

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

			dbgu: serial@fffff200 {

				status = "okay";

				status = "okay";

			};

			};



			rtc: rtc@fffffe00 {

				status = "okay";

			};

		};

		};





		usb0: ohci@00300000 {

		usb0: ohci@00300000 {

arch/arm/boot/dts/at91sam9260.dtsi

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

		};

	};

	};





	sram0: sram@002ff000 {

		compatible = "mmio-sram";

		reg = <0x002ff000 0x2000>;

	};



	ahb {

	ahb {

		compatible = "simple-bus";

		compatible = "simple-bus";

		#address-cells = <1>;

		#address-cells = <1>;

arch/arm/boot/dts/at91sam9261.dtsi

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

		};

	};

	};





	sram: sram@00300000 {

		compatible = "mmio-sram";

		reg = <0x00300000 0x28000>;

	};



	ahb {

	ahb {

		compatible = "simple-bus";

		compatible = "simple-bus";

		#address-cells = <1>;

		#address-cells = <1>;