summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-15 00:44:55 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-15 00:44:55 +0200
commitaaf1edc2bab1dba2a57695a3122ddb28f6cbaa59 (patch)
treeb577bbd93f4d853b3d36c59490260b2d96903720 /Documentation/devicetree/bindings
parent327c2c1562c9bfe001e4e773c05d9cd731a4883e (diff)
parent7260ecd22baa3c62ef6efaf59e7de53f4c8df800 (diff)
Merge tag 'arm-soc/for-4.9/devicetree' of http://github.com/Broadcom/stblinux into next/dt
Pull "Broadcom devicetree changes for 4.9" from Florian Fainelli: This pull request contains Broadcom ARM-based Device Tree changes for v4.9, please pull the following: - Jon adds support for the Ethernet MAC DT nodes (AMAC) and provides the following updates for Broadcom references boards: * New Northstar Plus reference boards added: BCM958525er, BCM958522er, BCM988312hr, BCM958623hr and BCM958622hr * Add SATA nodes to the BCM958625hr and XMC boards * Add I2C nodes to the XMC board * Fixes the amount of RAM on BCM958625HR, BCM958625K and BCM958525XMC boards * Add the GPIO reboot method for BCM958625hr and XMC boards - Dhanajay adds PWM nodes for the Northstar Plus SoCs - Rafal adds the USB 2.0 PHY to the BCM5301x Device Tree file include - Stefan adds a missing USB clock to the BCM283x DT files, adds a DTSI file for the USB host mode on BCM283x and finally documents and adds support for the Raspberry Pi Zero - Florian adds support for the Northstar Plus Switch Register Access block which enables the integrated switch on these SoCs and enables the switch ports on the BCM958625HR reference board * tag 'arm-soc/for-4.9/devicetree' of http://github.com/Broadcom/stblinux: (22 commits) ARM: dts: bcm2835: Add Raspberry Pi Zero DT: bindings: bcm: Add Raspberry Pi Zero ARM: dts: bcm283x: Add dtsi for USB host mode ARM: dts: bcm283x: Add missing USB clock ARM: dts: NSP: Add new DT file for bcm958622hr ARM: dts: NSP: Add new DT file for bcm958623hr ARM: dts: NSP: Add new DT file for bcm988312hr ARM: dts: NSP: Add new DT file for bcm958522er ARM: dts: NSP: Add new DT file for bcm958525er ARM: dts: NSP: Add GPIO reboot method to bcm958625xmc DTS file ARM: dts: NSP: Add GPIO reboot method to bcm958625hr DTS file ARM: dts: NSP: Specify RAM amount for BCM958525XMC board ARM: dts: NSP: Specify RAM amount for BCM958625K board ARM: dts: NSP: Enable SATA and add i2c devices on XMC ARM: dts: NSP: Enable SATA on bcm958625hr ARM: dts: NSP: Correct RAM amount for BCM958625HR board ARM: dts: NSP: Add PWM Support to DT ARM: BCM5301X: Specify PHY of USB 2.0 in DT ARM: dts: NSP: Add BCM958625HR switch ports ARM: dts: NSP: Add Switch Register Access Block node ...
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r--Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt4
-rw-r--r--Documentation/devicetree/bindings/net/brcm,amac.txt24
-rw-r--r--Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt24
3 files changed, 52 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
index 6ffe08778465..9c97de23919a 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
@@ -38,6 +38,10 @@ Raspberry Pi Compute Module
Required root node properties:
compatible = "raspberrypi,compute-module", "brcm,bcm2835";
+Raspberry Pi Zero
+Required root node properties:
+compatible = "raspberrypi,model-zero", "brcm,bcm2835";
+
Generic BCM2835 board
Required root node properties:
compatible = "brcm,bcm2835";
diff --git a/Documentation/devicetree/bindings/net/brcm,amac.txt b/Documentation/devicetree/bindings/net/brcm,amac.txt
new file mode 100644
index 000000000000..ba5ecc1041a5
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/brcm,amac.txt
@@ -0,0 +1,24 @@
+Broadcom AMAC Ethernet Controller Device Tree Bindings
+-------------------------------------------------------------
+
+Required properties:
+ - compatible: "brcm,amac" or "brcm,nsp-amac"
+ - reg: Address and length of the GMAC registers,
+ Address and length of the GMAC IDM registers
+ - reg-names: Names of the registers. Must have both "amac_base" and
+ "idm_base"
+ - interrupts: Interrupt number
+
+Optional properties:
+- mac-address: See ethernet.txt file in the same directory
+
+Examples:
+
+amac0: ethernet@18022000 {
+ compatible = "brcm,nsp-amac";
+ reg = <0x18022000 0x1000>,
+ <0x18110000 0x1000>;
+ reg-names = "amac_base", "idm_base";
+ interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+};
diff --git a/Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt b/Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt
new file mode 100644
index 000000000000..022946caa7e2
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt
@@ -0,0 +1,24 @@
+Broadcom GMAC Ethernet Controller Device Tree Bindings
+-------------------------------------------------------------
+
+Required properties:
+ - compatible: "brcm,bgmac-nsp"
+ - reg: Address and length of the GMAC registers,
+ Address and length of the GMAC IDM registers
+ - reg-names: Names of the registers. Must have both "gmac_base" and
+ "idm_base"
+ - interrupts: Interrupt number
+
+Optional properties:
+- mac-address: See ethernet.txt file in the same directory
+
+Examples:
+
+gmac0: ethernet@18022000 {
+ compatible = "brcm,bgmac-nsp";
+ reg = <0x18022000 0x1000>,
+ <0x18110000 0x1000>;
+ reg-names = "gmac_base", "idm_base";
+ interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+};