diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-22 00:30:08 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-22 00:30:08 +0300 |
| commit | d15d9e323cd4c6418efab83d2d83ea99e31e9dee (patch) | |
| tree | 738bd319f67dc9430ae32cd88b5c82a7dfc81436 /arch/arm/boot/dts/at91sam9261.dtsi | |
| parent | 945d004788319fb5863de3b2e4831064902dd10c (diff) | |
| parent | c8cbc1c20c29697e7335a5044fe6c60aa5c6e922 (diff) | |
| download | linux-d15d9e323cd4c6418efab83d2d83ea99e31e9dee.tar.xz | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9261.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9261.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi index 53c63d0a418a..33f09d5ea020 100644 --- a/arch/arm/boot/dts/at91sam9261.dtsi +++ b/arch/arm/boot/dts/at91sam9261.dtsi @@ -590,7 +590,7 @@ }; pmc: pmc@fffffc00 { - compatible = "atmel,at91rm9200-pmc", "syscon"; + compatible = "atmel,at91sam9261-pmc", "syscon"; reg = <0xfffffc00 0x100>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; interrupt-controller; |