forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/…
…git/arm/arm-soc Pull ARM 64-bit DT updates from Arnd Bergmann: "The arm64 device tree changes make up an increasing portion of the overall changes, so they are kept separate from the 32-bit devicetree changes and from the other arm64 updates. Newly added SoCs and boards are: - 96Boards Husky board - AMD Overdrive board - Amlogic S905 SoC and related Tronsmart boxes - Annapurna Labs Alpine family and development board - Broadcom Vulcan servers - Broadcom Northstar 2 SoC - Marvell Armada 3700 family and development board - Qualcomm MSM8996 SoC Additional devices are enabled for existing platforms from Applied Micro, Hisilicon, Mediatek, Qualcomm, and Renesas and there are a couple of other updates for Rockchip, Xilinx and NXP/Freescale" * tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (102 commits) ARM64: dts: amlogic: Add Tronsmart Vega S95 configs Documentation: devicetree: amlogic: Document Tronsmart Vega S95 boards ARM64: dts: Prepare configs for Amlogic Meson GXBaby Documentation: devicetree: amlogic: Document Meson GXBaby devicetree: bindings: Add vendor prefix for Tronsmart arm64: dts: qcom: Fix MPP's function used for LED control arm64: dts: alpine: add the MSIX node in the Alpine v2 dtsi arm64: dts: add the Alpine v2 EVP arm64: dts: marvell: re-order Device Tree nodes for Armada AP806 arm64: dts: marvell: update Armada AP806 clock description arm64: dts: marvell: add Device Tree files for Armada 7K/8K arm64: dts: apm: Add DT node for X-Gene v2 SLIMpro Mailbox I2C Driver arm64: dts: apm: Mailbox device tree node for APM X-Gene v2 platform. arm64: dts: apm: Add DT node for X-Gene v1 SLIMpro Mailbox I2C Driver arm64: dts: apm: mailbox device tree node for APM X-Gene platform. arm64: dts: apm: Update GPIO to control power-off on X-Gene v2 platforms arm64: dts: apm: Update GPIO standby controller DT node for X-Gene v2 platforms arm64: dts: apm: Update GPIO to control power-off on X-Gene v1 platforms arm64: dts: salvator-x: enable USB 2.0 Host of channel 1 and 2 arm64: dts: salvator-x: enable usb2_phy of channel 1 and 2 ...
- Loading branch information
Showing
85 changed files
with
4,200 additions
and
193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
Broadcom Vulcan device tree bindings | ||
------------------------------------ | ||
|
||
Boards with Broadcom Vulcan shall have the following root property: | ||
|
||
Broadcom Vulcan Evaluation Board: | ||
compatible = "brcm,vulcan-eval", "brcm,vulcan-soc"; | ||
|
||
Generic Vulcan board: | ||
compatible = "brcm,vulcan-soc"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions
16
Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
Marvell Armada 37xx Platforms Device Tree Bindings | ||
-------------------------------------------------- | ||
|
||
Boards using a SoC of the Marvell Armada 37xx family must carry the | ||
following root node property: | ||
|
||
- compatible: must contain "marvell,armada3710" | ||
|
||
In addition, boards using the Marvell Armada 3720 SoC shall have the | ||
following property before the previous one: | ||
|
||
- compatible: must contain "marvell,armada3720" | ||
|
||
Example: | ||
|
||
compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710"; |
File renamed without changes.
File renamed without changes.
File renamed without changes.
24 changes: 24 additions & 0 deletions
24
Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
Marvell Armada 7K/8K Platforms Device Tree Bindings | ||
--------------------------------------------------- | ||
|
||
Boards using a SoC of the Marvell Armada 7K or 8K families must carry | ||
the following root node property: | ||
|
||
- compatible, with one of the following values: | ||
|
||
- "marvell,armada7020", "marvell,armada-ap806-dual", "marvell,armada-ap806" | ||
when the SoC being used is the Armada 7020 | ||
|
||
- "marvell,armada7040", "marvell,armada-ap806-quad", "marvell,armada-ap806" | ||
when the SoC being used is the Armada 7040 | ||
|
||
- "marvell,armada8020", "marvell,armada-ap806-dual", "marvell,armada-ap806" | ||
when the SoC being used is the Armada 8020 | ||
|
||
- "marvell,armada8040", "marvell,armada-ap806-quad", "marvell,armada-ap806" | ||
when the SoC being used is the Armada 8040 | ||
|
||
Example: | ||
|
||
compatible = "marvell,armada7040-db", "marvell,armada7040", | ||
"marvell,armada-ap806-quad", "marvell,armada-ap806"; |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
ARM AMBA Primecell SP805 Watchdog | ||
|
||
Required properties: | ||
- compatible: Should be "arm,sp805" & "arm,primecell" | ||
- reg: Should contain location and length for watchdog timer register. | ||
- interrupts: Should contain the list of watchdog timer interrupts. | ||
- clocks: clocks driving the watchdog timer hardware. This list should be 2 | ||
clocks. With 2 clocks, the order is wdogclk clock, apb_pclk. | ||
|
||
Example: | ||
watchdog@66090000 { | ||
compatible = "arm,sp805", "arm,primecell"; | ||
reg = <0x66090000 0x1000>; | ||
interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>; | ||
clocks = <&apb_pclk>,<&apb_pclk>; | ||
clock-names = "wdogclk", "apb_pclk"; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -679,11 +679,19 @@ F: drivers/gpu/drm/radeon/radeon_kfd.c | |
F: drivers/gpu/drm/radeon/radeon_kfd.h | ||
F: include/uapi/linux/kfd_ioctl.h | ||
|
||
AMD SEATTLE DEVICE TREE SUPPORT | ||
M: Brijesh Singh <[email protected]> | ||
M: Suravee Suthikulpanit <[email protected]> | ||
M: Tom Lendacky <[email protected]> | ||
S: Supported | ||
F: arch/arm64/boot/dts/amd/ | ||
|
||
AMD XGBE DRIVER | ||
M: Tom Lendacky <[email protected]> | ||
L: [email protected] | ||
S: Supported | ||
F: drivers/net/ethernet/amd/xgbe/ | ||
F: arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi | ||
|
||
AMS (Apple Motion Sensor) DRIVER | ||
M: Michael Hanselmann <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
dtb-$(CONFIG_ARCH_ALPINE) += alpine-v2-evp.dtb | ||
|
||
always := $(dtb-y) | ||
subdir-y := $(dts-dirs) | ||
clean-files := *.dtb |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
* | ||
* Antoine Tenart <[email protected]> | ||
* | ||
* This software is available to you under a choice of one of two | ||
* licenses. You may choose to be licensed under the terms of the GNU | ||
* General Public License (GPL) Version 2, available from the file | ||
* COPYING in the main directory of this source tree, or the | ||
* BSD license below: | ||
* | ||
* Redistribution and use in source and binary forms, with or | ||
* without modification, are permitted provided that the following | ||
* conditions are met: | ||
* | ||
* - Redistributions of source code must retain the above | ||
* copyright notice, this list of conditions and the following | ||
* disclaimer. | ||
* | ||
* - Redistributions in binary form must reproduce the above | ||
* copyright notice, this list of conditions and the following | ||
* disclaimer in the documentation and/or other materials | ||
* provided with the distribution. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
|
||
#include "alpine-v2.dtsi" | ||
|
||
/ { | ||
model = "Annapurna Labs Alpine v2 EVP"; | ||
compatible = "al,alpine-v2-evp", "al,alpine-v2"; | ||
|
||
aliases { | ||
serial0 = &uart0; | ||
serial1 = &uart1; | ||
serial2 = &uart2; | ||
serial3 = &uart3; | ||
}; | ||
|
||
chosen { | ||
stdout-path = "serial0:115200n8"; | ||
}; | ||
}; | ||
|
||
&uart0 { status = "okay"; }; |
Oops, something went wrong.