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

Commit 72e6caca authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91/dt: sam9g45: improve ADC/touchscreen support 



Fixes the compatible string, adds the pinmuxing for the ADC pins.

Also, removes atmel,adc-use-external-triggers as it is not possible to remove it
unless redefining the whole adc node

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 3d293138

arch/arm/boot/dts/at91sam9g45.dtsi

+31 −2
Original line number Diff line number Diff line
@@ -136,6 +136,36 @@ 
				      >;



				/* shared pinctrl settings */

				adc0 {

					pinctrl_adc0_adtrg: adc0_adtrg {

						atmel,pins = <AT91_PIOD 28 AT91_PERIPH_A AT91_PINCTRL_NONE>;

					};

					pinctrl_adc0_ad0: adc0_ad0 {

						atmel,pins = <AT91_PIOD 20 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

					};

					pinctrl_adc0_ad1: adc0_ad1 {

						atmel,pins = <AT91_PIOD 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

					};

					pinctrl_adc0_ad2: adc0_ad2 {

						atmel,pins = <AT91_PIOD 22 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

					};

					pinctrl_adc0_ad3: adc0_ad3 {

						atmel,pins = <AT91_PIOD 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

					};

					pinctrl_adc0_ad4: adc0_ad4 {

						atmel,pins = <AT91_PIOD 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

					};

					pinctrl_adc0_ad5: adc0_ad5 {

						atmel,pins = <AT91_PIOD 25 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

					};

					pinctrl_adc0_ad6: adc0_ad6 {

						atmel,pins = <AT91_PIOD 26 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

					};

					pinctrl_adc0_ad7: adc0_ad7 {

						atmel,pins = <AT91_PIOD 27 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

					};

				};



				dbgu {

					pinctrl_dbgu: dbgu-0 {

						atmel,pins =
@@ -634,10 +664,9 @@ 
			adc0: adc@fffb0000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9260-adc";

				compatible = "atmel,at91sam9g45-adc";

				reg = <0xfffb0000 0x100>;

				interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;

				atmel,adc-use-external-triggers;

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

				atmel,adc-vref = <3300>;

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