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

Commit 396d81cd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'at91/dt' into next/dt 



This should help the merge with the at91 adc driver that is currently
in the staging tree.

* at91/dt:
  ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 86e43a7a 73d68d91

arch/arm/boot/dts/at91sam9260.dtsi

+35 −0
Original line number Diff line number Diff line
@@ -197,6 +197,41 @@ 
				interrupts = <10 4>;

				status = "disabled";

			};



			adc0: adc@fffe0000 {

				compatible = "atmel,at91sam9260-adc";

				reg = <0xfffe0000 0x100>;

				interrupts = <5 4>;

				atmel,adc-use-external-triggers;

				atmel,adc-channels-used = <0xf>;

				atmel,adc-vref = <3300>;

				atmel,adc-num-channels = <4>;

				atmel,adc-startup-time = <15>;

				atmel,adc-channel-base = <0x30>;

				atmel,adc-drdy-mask = <0x10000>;

				atmel,adc-status-register = <0x1c>;

				atmel,adc-trigger-register = <0x04>;



				trigger@0 {

					trigger-name = "timer-counter-0";

					trigger-value = <0x1>;

				};

				trigger@1 {

					trigger-name = "timer-counter-1";

					trigger-value = <0x3>;

				};



				trigger@2 {

					trigger-name = "timer-counter-2";

					trigger-value = <0x5>;

				};



				trigger@3 {

					trigger-name = "external";

					trigger-value = <0x13>;

					trigger-external;

				};

			};

		};



		nand0: nand@40000000 {

arch/arm/boot/dts/at91sam9g20.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -15,4 +15,12 @@ 
	memory {

		reg = <0x20000000 0x08000000>;

	};



	ahb {

		apb {

			adc0: adc@fffe0000 {

				atmel,adc-startup-time = <40>;

			};

		};

	};

};