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

Commit 77f23697 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.12-dt' of... 

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

DT for 4.12:

 - Add SFRBU on sama5d2
 - DT improvements for sama5d2_xplained, sama5d3_xplained, at91sam9x5ek and
 Axentia TSE-850

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

:
  ARM: dts: at91: sama5d3_xplained: not all ADC channels are available
  ARM: dts: at91: sama5d3_xplained: fix ADC vref
  ARM: dts: at91: add envelope detector mux to the Axentia TSE-850
  ARM: dts: at91: Disable SPI on at91sam9x5ek to allow MCI1 to work.
  ARM: dts: at91: Fix matrix compatible
  ARM: dts: at91: sama5d2_xplained: enable RTC wakeup
  ARM: dts: at91: sama5d2: add sfrbu

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a43315e3 d3df1ec0

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

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ memory, bridge implementations, processor and other functionality not controlled 
elsewhere.



required properties:

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

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

	"atmel,<chip>-sfrbu", "syscon"

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

- reg: Should contain registers location and length

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

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ 


			shdwc@f8048010 {

				atmel,shdwc-debouncer = <976>;

				atmel,wakeup-rtc-timer;



				input@0 {

					reg = <0>;

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

+2 −3
Original line number Diff line number Diff line
@@ -162,9 +162,10 @@ 
			};



			adc0: adc@f8018000 {

				atmel,adc-vref = <3300>;

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

				pinctrl-0 = <

					&pinctrl_adc0_adtrg

					&pinctrl_adc0_ad0

					&pinctrl_adc0_ad1

					&pinctrl_adc0_ad2

					&pinctrl_adc0_ad3
@@ -172,8 +173,6 @@ 
					&pinctrl_adc0_ad5

					&pinctrl_adc0_ad6

					&pinctrl_adc0_ad7

					&pinctrl_adc0_ad8

					&pinctrl_adc0_ad9

					>;

				status = "okay";

			};

arch/arm/boot/dts/at91-tse850-3.dts

+28 −1
Original line number Diff line number Diff line
@@ -86,16 +86,43 @@ 
		#io-channel-cells = <1>;

	};



	envelope-detector {

	env_det: envelope-detector {

		compatible = "axentia,tse850-envelope-detector";

		io-channels = <&dac 0>;

		io-channel-names = "dac";

		#io-channel-cells = <1>;



		interrupt-parent = <&pioA>;

		interrupts = <3 IRQ_TYPE_EDGE_RISING>;

		interrupt-names = "comp";

	};



	mux: mux-controller {

		compatible = "gpio-mux";

		#mux-control-cells = <0>;



		mux-gpios = <&pioA 0 GPIO_ACTIVE_HIGH>,

			    <&pioA 1 GPIO_ACTIVE_HIGH>,

			    <&pioA 2 GPIO_ACTIVE_HIGH>;

		idle-state = <0>;

	};



	envelope-detector-mux {

		compatible = "io-channel-mux";

		io-channels = <&env_det 0>;

		io-channel-names = "parent";



		mux-controls = <&mux>;



		channels = "", "",

			 "sync-1",

			 "in",

			 "out",

			 "sync-2",

			 "sys-reg",

			 "ana-reg";

	};



	leds {

		compatible = "gpio-leds";

arch/arm/boot/dts/at91sam9261.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ 
			};



			matrix: matrix@ffffee00 {

				compatible = "atmel,at91sam9260-bus-matrix", "syscon";

				compatible = "atmel,at91sam9261-matrix", "syscon";

				reg = <0xffffee00 0x200>;

			};