diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-03-14 00:38:04 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-14 00:38:04 +0300 |
commit | 206c12fc48fc31cb4ddaa38c48638df9eb0715ef (patch) | |
tree | ca3ccf44bfb819f646eceea26f2b27a244cf1c1b /arch/arm/boot/dts/bcm958625hr.dts | |
parent | 90d4806b8ddfbf0999618244e0cfba61aeafda8c (diff) | |
parent | e5c851ef012b4b63ea50228da3451f3cfb690c45 (diff) | |
download | linux-206c12fc48fc31cb4ddaa38c48638df9eb0715ef.tar.xz |
Merge tag 'arm-soc/for-4.17/devicetree' of https://github.com/Broadcom/stblinux into next/dt
Pull "Broadcom devicetree changes for 4.17" from Florian Fainelli:
This pull request contains Broadcom ARM-based SoCs devicetree changes
for 4.17, please pull the following:
- Henry fixes the pin functions for the JTAG pins, nothing uses this for
now, but it could be backported eventually if deemed appropriate
- Stefan fixes the register ranges for the bcm2835-i2s nodes in the
binding document definition, he then fixes the probing of the
bcm2835-i2s driver by providing an appropriate register range and a
missing clock. Stefan also makes sure that the appropriate pull
settings are applied to the pins used on the Raspberry Pi Zero
Wireless, he then adds the necessary UART node to connected to the
BCM43438 Bluetooth adapter on the Pi Zero W. He finally enables USB
OTG mode on the Pi Zero W since he became usable again
- Baruch adds the necessary Device Tree nodes to support the Raspberry
Pi GPIO expander which is controlled via the VC4 firmware
- Hiroshi adds the missing LEDs on the Buffalo WZR-900DHP router
- Eric adds the DPI hardware block into the BCM283x Device Tree include
file for future use when an actual panel is available
- Florian updates the Northstar Plus platforms to use port 8 of the
internal switch as the CPU/management port since necessary code was
added in the b53 switch driver to support that
* tag 'arm-soc/for-4.17/devicetree' of https://github.com/Broadcom/stblinux:
ARM: dts: NSP: Switch to port 8 for CPU port
ARM: bcm2835: Add the DPI hardware to the device tree.
ARM: dts: BCM5301X: add missing LEDs for Buffalo WZR-900DHP
ARM: dts: bcm2835-rpi-zero-w: Enable OTG mode
ARM: dts: bcm2835-rpi-zero-w: Add bcm43438 serial slave
ARM: dts: bcm283x: Apply pull settings to Zero W relevant groups
ARM: dts: bcm2837-rpi-3-b: add GPIO expander
ARM: dts: bcm2835: make the firmware node into a bus
ARM: dts: bcm283x: Fix probing of bcm2835-i2s
dt-bindings: bcm283x: Fix register ranges of bcm2835-i2s
ARM: dts: bcm283x: Fix pin function of JTAG pins
Diffstat (limited to 'arch/arm/boot/dts/bcm958625hr.dts')
-rw-r--r-- | arch/arm/boot/dts/bcm958625hr.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts index f0e2008f7490..ea3fc194f8f3 100644 --- a/arch/arm/boot/dts/bcm958625hr.dts +++ b/arch/arm/boot/dts/bcm958625hr.dts @@ -210,10 +210,10 @@ reg = <4>; }; - port@5 { - ethernet = <&amac0>; + port@8 { + ethernet = <&amac2>; label = "cpu"; - reg = <5>; + reg = <8>; fixed-link { speed = <1000>; full-duplex; |