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

Merge tag 'at91-ab-4.19-dt' of... 

Merge tag 'at91-ab-4.19-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

AT91 DT for 4.19:

 - New boards from Laird: WB45N, WB50N, SOM60 modules and DVK, Gatwick
 - fix the PMC compatibles

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

:
  ARM: dts: at91: fix typos for SSC TD functions
  ARM: dts: add support for Laird SOM60 module and DVK boards
  ARM: dts: add support for Gatwick board based on WB50N
  ARM: dts: add support for Laird WB50N cpu module and DVK
  ARM: dts: add support for Laird WB45N cpu module and DVK
  ARM: dts: at91: add labels to soc dtsi for derivative boards
  dt-bindings: add laird and giantec vendor prefix
  ARM: dts: fix PMC compatible
  ARM: at91: fix USB clock detection handling
  dt-bindings: clk: at91: Document all the PMC compatibles
  dt-bindings: arm: remove PMC bindings

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 945d0047 c8cbc1c2

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

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
* Power Management Controller (PMC)



Required properties:

- compatible: Should be "atmel,<chip>-pmc".

	<chip> can be: at91rm9200, at91sam9260, at91sam9g45, at91sam9n12,

	at91sam9x5, sama5d3



- reg: Should contain PMC registers location and length



Examples:

	pmc: pmc@fffffc00 {

		compatible = "atmel,at91rm9200-pmc";

		reg = <0xfffffc00 0x100>;

	};

Documentation/devicetree/bindings/clock/at91-clock.txt

+4 −5
Original line number Diff line number Diff line
@@ -17,14 +17,13 @@ Required properties: 
	"atmel,at91sam9x5-clk-slow-rc-osc":

		at91 internal slow RC oscillator



	"atmel,at91rm9200-pmc" or

	"atmel,at91sam9g45-pmc" or

	"atmel,at91sam9n12-pmc" or

	"atmel,at91sam9x5-pmc" or

	"atmel,sama5d3-pmc":

	"atmel,<chip>-pmc":

		at91 PMC (Power Management Controller)

		All at91 specific clocks (clocks defined below) must be child

		node of the PMC node.

		<chip> can be: at91rm9200, at91sam9260, at91sam9261,

		at91sam9263, at91sam9g45, at91sam9n12, at91sam9rl, at91sam9x5,

		sama5d2, sama5d3 or sama5d4.



	"atmel,at91sam9x5-clk-slow" (under sckc node)

	or

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ geekbuying GeekBuying 
gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

geniatech	Geniatech, Inc.

giantec	Giantec Semiconductor, Inc.

giantplus	Giantplus Technology Co., Ltd.

globalscale	Globalscale Technologies, Inc.

gmt	Global Mixed-mode Technology, Inc.
@@ -193,6 +194,7 @@ koe Kaohsiung Opto-Electronics Inc. 
kosagi	Sutajio Ko-Usagi PTE Ltd.

kyo	Kyocera Corporation

lacie	LaCie

laird	Laird PLC

lantiq	Lantiq Semiconductor

lattice	Lattice Semiconductor

lego	LEGO Systems A/S

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ 
	at91-ariettag25.dtb \

	at91-cosino_mega2560.dtb \

	at91-kizboxmini.dtb \

	at91-wb45n.dtb \

	at91sam9g15ek.dtb \

	at91sam9g25ek.dtb \

	at91sam9g35ek.dtb \
@@ -50,7 +51,10 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ 
	at91-sama5d2_ptc_ek.dtb \

	at91-sama5d2_xplained.dtb \

	at91-sama5d3_xplained.dtb \

	at91-dvk_som60.dtb \

	at91-gatwick.dtb \

	at91-tse850-3.dtb \

	at91-wb50n.dtb \

	sama5d31ek.dtb \

	sama5d33ek.dtb \

	sama5d34ek.dtb \

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

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

/*

 * at91-dvk_som60.dts - Device Tree file for the DVK SOM60 board

 *

 *  Copyright (C) 2018 Laird,

 *		  2018 Ben Whitten <ben.whitten@lairdtech.com>

 *

 */

/dts-v1/;

#include "at91-som60.dtsi"

#include "at91-dvk_su60_somc.dtsi"

#include "at91-dvk_su60_somc_lcm.dtsi"



/ {

	model = "Laird DVK SOM60";

	compatible = "laird,dvk-som60", "laird,som60", "atmel,sama5d36", "atmel,sama5d3", "atmel,sama5";



	chosen {

		stdout-path = &dbgu;

		tick-timer = &pit;

	};

};



&mmc0 {

	status = "okay";

};



&spi0 {

	status = "okay";

};



&ssc0 {

	status = "okay";

};



&i2c0 {

	status = "okay";

};



&i2c1 {

	status = "okay";

};



&usart1 {

	status = "okay";

};



&usart2 {

	status = "okay";

};



&usart3 {

	status = "okay";

};



&uart0 {

	status = "okay";

};



&dbgu {

	status = "okay";

};



&pit {

	status = "okay";

};



&adc0 {

	status = "okay";

};



&can1 {

	status = "okay";

};



&macb0 {

	status = "okay";

};



&macb1 {

	status = "okay";

};



&usb0 {

	status = "okay";

};



&usb1 {

	status = "okay";

};



&usb2 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE