Commit Graph

35 Commits

Author SHA1 Message Date
Arnd Bergmann
877b203e15 This pull request contains Broadcom ARM-based Device Tree changes for 4.15,
please pull the following:
 
 - Eric adds support for the CLCD and PWM controller on Cygnus chis
 
 - Loic fixes the console path on the Raspberry Pi 3 (already submitted as
   fixes) and then proceeds with enabling the BCM43438 bluetooth chip on
   the Raspberry Pi 3
 
 - Rafal specifies the USB ports on the Luxul XWR-1200
 
 - Dan adds support for the Luxul ABR-4500 based on BCM47094, the Luxul XAP-810
   and XAP-1440 both based on BCM53573
 
 - Florian adds support for the Broadcom Hurricane 2 SoC by adding general
   machine binding, clock binding, SoC DTS include file and a DTS for the
   Ubiquiti Networks UniFi Switch 8
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJZ6oyXAAoJEIfQlpxEBwcEZ9sQAIHxupdwbECNH1DJo0jWxqrC
 bMAfx2yHyr/snPXq46E91QjRIGJLk/E2lMUS0xYWpxC2MRp0pZPFAVTc3qYKgI/9
 dGOuJNsk1ZUhbys1BhgVuryYbc6ZSfxz8h5uUxdZ5CLxs9beAsaKDXablsN8Th3O
 j5OEundSosZ1SPd+F9KNDURjRmfeUzhYlBuRZ2AfWvSJFYjn2cIDM9aCBnDSNYHh
 Pxs03CF4uGM6DBReIcuG99NKtlaTFoD4v7Empb5i4F0sUNCefcGvhXeMDUBGPeRo
 z0BDJ4LEBySDzTRd9NhekPC4DM7QsyTjGJz1JbW8FmsK+GnJx5uLMrEgXUtWbSou
 bup1RHRaxAcpoTv0BTiPK0chfU63RgAqrvDw7wo8O17d06BHtyt0Z5tlv3Oc7OBP
 4XhkSj6TmkD6WtQCQWY81jMZ6ezzxeZ/5kOIASAvKc1bh3ocbxpdQkNoxd0pASsI
 o/CW14a0q0STEdYnF+Y6YGQziuAhRQH/8W6mBUeRfPxQQrG8NXPJoGArP9be1ikR
 7mqUivV3pD1mA+3PiiD2fZ57hQRjTowr4bA+RarYxxg7TDu3kUFqkXm93aYXuBbm
 UzyAZZ4LLbhlcIXIuwfoigoSmQaqUbEIMOqSW8v74PKJDOcSqBS+iZDD+hDSpbPA
 XShAuXKwt3p6uSei3nib
 =DmZ2
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.15/devicetree' of http://github.com/Broadcom/stblinux into next/dt

Pull "Broadcom devicetree changes for 4.15" from Florian Fainelli:

This pull request contains Broadcom ARM-based Device Tree changes for 4.15,
please pull the following:

- Eric adds support for the CLCD and PWM controller on Cygnus chis

- Loic fixes the console path on the Raspberry Pi 3 (already submitted as
  fixes) and then proceeds with enabling the BCM43438 bluetooth chip on
  the Raspberry Pi 3

- Rafal specifies the USB ports on the Luxul XWR-1200

- Dan adds support for the Luxul ABR-4500 based on BCM47094, the Luxul XAP-810
  and XAP-1440 both based on BCM53573

- Florian adds support for the Broadcom Hurricane 2 SoC by adding general
  machine binding, clock binding, SoC DTS include file and a DTS for the
  Ubiquiti Networks UniFi Switch 8

* tag 'arm-soc/for-4.15/devicetree' of http://github.com/Broadcom/stblinux:
  ARM: dts: Hurricane 2: Add basic support for Ubiquiti UniFi Switch 8
  dt-bindings: Add Ubiquiti Networks vendor prefix
  ARM: dts: Add Broadcom Hurricane 2 DTS include file
  dt-bindings: Document Broadcom Hurricane 2 clocks
  dt-bindings: Add documentation for Broadcom Hurricane 2 SoCs
  ARM: dts: BCM53573: Add DT for Luxul XAP-1440
  ARM: dts: BCM53573: Add DT for Luxul XAP-810
  ARM: dts: BCM5301X: Add DT for Luxul ABR-4500
  ARM: dts: BCM5301X: Add DT for Luxul XBR-4500
  ARM: dts: BCM5301X: Specify USB ports for USB LED of Luxul XWR-1200
  ARM: dts: bcm2837-rpi-3-b: Add bcm43438 serial slave
  ARM: dts: bcm283x: Fix console path on RPi3
  ARM: dts: cygnus: Add the PWM node
  ARM: dts: cygnus: Add the CLCD controller
2017-10-30 12:43:54 +01:00
Rob Herring
8dccafaa28 arm: dts: fix unit-address leading 0s
Fix dtc warnings for 'simple_bus_reg' due to leading 0s. Converted using
the following command:

perl -p -i -e 's/\@0+([0-9a-f])/\@$1/g' `find arch/arm/boot/dts -type -f -name '*.dts*'

Dropped changes to ARM, Ltd. boards LED nodes and manually fixed up some
occurrences of uppercase hex.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-20 00:37:54 +02:00
Eric Anholt
a7794db38e ARM: dts: cygnus: Add the PWM node
This is connected up to the backlight on 911360_entphn, which we'll
need for a panel driver. For now, leave the node disabled in the
shared dtsi.

Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-09-25 11:45:03 -07:00
Eric Anholt
5607785b86 ARM: dts: cygnus: Add the CLCD controller
This doesn't yet enable it on any particular platform, as we still
need a panel driver for bcm911360_entphn.

Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-09-25 11:45:02 -07:00
Raveendra Padasalagi
fdacf0950c ARM: dts: cygnus: Add generic-ehci/ohci nodes
Add dt nodes for generic-ehci/ohci host controller.

Signed-off-by: Raveendra Padasalagi <raveendra.padasalagi@broadcom.com>
Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-08-17 10:13:39 -07:00
Jonathan Richardson
143d0d47cc ARM: dts: cygnus: Add additional peripherals to dtsi
Add nodes for peripherals in Cygnus dtsi: sdhci, keypad, spi, dma,
pinmux configs.

Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com>
Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-08-17 10:13:29 -07:00
Jason Uy
0e50dc9110 ARM: dts: cygnus: Enable Performance Monitoring Unit
Add PMU capability to Cygnus so trace and performance profiling
can be used.

Signed-off-by: Jason Uy <jason.uy@broadcom.com>
Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-08-17 10:13:23 -07:00
Scott Branden
8b9b666d00 ARM: dts: cygnus: place v3d in proper address ordered location
Move v3d devicetree node to proper address ordered location in Cygnus
dtsi.

Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-08-17 10:13:14 -07:00
Ray Jui
f5a5d8b417 ARM: dts: cygnus: Fix incorrect UART2 register base
Fix incorrect Cygnus UART2 register base.

Fixes: 0f0b21a83a ("ARM: dts: Move all Cygnus peripherals into axi bus")
Signed-off-by: Ray Jui <ray.jui@broadcom.com>
Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-08-17 10:11:54 -07:00
Eric Anholt
40c26d3af6 ARM: dts: Cygnus: Add the ethernet switch and ethernet PHY
Cygnus has a single amac controller connected to the B53 switch with 2
PHYs. On the BCM911360_EP platform, those two PHYs are connected to the
external ethernet jacks.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-06-12 09:52:37 -07:00
Eric Anholt
f1494a85e2 ARM: dts: Cygnus: Add BCM11360's V3D device
This loads the VC4 driver on the 911360_entphn platform (with the
corresponding series sent to dri-devel), which is supported by master
of the Mesa tree.

Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-06-12 09:52:35 -07:00
Rob Herring
0f11736df6 ARM: dts: bcm: fix msi-controller name and unit address
The unit address for the msi controller is not valid as there is no reg
property, so remove it. Also, msi-controller is the preferred node name.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: Jon Mason <jonmason@broadcom.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Acked-by: Ray Jui <ray.jui@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-03-22 10:15:19 -07:00
Jonathan Richardson
7fa8b51b5d ARM: dts: Add node for Broadcom OTP controller driver
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Tested-by: Jonathan Richardson <jonathan.richardson@broadcom.com>
Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Oza Pawandeep <oza@broadcom.com>
Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-11-16 12:38:53 -08:00
Jonathan Richardson
2c42d0f060 ARM: dts: Enable interrupt support for cygnus crmu gpio driver
The M0 processor handles interrupts for the always-on CRMU GPIO
controller. Setting the CRMU GPIO driver with the mailbox controller as
the interrupt parent allows the mailbox controller to forward interrupts
from the M0 to the GPIO driver for processing.

Reviewed-by: Jonathan Richardson <jonathan.richardson@broadcom.com>
Tested-by: Jonathan Richardson <jonathan.richardson@broadcom.com>
Reviewed-by: Vikram Prakash <vikram.prakash@broadcom.com>
Reviewed-by: Shreesha Rajashekar <shreesha.rajashekar@broadcom.com>
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Reviewed-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-11-16 12:38:48 -08:00
Jonathan Richardson
77f923cb14 ARM: dts: Enable Broadcom iProc mailbox controller
Reviewed-by: Jonathan Richardson <jonathan.richardson@broadcom.com>
Reviewed-by: Shreesha Rajashekar <shreesha.rajashekar@broadcom.com>
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Tested-by: Jonathan Richardson <jonathan.richardson@broadcom.com>
Reviewed-by: Vikram Prakash <vikram.prakash@broadcom.com>
Reviewed-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-11-16 12:38:37 -08:00
Scott Branden
b350e9dd1f ARM: dts: cygnus: fix naming of pinctrl node
Remove 0x from pinctrl node to match device tree naming convention.

Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-10-19 06:40:54 -07:00
Raveendra Padasalagi
fd048c6b34 ARM: dts: Cygnus: Add Broadcom iproc-static-adc DT node
This patch adds the DT node for Broadcom's iproc-static-adc
controller driver.

Signed-off-by: Raveendra Padasalagi <raveendra.padasalagi@broadcom.com>
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Reviewed-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-07-05 08:00:23 -07:00
Raveendra Padasalagi
74813cebd6 Input: bcm_iproc_tsc - use syscon to access shared registers
In Cygnus SOC touch screen controller registers are shared with ADC and
flex timer. Using readl/writel could lead to race condition. So touch
screen driver is enhanced to support register access using syscon framework
API's to take care of mutually exclusive access.

Signed-off-by: Raveendra Padasalagi <raveendra.padasalagi@broadcom.com>
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Reviewed-by: Scott Branden <scott.branden@broadcom.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2016-04-06 16:11:56 -07:00
Ray Jui
f6b889358a ARM: dts: Enable MSI support for Broadcom Cygnus
Enable MSI support for Broadcom Cygnus platforms

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Anup Patel <anup.patel@broadcom.com>
Reviewed-by: Pramod KUMAR <pramodku@broadcom.com>
Reviewed-by: Vikram Prakash <vikramp@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-12-07 14:14:40 -08:00
Ray Jui
44a06fa465 ARM: dts: enable PCIe PHY support for Cygnus
Enable PCIe PHY for both PCIe root complexes on Cygnus

Signed-off-by: Ray Jui <rjui@broadcom.com>
Acked-by: Scott Branden <sbranden@broadcom.com>
[florian: Fix missing #address-cells and #size-cells properties]
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-12-06 19:45:18 -08:00
Pramod Kumar
3ad8ff0e4a ARM: dts: Cygnus: define ngpios property in gpio controller's node
Add ngpios property in cygnus ASIU, CCM and CRMU gpio controller's node

Signed-off-by: Pramod Kumar <pramodku@broadcom.com>
Reviewed-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-12-06 19:45:18 -08:00
Pramod Kumar
3890ab2bfb dts: pinctrl: Add GPIO to Pinctrl pin mapping in DT
ASIU gpio controller's pins are muxed with pin-cntroller.
Add this mapping through property "gpio-ranges".

Signed-off-by: Pramod Kumar <pramodku@broadcom.com>
Reviewed-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-11-18 10:33:08 -08:00
Ray Jui
eef228e319 ARM: dts: move aliases back to .dts in Cygnus
Move aliases from bcm-cygnus.dtsi back to individual .dts files. Also
clean up the chosen node to have the stdout-path using the proper alias

Signed-off-by: Ray Jui <rjui@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-09-24 18:30:10 -07:00
Ray Jui
08668d9de9 ARM: dts: fix Cygnus nand device node
The third compatible string "brcm,brcmnand" in bcm-cygnus.dtsi nand node
is incorrect, redundant and should be removed. "brcm,brcmnand" is meant to
be used by STB based Broadcom SoCs. All iProc based SoCs should use
"brcm,nand-iproc".

Signed-off-by: Ray Jui <rjui@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-09-22 17:50:36 -07:00
Ray Jui
35e372a3a1 ARM: dts: enable touchscreen support on Cygnus
This patch enables touchscreen support on bcm958300k and bcm958305k.
Touchscreen is connected to these boards through the bcm9hmidc daughter
card, and therefore also adding bcm9hmidc.dtsi that describes the
daughter card

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Vikram Prakash <vikramp@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-09-22 17:50:36 -07:00
Ray Jui
9c5101f7a2 ARM: dts: Reorder Cygnus peripherals
Reorder all Cygnus peripherals based on base register addresses in
bcm-cygnus.dtsi

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-09-22 17:50:36 -07:00
Ray Jui
0f0b21a83a ARM: dts: Move all Cygnus peripherals into axi bus
Move all Cygnus peripherals to be under the "axi" bus node of type
"simple-bus"

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-09-22 17:50:35 -07:00
Ray Jui
ef5b812a4e ARM: dts: Put Cygnus core components under core bus
Put all Cygnus core components into "core" node of type "simple-bus" in
bcm-cygnus.dtsi

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-09-22 17:50:35 -07:00
Ray Jui
de192ef143 ARM: dts: consolidate aliases for Cygnus dt files
Move aliases into bcm-cygnus.dtsi to avoid duplications in Cygnus dts
files

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-09-22 17:50:35 -07:00
Ray Jui
874d5f1be8 ARM: dts: cygnus: Enable NAND support for Cygnus
Enable NAND support for Broadcom Cygnus SoC

Signed-off-by: Ray Jui <rjui@broadcom.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-05-13 10:57:08 -07:00
Ray Jui
cd590b50a9 ARM: dts: enable PCIe support for Cygnus
Add PCIe device nodes in bcm-cygnus.dtsi but keep them disabled there.
Only enable them for bcm958300k where PCIe interfaces are populated

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-03-13 09:20:47 -07:00
Ray Jui
5fa4b29c71 ARM: dts: enable GPIO for Broadcom Cygnus
This enables all 3 GPIO controllers including the ASIU GPIO, the
chipcommonG GPIO, and the ALWAYS-ON GPIO, for Broadcom Cygnus SoC

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Tested-by: Dmitry Torokhov <dtor@chromium.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-03-10 09:27:04 -07:00
Ray Jui
e6a4e5d50b ARM: dts: enable IOMUX for Broadcom Cygnus
This enables the IOMUX support for Broadcom Cygnus SoC

Signed-off-by: Ray Jui <rjui@broadcom.com>
Tested-by: Dmitry Torokhov <dtor@chromium.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-03-10 09:27:04 -07:00
Ray Jui
b51c05a331 ARM: dts: add I2C device nodes for Broadcom Cygnus
Add I2C device nodes and its properties in bcm-cygnus.dtsi but keep
them disabled there. Individual I2C devices can be enabled in board
specific dts file when I2C slave devices are enabled in the future

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Reviewed-by: Kevin Cernekee <cernekee@chromium.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-02-16 12:50:39 -08:00
Scott Branden
c9ad7bc5fe ARM: dts: Enable Broadcom Cygnus SoC
DT files to enable cygnus consisting on reference designs
and cygnus core configuration.

Reviewed-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Arun Parameswaran <aparames@broadcom.com>
Tested-by: Jonathan Richardson <jonathar@broadcom.com>
Reviewed-by: JD (Jiandong) Zheng <jdzheng@broadcom.com>
Signed-off-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Ray Jui <rjui@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2014-11-11 22:30:42 -08:00