Commit e59760f7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-5.6-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt 

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: default avatarOlof Johansson <olof@lixom.net>
parents 2db34041 a7e0f3fc

Documentation/devicetree/bindings/arm/atmel-at91.yaml

+25 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/boot/dts/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -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 \

arch/arm/boot/dts/at91-kizbox.dts

+84 −88
Original line number Diff line number Diff line
@@ -28,85 +28,6 @@ main_xtal { 
		};

	};



	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>;
@@ -127,15 +48,6 @@ user { 
		};

	};



	i2c-gpio-0 {

		status = "okay";



		rtc: pcf8563@51 {

			compatible = "nxp,pcf8563";

			reg = <0x51>;

		};

	};



	pwm_leds {

		compatible = "pwm-leds";
@@ -179,3 +91,87 @@ &pinctrl_tcb1_tioa2 
			     &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>;

	};

};

arch/arm/boot/dts/at91-kizboxmini-base.dts

0 → 100644
+24 −0
Original line number Diff line number Diff line 
// 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>;

};

arch/arm/boot/dts/at91-kizboxmini.dts→arch/arm/boot/dts/at91-kizboxmini-common.dtsi

+81 −82
Original line number Diff line number Diff line 
// 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 @@ memory { 
	};



	clocks {

		slow_xtal {

			clock-frequency = <32768>;

		};



		main_xtal {

			clock-frequency = <12000000>;

		};



		slow_xtal {

			clock-frequency = <32768>;

		};



	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";

		adc_op_clk {

			status = "disabled";

		};

	};
@@ -63,17 +54,25 @@ reset { 
		};

	};



	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,22 +81,54 @@ red { 
	};

};



&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 {

&nand_controller {

	status = "okay";

	pinctrl-0 = <&pinctrl_nand_oe_we

		     &pinctrl_nand_cs

		     &pinctrl_nand_rb>;

	pinctrl-names = "default";

		status = "okay";



	nand@3 {

		reg = <0x3 0x0 0x800000>;
@@ -127,35 +158,6 @@ ubi@20000 { 
		};

	};

};

};



&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>;
@@ -166,6 +168,3 @@ &usb1 { 
	status = "okay";

};

&watchdog {

	status = "okay";

};