ARM: dts: at91: add smartkiz support and a common kizboxmini dtsi file
authorKamel Bouhara <kamel.bouhara@bootlin.com>
Fri, 20 Dec 2019 10:38:35 +0000 (11:38 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 20 Dec 2019 16:46:49 +0000 (17:46 +0100)
Split the existing Kizbox Mini boards into three board configuration,
the base board, the mother board and the RailDIN board.
Add a new dts file for the SmartKiz board support.

Signed-off-by: Kévin RAYMOND <k.raymond@overkiz.com>
Signed-off-by: Mickael GARDET <m.gardet@overkiz.com>
Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
Link: https://lore.kernel.org/r/20191220103835.160154-2-kamel.bouhara@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
arch/arm/boot/dts/Makefile
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-smartkiz.dts [new file with mode: 0644]

index 54d6e480e3366be8223e5b50e63c3eba6fb27eb5..20096365f5d4a2ec8c072aebedaa7244ad297cc0 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 \
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";
-};
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";
+};
+