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

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

AT91 DT for 5.3

 - switch to new sckc bindings
 - convert soc bindings to json-schema

* tag 'at91-5.3-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  dt-bindings: arm: Convert Atmel board/soc bindings to json-schema
  ARM: dts: at91: sama5d3: switch to new sckc bindings
  ARM: dts: at91: at91sam9rl: switch to new sckc bindings
  ARM: dts: at91: at91sam9g45: switch to new sckc bindings
  ARM: dts: at91: at91sam9x5: switch to new sckc bindings
  ARM: dts: at91sam9261ek: remove unused chosen nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9c644f83 271839b0

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

deleted100644 → 0
+0 −73
Original line number Diff line number Diff line 
Atmel AT91 device tree bindings.

================================



Boards with a SoC of the Atmel AT91 or SMART family shall have the following

properties:



Required root node properties:

compatible: must be one of:

 * "atmel,at91rm9200"



 * "atmel,at91sam9" for SoCs using an ARM926EJ-S core, shall be extended with

   the specific SoC family or compatible:

    o "atmel,at91sam9260"

    o "atmel,at91sam9261"

    o "atmel,at91sam9263"

    o "atmel,at91sam9x5" for the 5 series, shall be extended with the specific

      SoC compatible:

       - "atmel,at91sam9g15"

       - "atmel,at91sam9g25"

       - "atmel,at91sam9g35"

       - "atmel,at91sam9x25"

       - "atmel,at91sam9x35"

    o "atmel,at91sam9g20"

    o "atmel,at91sam9g45"

    o "atmel,at91sam9n12"

    o "atmel,at91sam9rl"

    o "atmel,at91sam9xe"

    o "microchip,sam9x60"

 * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific

   SoC family:

    o "atmel,sama5d2" shall be extended with the specific SoC compatible:

       - "atmel,sama5d27"

    o "atmel,sama5d3" shall be extended with the specific SoC compatible:

       - "atmel,sama5d31"

       - "atmel,sama5d33"

       - "atmel,sama5d34"

       - "atmel,sama5d35"

       - "atmel,sama5d36"

    o "atmel,sama5d4" shall be extended with the specific SoC compatible:

       - "atmel,sama5d41"

       - "atmel,sama5d42"

       - "atmel,sama5d43"

       - "atmel,sama5d44"



 * "atmel,samv7" for MCUs using a Cortex-M7, shall be extended with the specific

   SoC family:

    o "atmel,sams70" shall be extended with the specific MCU compatible:

       - "atmel,sams70j19"

       - "atmel,sams70j20"

       - "atmel,sams70j21"

       - "atmel,sams70n19"

       - "atmel,sams70n20"

       - "atmel,sams70n21"

       - "atmel,sams70q19"

       - "atmel,sams70q20"

       - "atmel,sams70q21"

    o "atmel,samv70" shall be extended with the specific MCU compatible:

       - "atmel,samv70j19"

       - "atmel,samv70j20"

       - "atmel,samv70n19"

       - "atmel,samv70n20"

       - "atmel,samv70q19"

       - "atmel,samv70q20"

    o "atmel,samv71" shall be extended with the specific MCU compatible:

       - "atmel,samv71j19"

       - "atmel,samv71j20"

       - "atmel,samv71j21"

       - "atmel,samv71n19"

       - "atmel,samv71n20"

       - "atmel,samv71n21"

       - "atmel,samv71q19"

       - "atmel,samv71q20"

       - "atmel,samv71q21"

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

0 → 100644
+134 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/atmel-at91.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Atmel AT91 device tree bindings.



maintainers:

  - Alexandre Belloni <alexandre.belloni@bootlin.com>

  - Ludovic Desroches <ludovic.desroches@microchip.com>



description: |

  Boards with a SoC of the Atmel AT91 or SMART family shall have the following



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - items:

          - const: atmel,at91rm9200

      - items:

          - enum:

              - olimex,sam9-l9260

          - enum:

              - atmel,at91sam9260

              - atmel,at91sam9261

              - atmel,at91sam9263

              - atmel,at91sam9g20

              - atmel,at91sam9g45

              - atmel,at91sam9n12

              - atmel,at91sam9rl

              - atmel,at91sam9xe

              - atmel,at91sam9x60

          - const: atmel,at91sam9



      - items:

          - enum:

              - atmel,at91sam9g15

              - atmel,at91sam9g25

              - atmel,at91sam9g35

              - atmel,at91sam9x25

              - atmel,at91sam9x35

          - const: atmel,at91sam9x5

          - const: atmel,at91sam9



      - items:

          - const: atmel,sama5d27

          - const: atmel,sama5d2

          - const: atmel,sama5



      - description: Nattis v2 board with Natte v2 power board

        items:

          - const: axentia,nattis-2

          - const: axentia,natte-2

          - const: axentia,linea

          - const: atmel,sama5d31

          - const: atmel,sama5d3

          - const: atmel,sama5



      - description: TSE-850 v3 board

        items:

          - const: axentia,tse850v3

          - const: axentia,linea

          - const: atmel,sama5d31

          - const: atmel,sama5d3

          - const: atmel,sama5



      - items:

          - const: axentia,linea

          - const: atmel,sama5d31

          - const: atmel,sama5d3

          - const: atmel,sama5



      - items:

          - enum:

              - atmel,sama5d31

              - atmel,sama5d33

              - atmel,sama5d34

              - atmel,sama5d35

              - atmel,sama5d36

          - const: atmel,sama5d3

          - const: atmel,sama5



      - items:

          - enum:

              - atmel,sama5d41

              - atmel,sama5d42

              - atmel,sama5d43

              - atmel,sama5d44

          - const: atmel,sama5d4

          - const: atmel,sama5



      - items:

          - enum:

              - atmel,sams70j19

              - atmel,sams70j20

              - atmel,sams70j21

              - atmel,sams70n19

              - atmel,sams70n20

              - atmel,sams70n21

              - atmel,sams70q19

              - atmel,sams70q20

              - atmel,sams70q21

          - const: atmel,sams70

          - const: atmel,samv7



      - items:

          - enum:

              - atmel,samv70j19

              - atmel,samv70j20

              - atmel,samv70n19

              - atmel,samv70n20

              - atmel,samv70q19

              - atmel,samv70q20

          - const: atmel,samv70

          - const: atmel,samv7



      - items:

          - enum:

              - atmel,samv71j19

              - atmel,samv71j20

              - atmel,samv71j21

              - atmel,samv71n19

              - atmel,samv71n20

              - atmel,samv71n21

              - atmel,samv71q19

              - atmel,samv71q20

              - atmel,samv71q21

          - const: atmel,samv71

          - const: atmel,samv7



...

arch/arm/boot/dts/at91-wb50n.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
	clock-frequency = <12000000>;

};



&slow_osc {

&clk32k {

	atmel,osc-bypass;

};

arch/arm/boot/dts/at91sam9261ek.dts

+0 −8
Original line number Diff line number Diff line
@@ -14,14 +14,6 @@ 
	chosen {

		bootargs = "rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs rw";

		stdout-path = "serial0:115200n8";



		clocksource {

			timer = <&timer0>;

		};



		clockevent {

			timer = <&timer1>;

		};

	};



	memory {

arch/arm/boot/dts/at91sam9g45.dtsi

+3 −22
Original line number Diff line number Diff line
@@ -1258,30 +1258,11 @@ 
				};

			};



			sckc@fffffd50 {

			clk32k: sckc@fffffd50 {

				compatible = "atmel,at91sam9x5-sckc";

				reg = <0xfffffd50 0x4>;



				slow_osc: slow_osc {

					compatible = "atmel,at91sam9x5-clk-slow-osc";

					#clock-cells = <0>;

					atmel,startup-time-usec = <1200000>;

				clocks = <&slow_xtal>;

				};



				slow_rc_osc: slow_rc_osc {

					compatible = "atmel,at91sam9x5-clk-slow-rc-osc";

				#clock-cells = <0>;

					atmel,startup-time-usec = <75>;

					clock-frequency = <32768>;

					clock-accuracy = <50000000>;

				};



				clk32k: slck {

					compatible = "atmel,at91sam9x5-clk-slow";

					#clock-cells = <0>;

					clocks = <&slow_rc_osc &slow_osc>;

				};

			};



			rtc@fffffd20 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE