github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 05:55:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This pull request contains Broadcom ARM64-based SoCs Device Tree changes

Browse Source 
for 4.20, please pull the following:
 
 - Stefan provides a reference to the Compute Module IO Board V3 such
   that we can reference the arm counterpart and still build it for arm64
 
 - Rob fixes I2C and SPI bus warnings which are going to show up with his
   update to DTC scheduled for 4.20
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAlucSiIACgkQh9CWnEQH
 BwT0SRAAlVOGMEJWfVxF/AdSYZWhOAvZspnyIXsC0qXS35bFVaA+gtIAkle6xHMr
 R2048FBviwlwB/vLZUqJh3q7Prw0F05Y3cdP4vFuKiIVXFZXOxcSHK51PFJSpMgJ
 fCpcYdVSR1aVfhWcvffi6VPDdn+3pJPbf3CNxNpNL2gJ5cq8eISSM0mAUKpe3qz6
 Zu2lGG4VGOAHa86d+PTSyHvFrK3gbQJgYA6ZZoY6FyU/U4Etobef30vwnXrdREuB
 D8oToGn0iNDSNp5T1K0v3Qm3gtRL2fORU2kpLjWvLXVuBz6aA3iLxWEb84fyzrU5
 y93jBSsGg8heWnFhcGI05TPT8UHcrz8wMYAHkJIhxmSGLTrcNCr6wsSZIzR2DImL
 Ap63dPD/OzUoR9jbWU2Q4vXgL93KBRDqR/e312CcmtnikKf8r0NJlJ0fil8yehTP
 GyjWYGZkoNz3S1Bjx0lFGZC2VQScSQDwAiUHkTr0oAhVqZOOI0vcG/pgayQg6ZN9
 Jvug9zSG6T4GruJn2QBmkX+Daekf56ZOMIvtY/zmTUQy7XMNyIDsidsDQm4eK6gY
 WUw1ez7tORqzzQkqNwp4E1JiSUBZlxA98a/3xxAhh+b1LK1qHrCRumfpECTR64vN
 h5SZuI3exjIQ8TMnk029ldt/IU8mjd4gyhdgFyEs9ceeX+9tQjs=
 =Ulpq
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.20/devicetree-arm64' of https://github.com/Broadcom/stblinux into next/dt

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

- Stefan provides a reference to the Compute Module IO Board V3 such
  that we can reference the arm counterpart and still build it for arm64

- Rob fixes I2C and SPI bus warnings which are going to show up with his
  update to DTC scheduled for 4.20

* tag 'arm-soc/for-4.20/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: Fix I2C and SPI bus warnings
  arm64: dts: broadcom: Add reference to Compute Module IO Board V3

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-09-23 06:28:19 -07:00
commit b610209c5d
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/boot/dts/broadcom/Makefile
View File

@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \
bcm2837-rpi-3-b-plus.dtb
bcm2837-rpi-3-b-plus.dtb \
bcm2837-rpi-cm3-io3.dts
subdir-y += northstar2
subdir-y += stingray

2
arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts Normal file
View File

@ -0,0 +1,2 @@
// SPDX-License-Identifier: GPL-2.0
#include "arm/bcm2837-rpi-cm3-io3.dts"

4
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
View File

@ -639,7 +639,7 @@ uart3: serial@66130000 {
status = "disabled";
};
ssp0: ssp@66180000 {
ssp0: spi@66180000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x66180000 0x1000>;
interrupts = <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;
@ -650,7 +650,7 @@ ssp0: ssp@66180000 {
status = "disabled";
};
ssp1: ssp@66190000 {
ssp1: spi@66190000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x66190000 0x1000>;
interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>;

2
arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
View File

@ -138,7 +138,7 @@ pca9505: pca9505@20 {
&i2c1 {
status = "okay";
pcf8574: pcf8574@20 {
pcf8574: pcf8574@27 {
compatible = "nxp,pcf8574a";
gpio-controller;
#gpio-cells = <2>;

4
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
View File

@ -521,7 +521,7 @@ uart3: uart@130000 {
status = "disabled";
};
ssp0: ssp@180000 {
ssp0: spi@180000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x00180000 0x1000>;
interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
@ -533,7 +533,7 @@ ssp0: ssp@180000 {
status = "disabled";
};
ssp1: ssp@190000 {
ssp1: spi@190000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x00190000 0x1000>;
interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;