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

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: Olof Johansson <olof@lixom.net>

diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt
index 29737b9b616e46920a6df2a6c9327499eda8b69e..799af90dd75b09b4c28e85bbcf36db0604d63bd2 100644 (file)
--- a/Documentation/devicetree/bindings/arm/atmel-at91.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt
@@ -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
 

diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
index 9f7f8a7d8ff9702443a4a3439fa77fb41ab0f630..0bef9e0b89c608fde1669cd524598bf411054a72 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
@@ -246,6 +246,7 @@ uart5: serial@200 {
 
                        shdwc@f8048010 {
                                atmel,shdwc-debouncer = <976>;
+                               atmel,wakeup-rtc-timer;
 
                                input@0 {
                                        reg = <0>;

diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index c51fc652f6c72639654150919ab7f03b3b7fecbc..5a53fcf542abb980d4cf18e0da4e9e790dddf0e2 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -162,9 +162,10 @@ spi1: spi@f8008000 {
                        };
 
                        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_ad4
                                        &pinctrl_adc0_ad5
                                        &pinctrl_adc0_ad6
                                        &pinctrl_adc0_ad7
-                                       &pinctrl_adc0_ad8
-                                       &pinctrl_adc0_ad9
                                        >;
                                status = "okay";
                        };

diff --git a/arch/arm/boot/dts/at91-tse850-3.dts b/arch/arm/boot/dts/at91-tse850-3.dts
index 669a2c6bdefca2e0b9e70f18e282b59616c6d2d5..498fba3e52b58bb0918b4cd7e89d8049da3c1a69 100644 (file)
--- a/arch/arm/boot/dts/at91-tse850-3.dts
+++ b/arch/arm/boot/dts/at91-tse850-3.dts
@@ -86,16 +86,43 @@ dac: dpot-dac {
                #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";
 

diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index 3fe77c38bd0db6940c2d6b5c97de020185535b43..7e80acda8f69d4fb1a1c3ed6de21361f3291ba09 100644 (file)
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -263,7 +263,7 @@ ramc: ramc@ffffea00 {
                        };
 
                        matrix: matrix@ffffee00 {
-                               compatible = "atmel,at91sam9260-bus-matrix", "syscon";
+                               compatible = "atmel,at91sam9261-matrix", "syscon";
                                reg = <0xffffee00 0x200>;
                        };
 

diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 696b8ba064a679a7b15eb01d58fa98726241d4b6..9d2bbc41a7b0812d2460da3688090a58bd1f1b9d 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -116,7 +116,7 @@ pinctrl_board_usb2: usb2-board {
                        };
 
                        spi0: spi@f0000000 {
-                               status = "okay";
+                               status = "disabled"; /* conflicts with mmc1 */
                                cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
                                m25p80@0 {
                                        compatible = "atmel,at25df321a";

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 22332be7214032fd3ba710def036168f3f9c2b3c..468ef9ceb2e338e008e0a477078fe42dd5bd0a34 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -1305,6 +1305,11 @@ AT91_XDMAC_DT_PERID(28))>,
                                status = "okay";
                        };
 
+                       sfrbu: sfr@fc05c000 {
+                               compatible = "atmel,sama5d2-sfrbu", "syscon";
+                               reg = <0xfc05c000 0x20>;
+                       };
+
                        chipid@fc069000 {
                                compatible = "atmel,sama5d2-chipid";
                                reg = <0xfc069000 0x8>;