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

Commit 2bc51d76 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

DT changes for 4.6:
 - Addition of the ADC for sama5d2 and sama5d2_xplained

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

:
  ARM: dts: at91: sama5d2 Xplained: enable the adc device
  ARM: dts: at91: sama5d2: add adc device

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f21a3c7d 5e72c25b

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

+22 −0
Original line number Diff line number Diff line
@@ -267,7 +267,29 @@ 
				};

			};



			adc: adc@fc030000 {

				vddana-supply = <&vdd_3v3_lp_reg>;

				vref-supply = <&vdd_3v3_lp_reg>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_adc_default>;

				status = "okay";

			};



			pinctrl@fc038000 {

				/*

				 * There is no real pinmux for ADC, if the pin

				 * is not requested by another peripheral then

				 * the muxing is done when channel is enabled.

				 * Requesting pins for ADC is GPIO is

				 * encouraged to prevent conflicts and to

				 * disable bias in order to be in the same

				 * state when the pin is not muxed to the adc.

				 */

				pinctrl_adc_default: adc_default {

					pinmux = <PIN_PD23__GPIO>;

					bias-disable;

				};



				pinctrl_flx0_default: flx0_default {

					pinmux = <PIN_PB28__FLEXCOM0_IO0>,

						 <PIN_PB29__FLEXCOM0_IO1>;

arch/arm/boot/dts/sama5d2.dtsi

+12 −6
Original line number Diff line number Diff line
@@ -88,12 +88,6 @@ 
			#clock-cells = <0>;

			clock-frequency = <0>;

		};



		adc_op_clk: adc_op_clk{

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <1000000>;

		};

	};



	ns_sram: sram@00200000 {
@@ -1085,6 +1079,18 @@ 
				status = "disabled";

			};



			adc: adc@fc030000 {

				compatible = "atmel,sama5d2-adc";

				reg = <0xfc030000 0x100>;

				interrupts = <40 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&adc_clk>;

				clock-names = "adc_clk";

				atmel,min-sample-rate-hz = <200000>;

				atmel,max-sample-rate-hz = <20000000>;

				atmel,startup-time-ms = <4>;

				status = "disabled";

			};



			pioA: pinctrl@fc038000 {

				compatible = "atmel,sama5d2-pinctrl";

				reg = <0xfc038000 0x600>;