* [PATCH v3 1/2] dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding
@ 2019-11-06 8:36 ` Kamel Bouhara
0 siblings, 0 replies; 8+ messages in thread
From: Kamel Bouhara @ 2019-11-06 8:36 UTC (permalink / raw)
To: Rob Herring, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches,
linux-arm-kernel
Cc: devicetree, Thomas Petazzoni, Kamel Bouhara
Document devicetree's bindings for the Overkiz's Kizbox Mini and
Smartkiz boards, based on a SAM9G25 Atmel SoC.
Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
---
Changes in v2
=============
- Added Kizboxmini Base board documentation
- Merged Smartkiz documentation as it is also a sam9g25 based
board
Changes in v3
=============
- Made a single items list with all the sam9g25 based boards and
put description into a comment.
- Fixed duplicated item in enum list and checked with 'make
dt_binding_check'
---
Documentation/devicetree/bindings/arm/atmel-at91.yaml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
index 6dd8be401673..e4140e94864d 100644
--- a/Documentation/devicetree/bindings/arm/atmel-at91.yaml
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
@@ -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
--
2.24.0.rc1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 1/2] dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding
@ 2019-11-06 8:36 ` Kamel Bouhara
0 siblings, 0 replies; 8+ messages in thread
From: Kamel Bouhara @ 2019-11-06 8:36 UTC (permalink / raw)
To: Rob Herring, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches,
linux-arm-kernel
Cc: devicetree, Thomas Petazzoni, Kamel Bouhara
Document devicetree's bindings for the Overkiz's Kizbox Mini and
Smartkiz boards, based on a SAM9G25 Atmel SoC.
Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
---
Changes in v2
=============
- Added Kizboxmini Base board documentation
- Merged Smartkiz documentation as it is also a sam9g25 based
board
Changes in v3
=============
- Made a single items list with all the sam9g25 based boards and
put description into a comment.
- Fixed duplicated item in enum list and checked with 'make
dt_binding_check'
---
Documentation/devicetree/bindings/arm/atmel-at91.yaml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
index 6dd8be401673..e4140e94864d 100644
--- a/Documentation/devicetree/bindings/arm/atmel-at91.yaml
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
@@ -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
--
2.24.0.rc1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/2] ARM: dts: at91: add smartkiz support and a common kizboxmini dtsi file
2019-11-06 8:36 ` Kamel Bouhara
@ 2019-11-06 8:36 ` Kamel Bouhara
-1 siblings, 0 replies; 8+ messages in thread
From: Kamel Bouhara @ 2019-11-06 8:36 UTC (permalink / raw)
To: Rob Herring, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches,
linux-arm-kernel
Cc: devicetree, Thomas Petazzoni, Kamel Bouhara, Kévin RAYMOND,
Mickael GARDET
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>
---
arch/arm/boot/dts/Makefile | 5 +-
arch/arm/boot/dts/at91-kizboxmini-base.dts | 24 +++
...oxmini.dts => at91-kizboxmini-common.dtsi} | 163 +++++++++---------
arch/arm/boot/dts/at91-kizboxmini-mb.dts | 26 +++
arch/arm/boot/dts/at91-kizboxmini-rd.dts | 49 ++++++
arch/arm/boot/dts/at91-smartkiz.dts | 109 ++++++++++++
6 files changed, 293 insertions(+), 83 deletions(-)
create mode 100644 arch/arm/boot/dts/at91-kizboxmini-base.dts
rename arch/arm/boot/dts/{at91-kizboxmini.dts => at91-kizboxmini-common.dtsi} (51%)
create mode 100644 arch/arm/boot/dts/at91-kizboxmini-mb.dts
create mode 100644 arch/arm/boot/dts/at91-kizboxmini-rd.dts
create mode 100644 arch/arm/boot/dts/at91-smartkiz.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 4ac053115a8e..83865d3072b5 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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
index 000000000000..81c29ca5cc1b
--- /dev/null
+++ b/arch/arm/boot/dts/at91-kizboxmini-base.dts
@@ -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.dts b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
similarity index 51%
rename from arch/arm/boot/dts/at91-kizboxmini.dts
rename to arch/arm/boot/dts/at91-kizboxmini-common.dtsi
index cb22f5fb055f..fddf267b2d17 100644
--- a/arch/arm/boot/dts/at91-kizboxmini.dts
+++ b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
@@ -1,17 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0
/*
* at91-kizboxmini.dts - Device Tree file for Overkiz Kizbox mini board
*
- * Copyright (C) 2014 Gaël PORTAY <g.portay@overkiz.com>
+ * 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>
*/
-/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;
@@ -22,24 +21,16 @@
};
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";
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
+
+ adc_op_clk {
+ status = "disabled";
};
};
@@ -63,17 +54,25 @@
};
};
- pwm_leds {
+ leds: pwm_leds {
compatible = "pwm-leds";
- green {
+ 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";
};
- red {
+ led_red: pwm_red {
label = "pwm:red:user";
pwms = <&pwm0 1 10000000 0>;
max-brightness = <255>;
@@ -82,53 +81,12 @@
};
};
-&dbgu {
+&usart0 {
+ atmel,use-dma-rx;
+ atmel,use-dma-tx;
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";
@@ -137,26 +95,70 @@
&pwm0 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwm0_1
- &pinctrl_pwm0_pwm1_1>;
+ &pinctrl_pwm0_pwm1_1
+ &pinctrl_pwm0_pwm2_1>;
status = "okay";
};
-&tcb0 {
- timer@0 {
- compatible = "atmel,tcb-timer";
- reg = <0>;
- };
+&dbgu {
+ status = "okay";
+};
- timer@1 {
- compatible = "atmel,tcb-timer";
- reg = <1>;
- };
+&watchdog {
+ status = "okay";
};
-&usart0 {
+&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";
@@ -166,6 +168,3 @@
status = "okay";
};
-&watchdog {
- 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
index 000000000000..c07d3076a9bc
--- /dev/null
+++ b/arch/arm/boot/dts/at91-kizboxmini-mb.dts
@@ -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
index 000000000000..ab50f4d22387
--- /dev/null
+++ b/arch/arm/boot/dts/at91-kizboxmini-rd.dts
@@ -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-smartkiz.dts b/arch/arm/boot/dts/at91-smartkiz.dts
new file mode 100644
index 000000000000..2354385f9685
--- /dev/null
+++ b/arch/arm/boot/dts/at91-smartkiz.dts
@@ -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";
+};
+
--
2.24.0.rc1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/2] ARM: dts: at91: add smartkiz support and a common kizboxmini dtsi file
@ 2019-11-06 8:36 ` Kamel Bouhara
0 siblings, 0 replies; 8+ messages in thread
From: Kamel Bouhara @ 2019-11-06 8:36 UTC (permalink / raw)
To: Rob Herring, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches,
linux-arm-kernel
Cc: Mickael GARDET, devicetree, Kévin RAYMOND, Thomas Petazzoni,
Kamel Bouhara
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>
---
arch/arm/boot/dts/Makefile | 5 +-
arch/arm/boot/dts/at91-kizboxmini-base.dts | 24 +++
...oxmini.dts => at91-kizboxmini-common.dtsi} | 163 +++++++++---------
arch/arm/boot/dts/at91-kizboxmini-mb.dts | 26 +++
arch/arm/boot/dts/at91-kizboxmini-rd.dts | 49 ++++++
arch/arm/boot/dts/at91-smartkiz.dts | 109 ++++++++++++
6 files changed, 293 insertions(+), 83 deletions(-)
create mode 100644 arch/arm/boot/dts/at91-kizboxmini-base.dts
rename arch/arm/boot/dts/{at91-kizboxmini.dts => at91-kizboxmini-common.dtsi} (51%)
create mode 100644 arch/arm/boot/dts/at91-kizboxmini-mb.dts
create mode 100644 arch/arm/boot/dts/at91-kizboxmini-rd.dts
create mode 100644 arch/arm/boot/dts/at91-smartkiz.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 4ac053115a8e..83865d3072b5 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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
index 000000000000..81c29ca5cc1b
--- /dev/null
+++ b/arch/arm/boot/dts/at91-kizboxmini-base.dts
@@ -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.dts b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
similarity index 51%
rename from arch/arm/boot/dts/at91-kizboxmini.dts
rename to arch/arm/boot/dts/at91-kizboxmini-common.dtsi
index cb22f5fb055f..fddf267b2d17 100644
--- a/arch/arm/boot/dts/at91-kizboxmini.dts
+++ b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
@@ -1,17 +1,16 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0
/*
* at91-kizboxmini.dts - Device Tree file for Overkiz Kizbox mini board
*
- * Copyright (C) 2014 Gaël PORTAY <g.portay@overkiz.com>
+ * 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>
*/
-/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;
@@ -22,24 +21,16 @@
};
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";
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
+
+ adc_op_clk {
+ status = "disabled";
};
};
@@ -63,17 +54,25 @@
};
};
- pwm_leds {
+ leds: pwm_leds {
compatible = "pwm-leds";
- green {
+ 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";
};
- red {
+ led_red: pwm_red {
label = "pwm:red:user";
pwms = <&pwm0 1 10000000 0>;
max-brightness = <255>;
@@ -82,53 +81,12 @@
};
};
-&dbgu {
+&usart0 {
+ atmel,use-dma-rx;
+ atmel,use-dma-tx;
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";
@@ -137,26 +95,70 @@
&pwm0 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwm0_1
- &pinctrl_pwm0_pwm1_1>;
+ &pinctrl_pwm0_pwm1_1
+ &pinctrl_pwm0_pwm2_1>;
status = "okay";
};
-&tcb0 {
- timer@0 {
- compatible = "atmel,tcb-timer";
- reg = <0>;
- };
+&dbgu {
+ status = "okay";
+};
- timer@1 {
- compatible = "atmel,tcb-timer";
- reg = <1>;
- };
+&watchdog {
+ status = "okay";
};
-&usart0 {
+&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";
@@ -166,6 +168,3 @@
status = "okay";
};
-&watchdog {
- 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
index 000000000000..c07d3076a9bc
--- /dev/null
+++ b/arch/arm/boot/dts/at91-kizboxmini-mb.dts
@@ -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
index 000000000000..ab50f4d22387
--- /dev/null
+++ b/arch/arm/boot/dts/at91-kizboxmini-rd.dts
@@ -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-smartkiz.dts b/arch/arm/boot/dts/at91-smartkiz.dts
new file mode 100644
index 000000000000..2354385f9685
--- /dev/null
+++ b/arch/arm/boot/dts/at91-smartkiz.dts
@@ -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";
+};
+
--
2.24.0.rc1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding
2019-11-06 8:36 ` Kamel Bouhara
@ 2019-11-13 3:50 ` Rob Herring
-1 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2019-11-13 3:50 UTC (permalink / raw)
To: Kamel Bouhara
Cc: Nicolas Ferre, Alexandre Belloni, Ludovic Desroches,
linux-arm-kernel, devicetree, Thomas Petazzoni
On Wed, Nov 06, 2019 at 09:36:42AM +0100, Kamel Bouhara wrote:
> Document devicetree's bindings for the Overkiz's Kizbox Mini and
> Smartkiz boards, based on a SAM9G25 Atmel SoC.
>
> Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
> ---
> Changes in v2
> =============
> - Added Kizboxmini Base board documentation
> - Merged Smartkiz documentation as it is also a sam9g25 based
> board
>
> Changes in v3
> =============
> - Made a single items list with all the sam9g25 based boards and
> put description into a comment.
> - Fixed duplicated item in enum list and checked with 'make
> dt_binding_check'
Are you sure?
> ---
> Documentation/devicetree/bindings/arm/atmel-at91.yaml | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> index 6dd8be401673..e4140e94864d 100644
> --- a/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> +++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> @@ -35,6 +35,16 @@ properties:
> - atmel,at91sam9x60
> - const: atmel,at91sam9
>
> + items:
You are missing a '-' here, giving this:
Traceback (most recent call last):
File "/usr/local/bin/dt-mk-schema", line 32, in <module>
schemas = dtschema.process_schemas(args.schemas, core_schema=(not
args.useronly))
File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
475, in process_schemas
sch = process_schema(os.path.abspath(filename))
File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
427, in process_schema
schema = load_schema(filename)
File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
103, in load_schema
return yaml.load(f.read())
File "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/main.py",
line 341, in load
return constructor.get_single_data()
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 113, in get_single_data
return self.construct_document(node)
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 123, in construct_document
for _dummy in generator:
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 723, in construct_yaml_map
value = self.construct_mapping(node)
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 440, in construct_mapping
return BaseConstructor.construct_mapping(self, node, deep=deep)
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 257, in construct_mapping
if self.check_mapping_key(node, key_node, mapping, key, value):
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 295, in check_mapping_key
raise DuplicateKeyError(*args)
ruamel.yaml.constructor.DuplicateKeyError: while constructing a mapping
in "<unicode string>", line 23, column 9
found duplicate key "items" with value "[]" (original value: "[]")
in "<unicode string>", line 38, column 9
To suppress this check see:
http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys
Duplicate keys will become an error in future releases, and are errors
by default when using the new API.
Documentation/devicetree/bindings/Makefile:33: recipe for target
'Documentation/devicetree/bindings/processed-schema.yaml' failed
> + - 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
> --
> 2.24.0.rc1
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding
@ 2019-11-13 3:50 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2019-11-13 3:50 UTC (permalink / raw)
To: Kamel Bouhara
Cc: devicetree, Alexandre Belloni, Ludovic Desroches,
Thomas Petazzoni, linux-arm-kernel
On Wed, Nov 06, 2019 at 09:36:42AM +0100, Kamel Bouhara wrote:
> Document devicetree's bindings for the Overkiz's Kizbox Mini and
> Smartkiz boards, based on a SAM9G25 Atmel SoC.
>
> Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
> ---
> Changes in v2
> =============
> - Added Kizboxmini Base board documentation
> - Merged Smartkiz documentation as it is also a sam9g25 based
> board
>
> Changes in v3
> =============
> - Made a single items list with all the sam9g25 based boards and
> put description into a comment.
> - Fixed duplicated item in enum list and checked with 'make
> dt_binding_check'
Are you sure?
> ---
> Documentation/devicetree/bindings/arm/atmel-at91.yaml | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> index 6dd8be401673..e4140e94864d 100644
> --- a/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> +++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> @@ -35,6 +35,16 @@ properties:
> - atmel,at91sam9x60
> - const: atmel,at91sam9
>
> + items:
You are missing a '-' here, giving this:
Traceback (most recent call last):
File "/usr/local/bin/dt-mk-schema", line 32, in <module>
schemas = dtschema.process_schemas(args.schemas, core_schema=(not
args.useronly))
File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
475, in process_schemas
sch = process_schema(os.path.abspath(filename))
File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
427, in process_schema
schema = load_schema(filename)
File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
103, in load_schema
return yaml.load(f.read())
File "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/main.py",
line 341, in load
return constructor.get_single_data()
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 113, in get_single_data
return self.construct_document(node)
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 123, in construct_document
for _dummy in generator:
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 723, in construct_yaml_map
value = self.construct_mapping(node)
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 440, in construct_mapping
return BaseConstructor.construct_mapping(self, node, deep=deep)
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 257, in construct_mapping
if self.check_mapping_key(node, key_node, mapping, key, value):
File
"/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
line 295, in check_mapping_key
raise DuplicateKeyError(*args)
ruamel.yaml.constructor.DuplicateKeyError: while constructing a mapping
in "<unicode string>", line 23, column 9
found duplicate key "items" with value "[]" (original value: "[]")
in "<unicode string>", line 38, column 9
To suppress this check see:
http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys
Duplicate keys will become an error in future releases, and are errors
by default when using the new API.
Documentation/devicetree/bindings/Makefile:33: recipe for target
'Documentation/devicetree/bindings/processed-schema.yaml' failed
> + - 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
> --
> 2.24.0.rc1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding
2019-11-13 3:50 ` Rob Herring
@ 2019-11-13 10:10 ` Kamel Bouhara
-1 siblings, 0 replies; 8+ messages in thread
From: Kamel Bouhara @ 2019-11-13 10:10 UTC (permalink / raw)
To: Rob Herring
Cc: Nicolas Ferre, Alexandre Belloni, Ludovic Desroches,
linux-arm-kernel, devicetree, Thomas Petazzoni
On Tue, Nov 12, 2019 at 09:50:22PM -0600, Rob Herring wrote:
> On Wed, Nov 06, 2019 at 09:36:42AM +0100, Kamel Bouhara wrote:
> > Document devicetree's bindings for the Overkiz's Kizbox Mini and
> > Smartkiz boards, based on a SAM9G25 Atmel SoC.
> >
> > Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
> > ---
> > Changes in v2
> > =============
> > - Added Kizboxmini Base board documentation
> > - Merged Smartkiz documentation as it is also a sam9g25 based
> > board
> >
> > Changes in v3
> > =============
> > - Made a single items list with all the sam9g25 based boards and
> > put description into a comment.
> > - Fixed duplicated item in enum list and checked with 'make
> > dt_binding_check'
>
> Are you sure?
>
Yes, here is the command output I've got :
$ make ARCH=arm dt_binding_check \
DT_SCHEMA_FILES="Documentation/devicetree/bindings/arm/atmel-at91.yaml" \
DT_SCHEMA_FLAGS="-u"
SCHEMA Documentation/devicetree/bindings/processed-schema.yaml
DTC Documentation/devicetree/bindings/arm/atmel-at91.example.dt.yaml
CHECK Documentation/devicetree/bindings/arm/atmel-at91.example.dt.yaml
> > ---
> > Documentation/devicetree/bindings/arm/atmel-at91.yaml | 10 ++++++++++
> > 1 file changed, 10 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> > index 6dd8be401673..e4140e94864d 100644
> > --- a/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> > +++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> > @@ -35,6 +35,16 @@ properties:
> > - atmel,at91sam9x60
> > - const: atmel,at91sam9
> >
> > + items:
>
> You are missing a '-' here, giving this:
>
Yes but the log you're putting seems more related to a python issue (2.6 vs 3)
?
> Traceback (most recent call last):
> File "/usr/local/bin/dt-mk-schema", line 32, in <module>
> schemas = dtschema.process_schemas(args.schemas, core_schema=(not
> args.useronly))
> File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
> 475, in process_schemas
> sch = process_schema(os.path.abspath(filename))
> File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
> 427, in process_schema
> schema = load_schema(filename)
> File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
> 103, in load_schema
> return yaml.load(f.read())
> File "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/main.py",
> line 341, in load
> return constructor.get_single_data()
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 113, in get_single_data
> return self.construct_document(node)
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 123, in construct_document
> for _dummy in generator:
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 723, in construct_yaml_map
> value = self.construct_mapping(node)
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 440, in construct_mapping
> return BaseConstructor.construct_mapping(self, node, deep=deep)
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 257, in construct_mapping
> if self.check_mapping_key(node, key_node, mapping, key, value):
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 295, in check_mapping_key
> raise DuplicateKeyError(*args)
> ruamel.yaml.constructor.DuplicateKeyError: while constructing a mapping
> in "<unicode string>", line 23, column 9
> found duplicate key "items" with value "[]" (original value: "[]")
> in "<unicode string>", line 38, column 9
>
> To suppress this check see:
> http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys
>
> Duplicate keys will become an error in future releases, and are errors
> by default when using the new API.
>
> Documentation/devicetree/bindings/Makefile:33: recipe for target
> 'Documentation/devicetree/bindings/processed-schema.yaml' failed
>
>
> > + - 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
> > --
> > 2.24.0.rc1
> >
--
Kamel Bouhara, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding
@ 2019-11-13 10:10 ` Kamel Bouhara
0 siblings, 0 replies; 8+ messages in thread
From: Kamel Bouhara @ 2019-11-13 10:10 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, Alexandre Belloni, Ludovic Desroches,
Thomas Petazzoni, linux-arm-kernel
On Tue, Nov 12, 2019 at 09:50:22PM -0600, Rob Herring wrote:
> On Wed, Nov 06, 2019 at 09:36:42AM +0100, Kamel Bouhara wrote:
> > Document devicetree's bindings for the Overkiz's Kizbox Mini and
> > Smartkiz boards, based on a SAM9G25 Atmel SoC.
> >
> > Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
> > ---
> > Changes in v2
> > =============
> > - Added Kizboxmini Base board documentation
> > - Merged Smartkiz documentation as it is also a sam9g25 based
> > board
> >
> > Changes in v3
> > =============
> > - Made a single items list with all the sam9g25 based boards and
> > put description into a comment.
> > - Fixed duplicated item in enum list and checked with 'make
> > dt_binding_check'
>
> Are you sure?
>
Yes, here is the command output I've got :
$ make ARCH=arm dt_binding_check \
DT_SCHEMA_FILES="Documentation/devicetree/bindings/arm/atmel-at91.yaml" \
DT_SCHEMA_FLAGS="-u"
SCHEMA Documentation/devicetree/bindings/processed-schema.yaml
DTC Documentation/devicetree/bindings/arm/atmel-at91.example.dt.yaml
CHECK Documentation/devicetree/bindings/arm/atmel-at91.example.dt.yaml
> > ---
> > Documentation/devicetree/bindings/arm/atmel-at91.yaml | 10 ++++++++++
> > 1 file changed, 10 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> > index 6dd8be401673..e4140e94864d 100644
> > --- a/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> > +++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
> > @@ -35,6 +35,16 @@ properties:
> > - atmel,at91sam9x60
> > - const: atmel,at91sam9
> >
> > + items:
>
> You are missing a '-' here, giving this:
>
Yes but the log you're putting seems more related to a python issue (2.6 vs 3)
?
> Traceback (most recent call last):
> File "/usr/local/bin/dt-mk-schema", line 32, in <module>
> schemas = dtschema.process_schemas(args.schemas, core_schema=(not
> args.useronly))
> File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
> 475, in process_schemas
> sch = process_schema(os.path.abspath(filename))
> File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
> 427, in process_schema
> schema = load_schema(filename)
> File "/usr/local/lib/python3.6/dist-packages/dtschema/lib.py", line
> 103, in load_schema
> return yaml.load(f.read())
> File "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/main.py",
> line 341, in load
> return constructor.get_single_data()
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 113, in get_single_data
> return self.construct_document(node)
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 123, in construct_document
> for _dummy in generator:
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 723, in construct_yaml_map
> value = self.construct_mapping(node)
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 440, in construct_mapping
> return BaseConstructor.construct_mapping(self, node, deep=deep)
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 257, in construct_mapping
> if self.check_mapping_key(node, key_node, mapping, key, value):
> File
> "/usr/local/lib/python3.6/dist-packages/ruamel/yaml/constructor.py",
> line 295, in check_mapping_key
> raise DuplicateKeyError(*args)
> ruamel.yaml.constructor.DuplicateKeyError: while constructing a mapping
> in "<unicode string>", line 23, column 9
> found duplicate key "items" with value "[]" (original value: "[]")
> in "<unicode string>", line 38, column 9
>
> To suppress this check see:
> http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys
>
> Duplicate keys will become an error in future releases, and are errors
> by default when using the new API.
>
> Documentation/devicetree/bindings/Makefile:33: recipe for target
> 'Documentation/devicetree/bindings/processed-schema.yaml' failed
>
>
> > + - 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
> > --
> > 2.24.0.rc1
> >
--
Kamel Bouhara, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-11-13 10:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-06 8:36 [PATCH v3 1/2] dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding Kamel Bouhara
2019-11-06 8:36 ` Kamel Bouhara
2019-11-06 8:36 ` [PATCH v3 2/2] ARM: dts: at91: add smartkiz support and a common kizboxmini dtsi file Kamel Bouhara
2019-11-06 8:36 ` Kamel Bouhara
2019-11-13 3:50 ` [PATCH v3 1/2] dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding Rob Herring
2019-11-13 3:50 ` Rob Herring
2019-11-13 10:10 ` Kamel Bouhara
2019-11-13 10:10 ` Kamel Bouhara
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.