Merge tag 'at91-5.6-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux...
authorOlof Johansson <olof@lixom.net>
Thu, 16 Jan 2020 22:07:24 +0000 (14:07 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 16 Jan 2020 22:07:25 +0000 (14:07 -0800)
AT91 DT for 5.6

 - Fix sama5d3 peripheral clock rate range
 - New boards: Overkiz Smartikz and Kizbox Mini, Microchip SAMA5D27
   wlsom1-ek
 - sama5d2 sdmcc fixes

* tag 'at91-5.6-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d3: define clock rate range for tcb1
  ARM: dts: at91: sama5d3: fix maximum peripheral clock rates
  ARM: dts: at91: nattis 2: remove unnecessary include
  ARM: dts: at91: add smartkiz support and a common kizboxmini dtsi file
  dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding
  ARM: dts: at91: rearrange kizbox dts using aliases nodes
  ARM: dts: at91: sama5d27_som1_ek: add the microchip,sdcal-inverted on sdmmc0
  ARM: dts: at91: Reenable UART TX pull-ups
  ARM: dts: at91: sama5d2: set the sdmmc gclk frequency
  ARM: dts: at91: sama5d27_som1_ek: add i2c filters properties
  ARM: dts: at91: sama5d27_wlsom1: add SAMA5D27 wlsom1 and wlsom1-ek
  dt-bindings: ARM: at91: Document SAMA5D27 WLSOM1 and Evaluation Kit
  ARM: dts: at91: sama5d2: mark secumod as a GPIO controller
  ARM: dts: at91: sama5d2: disable pwm0 by default

Link: https://lore.kernel.org/r/20200113155423.GA1357189@piout.net
Signed-off-by: Olof Johansson <olof@lixom.net>
24 files changed:
Documentation/devicetree/bindings/arm/atmel-at91.yaml
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/at91-kizbox.dts
arch/arm/boot/dts/at91-kizboxmini-base.dts [new file with mode: 0644]
arch/arm/boot/dts/at91-kizboxmini-common.dtsi [new file with mode: 0644]
arch/arm/boot/dts/at91-kizboxmini-mb.dts [new file with mode: 0644]
arch/arm/boot/dts/at91-kizboxmini-rd.dts [new file with mode: 0644]
arch/arm/boot/dts/at91-kizboxmini.dts [deleted file]
arch/arm/boot/dts/at91-nattis-2-natte-2.dts
arch/arm/boot/dts/at91-sama5d27_som1.dtsi
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi [new file with mode: 0644]
arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts [new file with mode: 0644]
arch/arm/boot/dts/at91-smartkiz.dts [new file with mode: 0644]
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9261.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9rl.dtsi
arch/arm/boot/dts/sama5d2.dtsi
arch/arm/boot/dts/sama5d3.dtsi
arch/arm/boot/dts/sama5d3_can.dtsi
arch/arm/boot/dts/sama5d3_tcb1.dtsi
arch/arm/boot/dts/sama5d3_uart.dtsi

index 6dd8be4..3584f0e 100644 (file)
@@ -35,6 +35,16 @@ properties:
               - atmel,at91sam9x60
           - const: atmel,at91sam9
 
+      - items:
+          - enum:
+              - overkiz,kizboxmini-base # Overkiz kizbox Mini Base Board
+              - overkiz,kizboxmini-mb   # Overkiz kizbox Mini Mother Board
+              - overkiz,kizboxmini-rd   # Overkiz kizbox Mini RailDIN
+              - overkiz,smartkiz        # Overkiz SmartKiz Board
+          - const: atmel,at91sam9g25
+          - const: atmel,at91sam9x5
+          - const: atmel,at91sam9
+
       - items:
           - enum:
               - atmel,at91sam9g15
@@ -52,6 +62,21 @@ properties:
           - const: atmel,sama5d2
           - const: atmel,sama5
 
+      - description: Microchip SAMA5D27 WLSOM1
+        items:
+          - const: microchip,sama5d27-wlsom1
+          - const: atmel,sama5d27
+          - const: atmel,sama5d2
+          - const: atmel,sama5
+
+      - description: Microchip SAMA5D27 WLSOM1 Evaluation Kit
+        items:
+          - const: microchip,sama5d27-wlsom1-ek
+          - const: microchip,sama5d27-wlsom1
+          - const: atmel,sama5d27
+          - const: atmel,sama5d2
+          - const: atmel,sama5
+
       - items:
           - const: atmel,sama5d27
           - const: atmel,sama5d2
index 6bf729e..d2aff5a 100644 (file)
@@ -37,7 +37,10 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \
        at91-ariag25.dtb \
        at91-ariettag25.dtb \
        at91-cosino_mega2560.dtb \
-       at91-kizboxmini.dtb \
+       at91-kizboxmini-base.dtb \
+       at91-kizboxmini-mb.dtb \
+       at91-kizboxmini-rd.dtb \
+       at91-smartkiz.dtb \
        at91-wb45n.dtb \
        at91sam9g15ek.dtb \
        at91sam9g25ek.dtb \
@@ -49,6 +52,7 @@ dtb-$(CONFIG_SOC_SAM_V7) += \
        at91-kizbox3-hs.dtb \
        at91-nattis-2-natte-2.dtb \
        at91-sama5d27_som1_ek.dtb \
+       at91-sama5d27_wlsom1_ek.dtb \
        at91-sama5d2_ptc_ek.dtb \
        at91-sama5d2_xplained.dtb \
        at91-sama5d3_xplained.dtb \
index 90996ea..7d938cc 100644 (file)
                };
        };
 
-       ahb {
-               apb {
-                       tcb0: timer@fffa0000 {
-                               timer@0 {
-                                       compatible = "atmel,tcb-timer";
-                                       reg = <0>, <1>;
-                               };
-
-                               timer@2 {
-                                       compatible = "atmel,tcb-timer";
-                                       reg = <2>;
-                               };
-                       };
-
-                       macb0: ethernet@fffc4000 {
-                               phy-mode = "mii";
-                               pinctrl-0 = <&pinctrl_macb_rmii
-                                            &pinctrl_macb_rmii_mii_alt>;
-                               status = "okay";
-                       };
-
-                       usart3: serial@fffd0000 {
-                               status = "okay";
-                       };
-
-                       dbgu: serial@fffff200 {
-                               status = "okay";
-                       };
-
-                       watchdog@fffffd40 {
-                               timeout-sec = <15>;
-                               atmel,max-heartbeat-sec = <16>;
-                               atmel,min-heartbeat-sec = <0>;
-                               status = "okay";
-                       };
-               };
-
-               usb0: ohci@500000 {
-                       num-ports = <1>;
-                       status = "okay";
-               };
-
-               ebi: ebi@10000000 {
-                       status = "okay";
-
-                       nand_controller: nand-controller {
-                               status = "okay";
-                               pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;
-                               pinctrl-names = "default";
-
-                               nand@3 {
-                                       reg = <0x3 0x0 0x800000>;
-                                       rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;
-                                       cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;
-                                       nand-bus-width = <8>;
-                                       nand-ecc-mode = "soft";
-                                       nand-on-flash-bbt;
-                                       label = "atmel_nand";
-
-                                       partitions {
-                                               compatible = "fixed-partitions";
-                                               #address-cells = <1>;
-                                               #size-cells = <1>;
-
-                                               bootstrap@0 {
-                                                       label = "bootstrap";
-                                                       reg = <0x0 0x20000>;
-                                               };
-
-                                               ubi@20000 {
-                                                       label = "ubi";
-                                                       reg = <0x20000 0x7fe0000>;
-                                               };
-                                       };
-                               };
-                       };
-               };
-       };
-
        gpio_keys {
                compatible = "gpio-keys";
                #address-cells = <1>;
                };
        };
 
-       i2c-gpio-0 {
-               status = "okay";
-
-               rtc: pcf8563@51 {
-                       compatible = "nxp,pcf8563";
-                       reg = <0x51>;
-               };
-       };
-
        pwm_leds {
                compatible = "pwm-leds";
 
                             &pinctrl_tcb1_tiob0>;
        };
 };
+
+&tcb0 {
+       timer@0 {
+               compatible = "atmel,tcb-timer";
+               reg = <0>, <1>;
+       };
+
+       timer@2 {
+               compatible = "atmel,tcb-timer";
+               reg = <2>;
+       };
+};
+
+&ebi {
+       status = "okay";
+};
+
+&nand_controller {
+       status = "okay";
+       pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;
+       pinctrl-names = "default";
+
+       nand@3 {
+               reg = <0x3 0x0 0x800000>;
+               rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;
+               cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;
+               nand-bus-width = <8>;
+               nand-ecc-mode = "soft";
+               nand-on-flash-bbt;
+               label = "atmel_nand";
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       bootstrap@0 {
+                               label = "bootstrap";
+                               reg = <0x0 0x20000>;
+                       };
+
+                       ubi@20000 {
+                               label = "ubi";
+                               reg = <0x20000 0x7fe0000>;
+                       };
+               };
+       };
+};
+
+&macb0 {
+       phy-mode = "mii";
+       pinctrl-0 = <&pinctrl_macb_rmii
+                    &pinctrl_macb_rmii_mii_alt>;
+       status = "okay";
+};
+
+&usart3 {
+       status = "okay";
+};
+
+&dbgu {
+       status = "okay";
+};
+
+&watchdog {
+       timeout-sec = <15>;
+       atmel,max-heartbeat-sec = <16>;
+       atmel,min-heartbeat-sec = <0>;
+       status = "okay";
+};
+
+&usb0 {
+       num-ports = <1>;
+       status = "okay";
+};
+
+&i2c_gpio0 {
+       status = "okay";
+
+       rtc: pcf8563@51 {
+               compatible = "nxp,pcf8563";
+               reg = <0x51>;
+       };
+};
diff --git a/arch/arm/boot/dts/at91-kizboxmini-base.dts b/arch/arm/boot/dts/at91-kizboxmini-base.dts
new file mode 100644 (file)
index 0000000..81c29ca
--- /dev/null
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * at91-kizboxmini-base.dts - Device Tree file for Overkiz Kizbox mini
+ * base board
+ *
+ * Copyright (C) 2015 Overkiz SAS
+ *   Author: Antoine Aubert <a.aubert@overkiz.com>
+ *           Kévin Raymond <k.raymond@overkiz.com>
+ */
+/dts-v1/;
+#include "at91-kizboxmini-common.dtsi"
+
+/ {
+       model = "Overkiz Kizbox Mini";
+       compatible = "overkiz,kizboxmini-base", "atmel,at91sam9g25",
+                    "atmel,at91sam9x5", "atmel,at91sam9";
+};
+
+&pinctrl_usart0 {
+       atmel,pins =
+               <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE
+                AT91_PIOA 2 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>;
+};
diff --git a/arch/arm/boot/dts/at91-kizboxmini-common.dtsi b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
new file mode 100644 (file)
index 0000000..fddf267
--- /dev/null
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * at91-kizboxmini.dts - Device Tree file for Overkiz Kizbox mini board
+ *
+ * Copyright (C) 2014-2018 Overkiz SAS
+ *   Author: Antoine Aubert <a.aubert@overkiz.com>
+ *           Gaël Portay <g.portay@overkiz.com>
+ *           Kévin Raymond <k.raymond@overkiz.com>
+ *           Dorian Rocipon <d.rocipon@overkiz.com>
+ */
+#include "at91sam9g25.dtsi"
+
+/ {
+       chosen {
+               bootargs = "ubi.mtd=ubi";
+               stdout-path = &dbgu;
+       };
+
+       memory {
+               reg = <0x20000000 0x8000000>;
+       };
+
+       clocks {
+               main_xtal {
+                       clock-frequency = <12000000>;
+               };
+
+               slow_xtal {
+                       clock-frequency = <32768>;
+               };
+
+               adc_op_clk {
+                       status = "disabled";
+               };
+       };
+
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               prog {
+                       label = "PB_PROG";
+                       gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
+                       linux,code = <0x102>;
+                       wakeup-source;
+               };
+
+               reset {
+                       label = "PB_RST";
+                       gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
+                       linux,code = <0x100>;
+                       wakeup-source;
+               };
+       };
+
+       leds: pwm_leds {
+               compatible = "pwm-leds";
+
+               led_blue: pwm_blue {
+                       label = "pwm:blue:user";
+                       pwms = <&pwm0 2 10000000 0>;
+                       max-brightness = <255>;
+                       linux,default-trigger = "none";
+                       status = "disabled";
+               };
+
+               led_green: pwm_green {
+                       label = "pwm:green:user";
+                       pwms = <&pwm0 0 10000000 0>;
+                       max-brightness = <255>;
+                       linux,default-trigger = "default-on";
+               };
+
+               led_red: pwm_red {
+                       label = "pwm:red:user";
+                       pwms = <&pwm0 1 10000000 0>;
+                       max-brightness = <255>;
+                       linux,default-trigger = "default-on";
+               };
+       };
+};
+
+&usart0 {
+       atmel,use-dma-rx;
+       atmel,use-dma-tx;
+       status = "okay";
+};
+
+&macb0 {
+       phy-mode = "rmii";
+       status = "okay";
+};
+
+&pwm0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm0_pwm0_1
+                    &pinctrl_pwm0_pwm1_1
+                    &pinctrl_pwm0_pwm2_1>;
+       status = "okay";
+};
+
+&dbgu {
+       status = "okay";
+};
+
+&watchdog {
+       status = "okay";
+};
+
+&adc0 {
+       status = "disabled";
+};
+
+&rtc {
+       status = "disabled";
+};
+
+&ebi {
+       pinctrl-0 = <&pinctrl_ebi_addr_nand
+                       &pinctrl_ebi_data_0_7>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&nand_controller {
+       status = "okay";
+       pinctrl-0 = <&pinctrl_nand_oe_we
+                    &pinctrl_nand_cs
+                    &pinctrl_nand_rb>;
+       pinctrl-names = "default";
+
+       nand@3 {
+               reg = <0x3 0x0 0x800000>;
+               rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
+               cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
+               nand-bus-width = <8>;
+               nand-ecc-mode = "hw";
+               nand-ecc-strength = <4>;
+               nand-ecc-step-size = <512>;
+               nand-on-flash-bbt;
+               label = "atmel_nand";
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       bootstrap@0 {
+                               label = "bootstrap";
+                               reg = <0x0 0x20000>;
+                       };
+
+                       ubi@20000 {
+                               label = "ubi";
+                               reg = <0x20000 0x7fe0000>;
+                       };
+               };
+       };
+};
+
+&usb0 {
+       num-ports = <1>;
+       status = "okay";
+};
+
+&usb1 {
+       status = "okay";
+};
+
diff --git a/arch/arm/boot/dts/at91-kizboxmini-mb.dts b/arch/arm/boot/dts/at91-kizboxmini-mb.dts
new file mode 100644 (file)
index 0000000..c07d307
--- /dev/null
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2015-2018 Overkiz SAS
+ *   Author: Mickael Gardet <m.gardet@overkiz.com>
+ *           Kévin Raymond <k.raymond@overkiz.com>
+ */
+/dts-v1/;
+#include "at91-kizboxmini-common.dtsi"
+
+/ {
+       model = "Overkiz Kizbox Mini Mother Board";
+       compatible = "overkiz,kizboxmini-mb", "atmel,at91sam9g25",
+                    "atmel,at91sam9x5", "atmel,at91sam9";
+};
+
+&usb0 {
+       num-ports = <2>;
+};
+
+&rtc {
+       status = "okay";
+};
+
+&led_blue {
+       status = "okay";
+};
diff --git a/arch/arm/boot/dts/at91-kizboxmini-rd.dts b/arch/arm/boot/dts/at91-kizboxmini-rd.dts
new file mode 100644 (file)
index 0000000..ab50f4d
--- /dev/null
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2015-2018 Overkiz SAS
+ *   Author: Mickael Gardet <m.gardet@overkiz.com>
+ *           Kévin Raymond <k.raymond@overkiz.com>
+ */
+/dts-v1/;
+#include "at91-kizboxmini-common.dtsi"
+
+/ {
+       model = "Overkiz Kizbox Mini RailDIN";
+       compatible = "overkiz,kizboxmini-rd", "atmel,at91sam9g25",
+                    "atmel,at91sam9x5", "atmel,at91sam9";
+
+       clocks {
+               adc_op_clk {
+                       status = "okay";
+               };
+       };
+};
+
+&pinctrl {
+       adc0 {
+               pinctrl_adc0_ad5: adc0_ad5-0 {
+                       /* pull-up disable */
+                       atmel,pins = <AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+       };
+};
+
+&usart0 {
+       status = "disabled";
+};
+
+&rtc {
+       status = "okay";
+};
+
+&led_blue {
+       status = "okay";
+};
+
+&adc0 {
+       atmel,adc-vref = <2500>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_adc0_ad5>;
+       atmel,adc-channels-used = <0x0020>;
+       status = "okay";
+};
diff --git a/arch/arm/boot/dts/at91-kizboxmini.dts b/arch/arm/boot/dts/at91-kizboxmini.dts
deleted file mode 100644 (file)
index cb22f5f..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * at91-kizboxmini.dts - Device Tree file for Overkiz Kizbox mini board
- *
- * Copyright (C) 2014 Gaël PORTAY <g.portay@overkiz.com>
- */
-/dts-v1/;
-#include "at91sam9g25.dtsi"
-#include <dt-bindings/pwm/pwm.h>
-
-/ {
-       model = "Overkiz Kizbox mini";
-       compatible = "overkiz,kizboxmini", "atmel,at91sam9g25", "atmel,at91sam9x5", "atmel,at91sam9";
-
-       chosen {
-               bootargs = "ubi.mtd=ubi";
-               stdout-path = &dbgu;
-       };
-
-       memory {
-               reg = <0x20000000 0x8000000>;
-       };
-
-       clocks {
-               slow_xtal {
-                       clock-frequency = <32768>;
-               };
-
-               main_xtal {
-                       clock-frequency = <12000000>;
-               };
-       };
-
-       ahb {
-               nand0: nand@40000000 {
-                       nand-bus-width = <8>;
-                       nand-ecc-mode = "hw";
-                       atmel,has-pmecc;
-                       atmel,pmecc-cap = <4>;
-                       atmel,pmecc-sector-size = <512>;
-                       nand-on-flash-bbt;
-                       status = "okay";
-               };
-       };
-
-       gpio_keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               prog {
-                       label = "PB_PROG";
-                       gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
-                       linux,code = <0x102>;
-                       wakeup-source;
-               };
-
-               reset {
-                       label = "PB_RST";
-                       gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
-                       linux,code = <0x100>;
-                       wakeup-source;
-               };
-       };
-
-       pwm_leds {
-               compatible = "pwm-leds";
-
-               green {
-                       label = "pwm:green:user";
-                       pwms = <&pwm0 0 10000000 0>;
-                       max-brightness = <255>;
-                       linux,default-trigger = "default-on";
-               };
-
-               red {
-                       label = "pwm:red:user";
-                       pwms = <&pwm0 1 10000000 0>;
-                       max-brightness = <255>;
-                       linux,default-trigger = "default-on";
-               };
-       };
-};
-
-&dbgu {
-       status = "okay";
-};
-
-&ebi {
-       pinctrl-0 = <&pinctrl_ebi_addr_nand
-                    &pinctrl_ebi_data_0_7>;
-       pinctrl-names = "default";
-       status = "okay";
-
-       nand-controller {
-               pinctrl-0 = <&pinctrl_nand_oe_we
-                            &pinctrl_nand_cs
-                            &pinctrl_nand_rb>;
-               pinctrl-names = "default";
-               status = "okay";
-
-               nand@3 {
-                       reg = <0x3 0x0 0x800000>;
-                       rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
-                       cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
-                       nand-bus-width = <8>;
-                       nand-ecc-mode = "hw";
-                       nand-ecc-strength = <4>;
-                       nand-ecc-step-size = <512>;
-                       nand-on-flash-bbt;
-                       label = "atmel_nand";
-
-                       partitions {
-                               compatible = "fixed-partitions";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               bootstrap@0 {
-                                       label = "bootstrap";
-                                       reg = <0x0 0x20000>;
-                               };
-
-                               ubi@20000 {
-                                       label = "ubi";
-                                       reg = <0x20000 0x7fe0000>;
-                               };
-                       };
-               };
-       };
-};
-
-&macb0 {
-       phy-mode = "rmii";
-       status = "okay";
-};
-
-&pwm0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_pwm0_pwm0_1
-                    &pinctrl_pwm0_pwm1_1>;
-       status = "okay";
-};
-
-&tcb0 {
-       timer@0 {
-               compatible = "atmel,tcb-timer";
-               reg = <0>;
-       };
-
-       timer@1 {
-               compatible = "atmel,tcb-timer";
-               reg = <1>;
-       };
-};
-
-&usart0 {
-       status = "okay";
-};
-
-&usb0 {
-       num-ports = <1>;
-       status = "okay";
-};
-
-&usb1 {
-       status = "okay";
-};
-
-&watchdog {
-       status = "okay";
-};
index f245944..4f12347 100644 (file)
@@ -8,7 +8,6 @@
  */
 /dts-v1/;
 #include "at91-linea.dtsi"
-#include "sama5d3_lcd.dtsi"
 #include "at91-natte.dtsi"
 
 / {
index 7788d5d..6281590 100644 (file)
        };
 
        ahb {
+               sdmmc0: sdio-host@a0000000 {
+                       microchip,sdcal-inverted;
+               };
+
                apb {
                        qspi1: spi@f0024000 {
                                pinctrl-names = "default";
index fca5716..b0853bf 100644 (file)
                                        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>;
                                        dmas = <0>, <0>;
                                        dma-names = "tx", "rx";
+                                       i2c-analog-filter;
+                                       i2c-digital-filter;
+                                       i2c-digital-filter-width-ns = <35>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
                                        clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
 
                        i2c1: i2c@fc028000 {
                                dmas = <0>, <0>;
+                               i2c-analog-filter;
+                               i2c-digital-filter;
+                               i2c-digital-filter-width-ns = <35>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_i2c1_default>;
                                status = "okay";
diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi b/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
new file mode 100644 (file)
index 0000000..db3e223
--- /dev/null
@@ -0,0 +1,304 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * at91-sama5d27_wlsom1.dtsi - Device Tree file for SAMA5D27 WLSOM1
+ *
+ * Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries
+ *
+ * Author: Nicolas Ferre <nicolas.ferre@microcihp.com>
+ * Author: Eugen Hristev <eugen.hristev@microcihp.com>
+ */
+#include "sama5d2.dtsi"
+#include "sama5d2-pinfunc.h"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/mfd/atmel-flexcom.h>
+#include <dt-bindings/pinctrl/at91.h>
+
+/ {
+       model = "Microchip SAMA5D27 WLSOM1";
+       compatible = "microchip,sama5d27-wlsom1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5";
+
+       clocks {
+               slow_xtal {
+                       clock-frequency = <32768>;
+               };
+
+               main_xtal {
+                       clock-frequency = <24000000>;
+               };
+       };
+};
+
+&flx1 {
+       atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
+
+       uart6: serial@200 {
+               compatible = "atmel,at91sam9260-usart";
+               reg = <0x200 0x200>;
+               interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>;
+               dmas = <&dma0
+                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
+                        AT91_XDMAC_DT_PERID(13))>,
+                      <&dma0
+                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
+                        AT91_XDMAC_DT_PERID(14))>;
+               dma-names = "tx", "rx";
+               clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
+               clock-names = "usart";
+               pinctrl-0 = <&pinctrl_flx1_default>;
+               pinctrl-names = "default";
+       };
+};
+
+&i2c0 {
+       pinctrl-0 = <&pinctrl_i2c0_default>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&i2c1 {
+       dmas = <0>, <0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1_default>;
+       status = "okay";
+
+       mcp16502@5b {
+               compatible = "microchip,mcp16502";
+               reg = <0x5b>;
+               status = "okay";
+               lpm-gpios = <&pioBU 0 GPIO_ACTIVE_LOW>;
+
+               regulators {
+                       vdd_3v3: VDD_IO {
+                               regulator-name = "VDD_IO";
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <3700000>;
+                               regulator-initial-mode = <2>;
+                               regulator-allowed-modes = <2>, <4>;
+                               regulator-always-on;
+
+                               regulator-state-standby {
+                                       regulator-on-in-suspend;
+                                       regulator-mode = <4>;
+                               };
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                                       regulator-mode = <4>;
+                               };
+                       };
+
+                       vddio_ddr: VDD_DDR {
+                               regulator-name = "VDD_DDR";
+                               regulator-min-microvolt = <600000>;
+                               regulator-max-microvolt = <1850000>;
+                               regulator-initial-mode = <2>;
+                               regulator-allowed-modes = <2>, <4>;
+                               regulator-always-on;
+
+                               regulator-state-standby {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1200000>;
+                                       regulator-changeable-in-suspend;
+                                       regulator-mode = <4>;
+                               };
+
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1200000>;
+                                       regulator-changeable-in-suspend;
+                                       regulator-mode = <4>;
+                               };
+                       };
+
+                       vdd_core: VDD_CORE {
+                               regulator-name = "VDD_CORE";
+                               regulator-min-microvolt = <600000>;
+                               regulator-max-microvolt = <1850000>;
+                               regulator-initial-mode = <2>;
+                               regulator-allowed-modes = <2>, <4>;
+                               regulator-always-on;
+
+                               regulator-state-standby {
+                                       regulator-on-in-suspend;
+                                       regulator-mode = <4>;
+                               };
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                                       regulator-mode = <4>;
+                               };
+                       };
+
+                       vdd_ddr: VDD_OTHER {
+                               regulator-name = "VDD_OTHER";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-initial-mode = <2>;
+                               regulator-allowed-modes = <2>, <4>;
+                               regulator-always-on;
+
+                               regulator-state-standby {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1800000>;
+                                       regulator-changeable-in-suspend;
+                                       regulator-mode = <4>;
+                               };
+
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1800000>;
+                                       regulator-changeable-in-suspend;
+                                       regulator-mode = <4>;
+                               };
+                       };
+
+                       LDO1 {
+                               regulator-name = "LDO1";
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <3700000>;
+                               regulator-always-on;
+
+                               regulator-state-standby {
+                                       regulator-on-in-suspend;
+                               };
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
+                       };
+
+                       LDO2 {
+                               regulator-name = "LDO2";
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <3700000>;
+                               regulator-always-on;
+
+                               regulator-state-standby {
+                                       regulator-on-in-suspend;
+                               };
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
+                       };
+               };
+       };
+};
+
+&macb0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_macb0_default>;
+       phy-mode = "rmii";
+
+       ethernet-phy@0 {
+               reg = <0x0>;
+               interrupt-parent = <&pioA>;
+               interrupts = <PIN_PB24 IRQ_TYPE_LEVEL_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_macb0_phy_irq>;
+       };
+};
+
+&pmc {
+       atmel,osc-bypass;
+};
+
+&qspi1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_qspi1_default>;
+       status = "disabled";
+
+       qspi1_flash: spi_flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <80000000>;
+               spi-rx-bus-width = <4>;
+               spi-tx-bus-width = <4>;
+               m25p,fast-read;
+               status = "disabled";
+
+               at91bootstrap@0 {
+                       label = "at91bootstrap";
+                       reg = <0x0 0x40000>;
+               };
+
+               bootloader@40000 {
+                       label = "bootloader";
+                       reg = <0x40000 0xc0000>;
+               };
+
+               bootloaderenvred@100000 {
+                       label = "bootloader env redundant";
+                       reg = <0x100000 0x40000>;
+               };
+
+               bootloaderenv@140000 {
+                       label = "bootloader env";
+                       reg = <0x140000 0x40000>;
+               };
+
+               dtb@180000 {
+                       label = "device tree";
+                       reg = <0x180000 0x80000>;
+               };
+
+               kernel@200000 {
+                       label = "kernel";
+                       reg = <0x200000 0x600000>;
+               };
+       };
+};
+
+&pioA {
+       pinctrl_flx1_default: flx1_usart_default {
+               pinmux = <PIN_PA24__FLEXCOM1_IO0>,
+                        <PIN_PA23__FLEXCOM1_IO1>,
+                        <PIN_PA25__FLEXCOM1_IO3>,
+                        <PIN_PA26__FLEXCOM1_IO4>;
+               bias-disable;
+       };
+
+       pinctrl_i2c0_default: i2c0_default {
+               pinmux = <PIN_PD21__TWD0>,
+                        <PIN_PD22__TWCK0>;
+               bias-disable;
+       };
+
+       pinctrl_i2c1_default: i2c1_default {
+               pinmux = <PIN_PD19__TWD1>,
+                        <PIN_PD20__TWCK1>;
+               bias-disable;
+       };
+
+       pinctrl_macb0_default: macb0_default {
+               pinmux = <PIN_PB14__GTXCK>,
+                        <PIN_PB15__GTXEN>,
+                        <PIN_PB16__GRXDV>,
+                        <PIN_PB17__GRXER>,
+                        <PIN_PB18__GRX0>,
+                        <PIN_PB19__GRX1>,
+                        <PIN_PB20__GTX0>,
+                        <PIN_PB21__GTX1>,
+                        <PIN_PB22__GMDC>,
+                        <PIN_PB23__GMDIO>;
+               bias-disable;
+       };
+
+       pinctrl_macb0_phy_irq: macb0_phy_irq {
+               pinmux = <PIN_PB24__GPIO>;
+               bias-disable;
+       };
+
+       pinctrl_qspi1_default: qspi1_default {
+               pinmux = <PIN_PB5__QSPI1_SCK>,
+                        <PIN_PB6__QSPI1_CS>,
+                        <PIN_PB7__QSPI1_IO0>,
+                        <PIN_PB8__QSPI1_IO1>,
+                        <PIN_PB9__QSPI1_IO2>,
+                        <PIN_PB10__QSPI1_IO3>;
+               bias-pull-up;
+       };
+};
+
diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
new file mode 100644 (file)
index 0000000..0b9fa29
--- /dev/null
@@ -0,0 +1,270 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * at91-sama5d27_wlsom1_ek.dts - Device Tree file for SAMA5D27 WLSOM1 EK
+ *
+ * Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries
+ *
+ * Author: Nicolas Ferre <nicolas.ferre@microcihp.com>
+ */
+/dts-v1/;
+#include "at91-sama5d27_wlsom1.dtsi"
+
+/ {
+       model = "Microchip SAMA5D27 WLSOM1 EK";
+       compatible = "microchip,sama5d27-wlsom1-ek", "microchip,sama5d27-wlsom1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5";
+
+       aliases {
+               serial0 = &uart0;       /* DBGU */
+               serial1 = &uart6;       /* BT */
+               serial2 = &uart5;       /* mikro BUS 2 */
+               serial3 = &uart3;       /* mikro BUS 1 */
+               i2c1    = &i2c1;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
+       gpio_keys {
+               compatible = "gpio-keys";
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_key_gpio_default>;
+               status = "okay";
+
+               sw4 {
+                       label = "USER BUTTON";
+                       gpios = <&pioA PIN_PB2 GPIO_ACTIVE_LOW>;
+                       linux,code = <0x104>;
+                       wakeup-source;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_led_gpio_default>;
+               status = "okay";
+
+               red {
+                       label = "red";
+                       gpios = <&pioA PIN_PA6 GPIO_ACTIVE_HIGH>;
+               };
+
+               green {
+                       label = "green";
+                       gpios = <&pioA PIN_PA7 GPIO_ACTIVE_HIGH>;
+               };
+
+               blue {
+                       label = "blue";
+                       gpios = <&pioA PIN_PA8 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "heartbeat";
+               };
+       };
+};
+
+&adc {
+       vddana-supply = <&vdd_3v3>;
+       vref-supply = <&vdd_3v3>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_adc_default>;
+       status = "okay";
+};
+
+&flx0 {
+       atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
+       status = "okay";
+
+       uart5: serial@200 {
+               compatible = "atmel,at91sam9260-usart";
+               reg = <0x200 0x200>;
+               interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
+               dmas = <&dma0
+                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
+                        AT91_XDMAC_DT_PERID(11))>,
+                      <&dma0
+                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
+                        AT91_XDMAC_DT_PERID(12))>;
+               dma-names = "tx", "rx";
+               clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
+               clock-names = "usart";
+               pinctrl-0 = <&pinctrl_flx0_default>;
+               pinctrl-names = "default";
+               atmel,use-dma-rx;
+               atmel,use-dma-tx;
+               status = "okay";
+       };
+};
+
+&flx1 {
+       status = "okay";
+
+       uart6: serial@200 {
+               atmel,use-dma-rx;
+               atmel,use-dma-tx;
+               status = "okay";
+       };
+};
+
+&macb0 {
+       status = "okay";
+};
+
+&pioA {
+       /*
+        * 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_PD25__GPIO>,
+                        <PIN_PD26__GPIO>;
+               bias-disable;
+       };
+
+       pinctrl_flx0_default: flx0_usart_default {
+               pinmux = <PIN_PB28__FLEXCOM0_IO0>,
+                        <PIN_PB29__FLEXCOM0_IO1>;
+               bias-disable;
+       };
+
+       pinctrl_key_gpio_default: key_gpio_default {
+               pinmux = <PIN_PB2__GPIO>;
+               bias-pull-up;
+       };
+
+       pinctrl_led_gpio_default: led_gpio_default {
+               pinmux = <PIN_PA6__GPIO>,
+                        <PIN_PA7__GPIO>,
+                        <PIN_PA8__GPIO>;
+               bias-pull-down;
+       };
+
+       pinctrl_sdmmc0_default: sdmmc0_default {
+               cmd_data {
+                       pinmux = <PIN_PA1__SDMMC0_CMD>,
+                                <PIN_PA2__SDMMC0_DAT0>,
+                                <PIN_PA3__SDMMC0_DAT1>,
+                                <PIN_PA4__SDMMC0_DAT2>,
+                                <PIN_PA5__SDMMC0_DAT3>;
+                       bias-disable;
+               };
+
+               ck_cd_vddsel {
+                       pinmux = <PIN_PA0__SDMMC0_CK>,
+                                <PIN_PA11__SDMMC0_VDDSEL>,
+                                <PIN_PA12__SDMMC0_WP>,
+                                <PIN_PA13__SDMMC0_CD>;
+                       bias-disable;
+               };
+       };
+
+       pinctrl_uart0_default: uart0_default {
+               pinmux = <PIN_PB26__URXD0>,
+                        <PIN_PB27__UTXD0>;
+               bias-disable;
+       };
+
+       pinctrl_uart3_default: uart3_default {
+               pinmux = <PIN_PB11__URXD3>,
+                        <PIN_PB12__UTXD3>;
+               bias-disable;
+       };
+
+       pinctrl_pwm0_default: pwm0_default {
+               pinmux = <PIN_PA31__PWML0>,
+                        <PIN_PA30__PWMH0>;
+               bias-disable;
+       };
+
+       pinctrl_usb_default: usb_default {
+               pinmux = <PIN_PA10__GPIO>;
+               bias-disable;
+       };
+};
+
+&pwm0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm0_default>;
+       status = "okay";
+};
+
+&qspi1 {
+       status = "okay";
+
+       qspi1_flash: spi_flash@0 {
+               status = "okay";
+       };
+};
+
+&sdmmc0 {
+       bus-width = <4>;
+       mmc-ddr-3_3v;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sdmmc0_default>;
+       status = "okay";
+};
+
+&shutdown_controller {
+       atmel,shdwc-debouncer = <976>;
+       atmel,wakeup-rtc-timer;
+
+       input@0 {
+               reg = <0>;
+               atmel,wakeup-type = "low";
+       };
+};
+
+&tcb0 {
+       timer0: timer@0 {
+               compatible = "atmel,tcb-timer";
+               reg = <0>;
+       };
+
+       timer1: timer@1 {
+               compatible = "atmel,tcb-timer";
+               reg = <1>;
+       };
+};
+
+&uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart0_default>;
+       atmel,use-dma-rx;
+       atmel,use-dma-tx;
+       status = "okay";
+};
+
+&uart3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart3_default>;
+       atmel,use-dma-rx;
+       atmel,use-dma-tx;
+       status = "okay";
+};
+
+&usb1 {
+       num-ports = <3>;
+       atmel,vbus-gpio = <0
+                          &pioA PIN_PA10 GPIO_ACTIVE_HIGH
+                          0
+                         >;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb_default>;
+       status = "okay";
+};
+
+&usb2 {
+       phy_type = "hsic";
+       status = "okay";
+};
+
+&watchdog {
+       status = "okay";
+};
+
diff --git a/arch/arm/boot/dts/at91-smartkiz.dts b/arch/arm/boot/dts/at91-smartkiz.dts
new file mode 100644 (file)
index 0000000..106f23b
--- /dev/null
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2017-2018 Overkiz SAS
+ *   Author: Mickael Gardet <m.gardet@overkiz.com>
+ *           Kévin Raymond <k.raymond@overkiz.com>
+ *           Dorian Rocipon <d.rocipon@overkiz.com>
+ */
+/dts-v1/;
+#include "at91-kizboxmini-common.dtsi"
+
+/ {
+       model = "Overkiz SmartKiz";
+       compatible = "overkiz,smartkiz", "atmel,at91sam9g25",
+                    "atmel,at91sam9x5", "atmel,at91sam9";
+
+       clocks {
+               adc_op_clk {
+                       status = "okay";
+               };
+       };
+
+       aliases {
+               serial5 = &uart0;
+       };
+
+       pio_keys {
+               hk_reset {
+                       label = "HK_RESET";
+                       gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;
+               };
+
+               power_rf {
+                       label = "POWER_RF";
+                       gpios = <&pioA 20 GPIO_ACTIVE_HIGH>;
+               };
+
+               power_wifi {
+                       label = "POWER_WIFI";
+                       gpios = <&pioA 21 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&pinctrl {
+       i2c1 {
+               pinctrl_i2c1: i2c1-0 {
+                       atmel,pins =
+                               <AT91_PIOC 0 AT91_PERIPH_C AT91_PINCTRL_PULL_UP
+                               AT91_PIOC 1 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>;
+               };
+       };
+
+       adc0 {
+               pinctrl_adc0_ad0: adc0_ad0-0 {
+                       /* pull-up disable */
+                       atmel,pins = <AT91_PIOB 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+               pinctrl_adc0_ad5: adc0_ad5-0 {
+                       /* pull-up disable */
+                       atmel,pins = <AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+               pinctrl_adc0_ad6: adc0_ad6-0 {
+                       /* pull-up disable */
+                       atmel,pins = <AT91_PIOB 17 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+               pinctrl_adc0_ad11: adc0_ad11-0 {
+                       /* pull-up disable */
+                       atmel,pins = <AT91_PIOB 10 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+       };
+};
+
+&i2c1 {
+       dmas = <0>, <0>;
+       pinctrl-0 = <&pinctrl_i2c1>;
+       status = "disabled";
+};
+
+&macb0 {
+       status = "disabled";
+};
+
+&rtc {
+       status = "okay";
+};
+
+&leds {
+       blue {
+               status = "okay";
+       };
+};
+
+&adc0 {
+       atmel,adc-vref = <2500>;
+       pinctrl-names = "default";
+       pinctrl-0 = <
+               &pinctrl_adc0_ad0
+               &pinctrl_adc0_ad5
+               &pinctrl_adc0_ad6
+               &pinctrl_adc0_ad11
+       >;
+       atmel,adc-channels-used = <0x0861>;
+       status = "okay";
+};
+
+&uart0 {
+       status = "okay";
+};
+
index dee9c0c..6afbb48 100644 (file)
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart3 {
                                        pinctrl_usart3: usart3-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                uart0 {
                                        pinctrl_uart0: uart0-0 {
                                                atmel,pins =
-                                                       <AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE
+                                                       <AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP
                                                         AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
                                        };
                                };
                                uart1 {
                                        pinctrl_uart1: uart1-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
                                };
                                status = "disabled";
                        };
 
-                       watchdog@fffffd40 {
+                       watchdog: watchdog@fffffd40 {
                                compatible = "atmel,at91sam9260-wdt";
                                reg = <0xfffffd40 0x10>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                };
        };
 
-       i2c-gpio-0 {
+       i2c_gpio0: i2c-gpio-0 {
                compatible = "i2c-gpio";
                gpios = <&pioA 23 GPIO_ACTIVE_HIGH /* sda */
                         &pioA 24 GPIO_ACTIVE_HIGH /* scl */
index dba025a..5ed3d74 100644 (file)
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                       <AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
                                                        <AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                       <AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
                                                        <AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                       <AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
                                                        <AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
index 99678ab..5c990cf 100644 (file)
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
index 691c95e..fd17909 100644 (file)
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart3 {
                                        pinctrl_usart3: usart3-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                       <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
                                                         AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
index 8643b71..ea024e4 100644 (file)
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                       <AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
                                                        <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                       <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
                                                        <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                       <AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
                                                        <AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                usart3 {
                                        pinctrl_usart3: usart3-0 {
                                                atmel,pins =
-                                                       <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                       <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
                                                        <AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
index 5652048..2012b74 100644 (file)
                        interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>;
                        clocks = <&pmc PMC_TYPE_PERIPHERAL 31>, <&pmc PMC_TYPE_GCK 31>, <&pmc PMC_TYPE_CORE PMC_MAIN>;
                        clock-names = "hclock", "multclk", "baseclk";
+                       assigned-clocks = <&pmc PMC_TYPE_GCK 31>;
+                       assigned-clock-rates = <480000000>;
                        status = "disabled";
                };
 
                        interrupts = <32 IRQ_TYPE_LEVEL_HIGH 0>;
                        clocks = <&pmc PMC_TYPE_PERIPHERAL 32>, <&pmc PMC_TYPE_GCK 32>, <&pmc PMC_TYPE_CORE PMC_MAIN>;
                        clock-names = "hclock", "multclk", "baseclk";
+                       assigned-clocks = <&pmc PMC_TYPE_GCK 32>;
+                       assigned-clock-rates = <480000000>;
                        status = "disabled";
                };
 
                                interrupts = <38 IRQ_TYPE_LEVEL_HIGH 7>;
                                #pwm-cells = <3>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 38>;
+                               status = "disabled";
                        };
 
                        sfr: sfr@f8030000 {
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 18>;
                        };
 
-                       secumod@fc040000 {
+                       pioBU: secumod@fc040000 {
                                compatible = "atmel,sama5d2-secumod", "syscon";
                                reg = <0xfc040000 0x100>;
+
+                               gpio-controller;
+                               #gpio-cells = <2>;
                        };
 
                        tdes@fc044000 {
index f770aac..203d40b 100644 (file)
                                        usart0_clk: usart0_clk {
                                                #clock-cells = <0>;
                                                reg = <12>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        usart1_clk: usart1_clk {
                                                #clock-cells = <0>;
                                                reg = <13>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        usart2_clk: usart2_clk {
                                                #clock-cells = <0>;
                                                reg = <14>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        usart3_clk: usart3_clk {
                                                #clock-cells = <0>;
                                                reg = <15>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        uart0_clk: uart0_clk {
                                                #clock-cells = <0>;
                                                reg = <16>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        twi0_clk: twi0_clk {
                                                reg = <18>;
                                                #clock-cells = <0>;
-                                               atmel,clk-output-range = <0 16625000>;
+                                               atmel,clk-output-range = <0 41500000>;
                                        };
 
                                        twi1_clk: twi1_clk {
                                                #clock-cells = <0>;
                                                reg = <19>;
-                                               atmel,clk-output-range = <0 16625000>;
+                                               atmel,clk-output-range = <0 41500000>;
                                        };
 
                                        twi2_clk: twi2_clk {
                                                #clock-cells = <0>;
                                                reg = <20>;
-                                               atmel,clk-output-range = <0 16625000>;
+                                               atmel,clk-output-range = <0 41500000>;
                                        };
 
                                        mci0_clk: mci0_clk {
                                        spi0_clk: spi0_clk {
                                                #clock-cells = <0>;
                                                reg = <24>;
-                                               atmel,clk-output-range = <0 133000000>;
+                                               atmel,clk-output-range = <0 166000000>;
                                        };
 
                                        spi1_clk: spi1_clk {
                                                #clock-cells = <0>;
                                                reg = <25>;
-                                               atmel,clk-output-range = <0 133000000>;
+                                               atmel,clk-output-range = <0 166000000>;
                                        };
 
                                        tcb0_clk: tcb0_clk {
                                                #clock-cells = <0>;
                                                reg = <26>;
-                                               atmel,clk-output-range = <0 133000000>;
+                                               atmel,clk-output-range = <0 166000000>;
                                        };
 
                                        pwm_clk: pwm_clk {
                                        adc_clk: adc_clk {
                                                #clock-cells = <0>;
                                                reg = <29>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        dma0_clk: dma0_clk {
                                        ssc0_clk: ssc0_clk {
                                                #clock-cells = <0>;
                                                reg = <38>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        ssc1_clk: ssc1_clk {
                                                #clock-cells = <0>;
                                                reg = <39>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        sha_clk: sha_clk {
index cf06a01..2470dd3 100644 (file)
                                        can0_clk: can0_clk {
                                                #clock-cells = <0>;
                                                reg = <40>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        can1_clk: can1_clk {
                                                #clock-cells = <0>;
                                                reg = <41>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
                                };
                        };
index 1584035..215802b 100644 (file)
@@ -22,6 +22,7 @@
                                        tcb1_clk: tcb1_clk {
                                                #clock-cells = <0>;
                                                reg = <27>;
+                                               atmel,clk-output-range = <0 166000000>;
                                        };
                                };
                        };
index 4316bdb..cb62adb 100644 (file)
                                        uart0_clk: uart0_clk {
                                                #clock-cells = <0>;
                                                reg = <16>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
 
                                        uart1_clk: uart1_clk {
                                                #clock-cells = <0>;
                                                reg = <17>;
-                                               atmel,clk-output-range = <0 66000000>;
+                                               atmel,clk-output-range = <0 83000000>;
                                        };
                                };
                        };