UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

This pull request contains Broadcom ARM64-based SoCs Device Tree updates for 

4.12, please pull the following:
 
 - Rob enables the cryptographic block on Northstar 2 (SPU) by adding the proper
   Device Tree nodes
 
 - Jon replaces all occurences of: status = "ok" with status = "okay" to better
   conform to the Device Tree specification
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJY1VaOAAoJEIfQlpxEBwcEcV4P/3jbaahcHY8RQgzUEV2IOHL6
 r82SI54BGNzrLRZQCeOQopUzTSiVtpSuFkjaZZr3zsKg0rFOQL5krQQiqXFq4m4G
 uzzBRCFXJb4ePE/czylE6YyNZFjAiQmpvWltNJwRQ8vbEml5M3B/PEfWaW9OTFxx
 5FulbvF1RG4zU0BG3DS1YggejQqNmNiT/CvwVBg1qLq2m9yGXd8XVsIRKMVxKGTx
 YZnxAEKueE/DqY5N9WvwKcTPP7JzBPPSPLqbSlPFI5+uRKn/EQ6pHBbSzCQXGEjb
 hpfKkMK2gFhnNw0Uvb9k5cT/sbst3evsaYGTE6q2DplKchCF1D1OQbUK5Dqn2ork
 MvitS7zkOavHrx+QPP0QkwPjWJrcCNnlIGwjFR/L8xl1Cz0WvSg9npyLVJr5kjmH
 uLDnx1RxKzDDaf/K42ZmuABRC7OURf2w7ARoAD4Z8Y4hRe+in7A9YTP8pHMjOcgG
 BR1aSr6zgLnqvMJDT+p0WrCTiEnd4rOJKL2zM/mmYdlYzkLe+HQ1YTi3mkCkEaTR
 Ao6TH8uAGJnc5ve7xY50ChNDlbKOUL6Nip/RMiayqr6JfG5OkMoqkrhF9gLYcnNo
 c4zLRT7sKBXJrYHqgo3xZuk41mYaiqoSsYiuXS283T1miOK1BWZ0ZzqIP+MH53yz
 yA1EmWP1XdHuU6hvKrZ8
 =yeV5
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.12/devicetree-arm64' of http://github.com/Broadcom/stblinux into next/dt64

Pull "Broadcom devicetree-arm64 changes for 4.12" from Florian Fainelli:

This pull request contains Broadcom ARM64-based SoCs Device Tree updates for
4.12, please pull the following:

- Rob enables the cryptographic block on Northstar 2 (SPU) by adding the proper
  Device Tree nodes

- Jon replaces all occurences of: status = "ok" with status = "okay" to better
  conform to the Device Tree specification

* tag 'arm-soc/for-4.12/devicetree-arm64' of http://github.com/Broadcom/stblinux:
  arm64: dts: NS2: convert "ok" to "okay"
  arm64: dts: NS2: Add Broadcom SPU driver DT entry
This commit is contained in:
Arnd Bergmann 2017-03-31 11:52:16 +02:00
parent 8e8c72535d 231b362aec
commit bda484e76e
3 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arch/arm64/boot/dts/broadcom/ns2-svk.dts
View File

@ -57,55 +57,55 @@
};
&enet {
status = "ok";
status = "okay";
};
&pci_phy0 {
status = "ok";
status = "okay";
};
&pci_phy1 {
status = "ok";
status = "okay";
};
&pcie0 {
status = "ok";
status = "okay";
};
&pcie4 {
status = "ok";
status = "okay";
};
&pcie8 {
status = "ok";
status = "okay";
};
&i2c0 {
status = "ok";
status = "okay";
};
&i2c1 {
status = "ok";
status = "okay";
};
&uart0 {
status = "ok";
status = "okay";
};
&uart1 {
status = "ok";
status = "okay";
};
&uart2 {
status = "ok";
status = "okay";
};
&uart3 {
status = "ok";
status = "okay";
};
&ssp0 {
status = "ok";
status = "okay";
slic@0 {
compatible = "silabs,si3226x";
@ -126,7 +126,7 @@
};
&ssp1 {
status = "ok";
status = "okay";
at25@0 {
compatible = "atmel,at25";
@ -150,23 +150,23 @@
};
&sata_phy0 {
status = "ok";
status = "okay";
};
&sata_phy1 {
status = "ok";
status = "okay";
};
&sata {
status = "ok";
status = "okay";
};
&sdio0 {
status = "ok";
status = "okay";
};
&sdio1 {
status = "ok";
status = "okay";
};
&nand {

20
arch/arm64/boot/dts/broadcom/ns2-xmc.dts
View File

@ -54,15 +54,15 @@
};
&enet {
status = "ok";
status = "okay";
};
&i2c0 {
status = "ok";
status = "okay";
};
&i2c1 {
status = "ok";
status = "okay";
};
&mdio_mux_iproc {
@ -122,27 +122,27 @@
};
&pci_phy0 {
status = "ok";
status = "okay";
};
&pcie0 {
status = "ok";
status = "okay";
};
&pcie8 {
status = "ok";
status = "okay";
};
&sata_phy0 {
status = "ok";
status = "okay";
};
&sata_phy1 {
status = "ok";
status = "okay";
};
&sata {
status = "ok";
status = "okay";
};
&qspi {
@ -187,5 +187,5 @@
};
&uart3 {
status = "ok";
status = "okay";
};

24
arch/arm64/boot/dts/broadcom/ns2.dtsi
View File

@ -217,6 +217,12 @@
brcm,use-bcm-hdr;
};
crypto0: crypto@612d0000 {
compatible = "brcm,spum-crypto";
reg = <0x612d0000 0x900>;
mboxes = <&pdc0 0>;
};
pdc1: iproc-pdc1@612e0000 {
compatible = "brcm,iproc-pdc-mbox";
reg = <0x612e0000 0x445>; /* PDC FS1 regs */
@ -226,6 +232,12 @@
brcm,use-bcm-hdr;
};
crypto1: crypto@612f0000 {
compatible = "brcm,spum-crypto";
reg = <0x612f0000 0x900>;
mboxes = <&pdc1 0>;
};
pdc2: iproc-pdc2@61300000 {
compatible = "brcm,iproc-pdc-mbox";
reg = <0x61300000 0x445>; /* PDC FS2 regs */
@ -235,6 +247,12 @@
brcm,use-bcm-hdr;
};
crypto2: crypto@61310000 {
compatible = "brcm,spum-crypto";
reg = <0x61310000 0x900>;
mboxes = <&pdc2 0>;
};
pdc3: iproc-pdc3@61320000 {
compatible = "brcm,iproc-pdc-mbox";
reg = <0x61320000 0x445>; /* PDC FS3 regs */
@ -244,6 +262,12 @@
brcm,use-bcm-hdr;
};
crypto3: crypto@61330000 {
compatible = "brcm,spum-crypto";
reg = <0x61330000 0x900>;
mboxes = <&pdc3 0>;
};
dma0: dma@61360000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x61360000 0x1000>;