2015-05-04 15:59:23

by Gaël PORTAY

[permalink] [raw]
Subject: [PATCH v5 0/2] ARM: at91/dt: add support for at91-kizboxmini

Hi,

Here are two patches to bring support for a new hardware based on SAM9G25 SoC.

The first one adds the PIN controller definition for PWM0.
The second defines the new board.

Changes since v1:
- drop useless comments
- move pwm0 pinctrl's node close to tcb0
- drop ek boards from compatible machine
- add at91sam9g25 board to compatible machine

Changes since v2:
- update to v4.0
- fix alphabetical order between gpio_keys and pwm_leds

Changes since v3:
- add num-ports = <1> attribute to ohci node

Changes since v4:
- update to v4.0.1
- update "Acked-by" list

Best regards,
Gaël PORTAY (2):
ARM: at91/dt: sam9x5: add pinctrl for pwm0
ARM: at91/dt: add support for kizboxmini

arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/at91-kizboxmini.dts | 130 ++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/at91sam9x5.dtsi | 46 ++++++++++++
3 files changed, 177 insertions(+)
create mode 100644 arch/arm/boot/dts/at91-kizboxmini.dts

--
1.9.1


2015-05-04 16:08:55

by Gaël PORTAY

[permalink] [raw]
Subject: [PATCH v5 1/2] ARM: at91/dt: sam9x5: add pinctrl for pwm0

Defines the pinctrl configurations for PWM0.

Signed-off-by: Gaël PORTAY <[email protected]>
Acked-by: Boris Brezillon <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9x5.dtsi | 46 +++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index d221179..98977ad 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -694,6 +694,52 @@
};
};

+ pwm0 {
+ pinctrl_pwm0_pwm0_0: pwm0_pwm0-0 {
+ atmel,pins =
+ <AT91_PIOB 11 AT91_PERIPH_B AT91_PINCTRL_NONE>;
+ };
+ pinctrl_pwm0_pwm0_1: pwm0_pwm0-1 {
+ atmel,pins =
+ <AT91_PIOC 10 AT91_PERIPH_C AT91_PINCTRL_NONE>;
+ };
+ pinctrl_pwm0_pwm0_2: pwm0_pwm0-2 {
+ atmel,pins =
+ <AT91_PIOC 18 AT91_PERIPH_C AT91_PINCTRL_NONE>;
+ };
+
+ pinctrl_pwm0_pwm1_0: pwm0_pwm1-0 {
+ atmel,pins =
+ <AT91_PIOB 12 AT91_PERIPH_B AT91_PINCTRL_NONE>;
+ };
+ pinctrl_pwm0_pwm1_1: pwm0_pwm1-1 {
+ atmel,pins =
+ <AT91_PIOC 11 AT91_PERIPH_C AT91_PINCTRL_NONE>;
+ };
+ pinctrl_pwm0_pwm1_2: pwm0_pwm1-2 {
+ atmel,pins =
+ <AT91_PIOC 19 AT91_PERIPH_C AT91_PINCTRL_NONE>;
+ };
+
+ pinctrl_pwm0_pwm2_0: pwm0_pwm2-0 {
+ atmel,pins =
+ <AT91_PIOB 13 AT91_PERIPH_B AT91_PINCTRL_NONE>;
+ };
+ pinctrl_pwm0_pwm2_1: pwm0_pwm2-1 {
+ atmel,pins =
+ <AT91_PIOC 20 AT91_PERIPH_C AT91_PINCTRL_NONE>;
+ };
+
+ pinctrl_pwm0_pwm3_0: pwm0_pwm3-0 {
+ atmel,pins =
+ <AT91_PIOB 14 AT91_PERIPH_B AT91_PINCTRL_NONE>;
+ };
+ pinctrl_pwm0_pwm3_1: pwm0_pwm3-1 {
+ atmel,pins =
+ <AT91_PIOC 21 AT91_PERIPH_C AT91_PINCTRL_NONE>;
+ };
+ };
+
tcb0 {
pinctrl_tcb0_tclk0: tcb0_tclk0-0 {
atmel,pins = <AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_NONE>;
--
1.9.1

2015-05-04 16:38:36

by Gaël PORTAY

[permalink] [raw]
Subject: [PATCH v5 2/2] ARM: at91/dt: add support for kizboxmini

Add DT file for Kizbox mini board.
This board is based on Atmel's AT91SAM9G25 SoC.

Signed-off-by: Gaël PORTAY <[email protected]>
Acked-by: Boris Brezillon <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/at91-kizboxmini.dts | 130 ++++++++++++++++++++++++++++++++++
2 files changed, 131 insertions(+)
create mode 100644 arch/arm/boot/dts/at91-kizboxmini.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 21726fd..4bf72c0 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -30,6 +30,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
at91sam9rlek.dtb \
at91-ariag25.dtb \
at91-cosino_mega2560.dtb \
+ at91-kizboxmini.dtb \
at91sam9g15ek.dtb \
at91sam9g25ek.dtb \
at91sam9g35ek.dtb \
diff --git a/arch/arm/boot/dts/at91-kizboxmini.dts b/arch/arm/boot/dts/at91-kizboxmini.dts
new file mode 100644
index 0000000..7a899ca
--- /dev/null
+++ b/arch/arm/boot/dts/at91-kizboxmini.dts
@@ -0,0 +1,130 @@
+/*
+ * at91-kizboxmini.dts - Device Tree file for Overkiz Kizbox mini board
+ *
+ * Copyright (C) 2014 Gaël PORTAY <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+/dts-v1/;
+#include "at91sam9g25.dtsi"
+#include "at91sam9x5.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";
+ linux,stdout-path = &dbgu;
+ };
+
+ memory {
+ reg = <0x20000000 0x8000000>;
+ };
+
+ clocks {
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
+
+ main_xtal {
+ clock-frequency = <12000000>;
+ };
+ };
+
+ ahb {
+ apb {
+ usart0: serial@f801c000 {
+ status = "okay";
+ };
+
+ macb0: ethernet@f802c000 {
+ phy-mode = "rmii";
+ status = "okay";
+ };
+
+ pwm0: pwm@f8034000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm0_pwm0_1
+ &pinctrl_pwm0_pwm1_1>;
+ status = "okay";
+ };
+
+ dbgu: serial@fffff200 {
+ status = "okay";
+ };
+
+ watchdog@fffffe40 {
+ status = "okay";
+ };
+ };
+
+ usb0: ohci@00600000 {
+ num-ports = <1>;
+ status = "okay";
+ };
+
+ usb1: ehci@00700000 {
+ status = "okay";
+ };
+
+ 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";
+
+ bootstrap@0 {
+ label = "bootstrap";
+ reg = <0x0 0x20000>;
+ };
+
+ ubi@20000 {
+ label = "ubi";
+ reg = <0x20000 0x7fe0000>;
+ };
+ };
+ };
+
+ gpio_keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ prog {
+ label = "PB_PROG";
+ gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
+ linux,code = <0x102>;
+ gpio-key,wakeup;
+ };
+
+ reset {
+ label = "PB_RST";
+ gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
+ linux,code = <0x100>;
+ gpio-key,wakeup;
+ };
+ };
+
+ 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";
+ };
+ };
+};
--
1.9.1

2015-05-11 09:18:49

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH v5 2/2] ARM: at91/dt: add support for kizboxmini

Le 04/05/2015 17:59, Gaël PORTAY a écrit :
> Add DT file for Kizbox mini board.
> This board is based on Atmel's AT91SAM9G25 SoC.
>
> Signed-off-by: Gaël PORTAY <[email protected]>
> Acked-by: Boris Brezillon <[email protected]>
> Acked-by: Alexandre Belloni <[email protected]>

Acked-by: Nicolas Ferre <[email protected]>
Nitpicking below...

> ---
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/at91-kizboxmini.dts | 130 ++++++++++++++++++++++++++++++++++
> 2 files changed, 131 insertions(+)
> create mode 100644 arch/arm/boot/dts/at91-kizboxmini.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 21726fd..4bf72c0 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -30,6 +30,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
> at91sam9rlek.dtb \
> at91-ariag25.dtb \
> at91-cosino_mega2560.dtb \
> + at91-kizboxmini.dtb \
> at91sam9g15ek.dtb \
> at91sam9g25ek.dtb \
> at91sam9g35ek.dtb \
> diff --git a/arch/arm/boot/dts/at91-kizboxmini.dts b/arch/arm/boot/dts/at91-kizboxmini.dts
> new file mode 100644
> index 0000000..7a899ca
> --- /dev/null
> +++ b/arch/arm/boot/dts/at91-kizboxmini.dts
> @@ -0,0 +1,130 @@
> +/*
> + * at91-kizboxmini.dts - Device Tree file for Overkiz Kizbox mini board
> + *
> + * Copyright (C) 2014 Gaël PORTAY <[email protected]>
> + *
> + * Licensed under GPLv2 or later.
> + */
> +/dts-v1/;
> +#include "at91sam9g25.dtsi"
> +#include "at91sam9x5.dtsi"

Not needed as already included in at91sam9g25.dtsi: I remove it before
applying the patch.

Bye,

> +#include <dt-bindings/pwm/pwm.h>
> +
> +/ {
> + model = "Overkiz Kizbox mini";
> + compatible = "overkiz,kizboxmini", "atmel,at91sam9g25", "atmel,at91sam9x5", "atmel,at91sam9";
> +
> + chosen {
> + bootargs = "ubi.mtd=ubi";
> + linux,stdout-path = &dbgu;
> + };
> +
> + memory {
> + reg = <0x20000000 0x8000000>;
> + };
> +
> + clocks {
> + slow_xtal {
> + clock-frequency = <32768>;
> + };
> +
> + main_xtal {
> + clock-frequency = <12000000>;
> + };
> + };
> +
> + ahb {
> + apb {
> + usart0: serial@f801c000 {
> + status = "okay";
> + };
> +
> + macb0: ethernet@f802c000 {
> + phy-mode = "rmii";
> + status = "okay";
> + };
> +
> + pwm0: pwm@f8034000 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm0_pwm0_1
> + &pinctrl_pwm0_pwm1_1>;
> + status = "okay";
> + };
> +
> + dbgu: serial@fffff200 {
> + status = "okay";
> + };
> +
> + watchdog@fffffe40 {
> + status = "okay";
> + };
> + };
> +
> + usb0: ohci@00600000 {
> + num-ports = <1>;
> + status = "okay";
> + };
> +
> + usb1: ehci@00700000 {
> + status = "okay";
> + };
> +
> + 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";
> +
> + bootstrap@0 {
> + label = "bootstrap";
> + reg = <0x0 0x20000>;
> + };
> +
> + ubi@20000 {
> + label = "ubi";
> + reg = <0x20000 0x7fe0000>;
> + };
> + };
> + };
> +
> + gpio_keys {
> + compatible = "gpio-keys";
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + prog {
> + label = "PB_PROG";
> + gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
> + linux,code = <0x102>;
> + gpio-key,wakeup;
> + };
> +
> + reset {
> + label = "PB_RST";
> + gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
> + linux,code = <0x100>;
> + gpio-key,wakeup;
> + };
> + };
> +
> + 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";
> + };
> + };
> +};
>


--
Nicolas Ferre