korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 18:24:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

This pull request contains additional Broadcom ARM-based SoC Device Tree changes:

Browse Source 
- Lubomir updates all BCM2835 (Raspberry Pi family) Device Tree source files with
   their proper information about the on-board USB Ethernet adapter so there is
   appropriate binding between this USB device and a device_node (useful for MAC
   address fetching and stuff)
 
 - Raveendra adds the ADC controller Device Tree nodes to the Cygnus SoC device
   tree include files
 
 - Rafal updates the BCM5301x Device Tree by separating how we specify the NAND
   chip-select information in a first change and then fixes the NAND controller
   ECC configuration for the D-Link DIR-885L
 
 - Florian adds support for the BCM953012ER reference board, adds the HW random
   number generator DT node and adds proper memory node information to the
   BCM958625HR reference board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXfcRZAAoJEIfQlpxEBwcEiIwP/1mQJV/My4pqLeFg3oLxZBe6
 IekL3RjFm/eC/bP7Lzd5AbexExK+00kkGacZZNr9dabV/WiUYtJMzPQfayQsZim1
 6kdVXe1zYsOvWy4n+MAk0LCkq8p+uDoK/RE+6Jt0V3ALfBcaZwtCqDjVo7jfBzp1
 njo+ksdK5PifO+jGTDIyC9/7RnUzVksriYvrZo0+u71XFtwhP5fs59yA7IaHgnGU
 Zq70dnUH18VitFOr0MtMbhyCrwWwdLkTYTKuAHj2tNk98HEZ+65EOwWr5PllISfF
 tyw+DCttGEK8wSOIRRyCYJEe5A2yaR/QyqLz3Kzu8q5wW/Clbo91hd4YsylvgW/H
 MgFNi8a/pjOm8gYY/wrDsjFRqT8VC4y1XPihvcbLKRueYIuT6BdNWy0vCjI/xnF+
 S0YuuuAHkcJiMaBroZWszXtUK+qCKShtzd9pg3Cd4zEmZen1ZotSDAt2sm6ocfsz
 D+lFNqc7X0ey/rdBUMzjHGRCrMlD1agB6o3WH3NAC+gwalq0v0o3wlrRZ7UYKrYD
 vT6LHQC6RKTDqh+edoJEIm0m5EQNZ6qWpYO/xlapJFOigcs+mVH8YyEobha9nXmD
 5jyNuWa8JIGmUx0mMhH7mPp5sY0DZxboICno9o6w1Py6ptp0uZEXY1jddo1lapCW
 8Htj6SEUjMH+qw+i6wFK
 =Ie0I
 -----END PGP SIGNATURE-----

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

Merge "additional Broadcom ARM-based SoC Device Tree changes" from Florian Fainelli:

- Lubomir updates all BCM2835 (Raspberry Pi family) Device Tree source files with
  their proper information about the on-board USB Ethernet adapter so there is
  appropriate binding between this USB device and a device_node (useful for MAC
  address fetching and stuff)

- Raveendra adds the ADC controller Device Tree nodes to the Cygnus SoC device
  tree include files

- Rafal updates the BCM5301x Device Tree by separating how we specify the NAND
  chip-select information in a first change and then fixes the NAND controller
  ECC configuration for the D-Link DIR-885L

- Florian adds support for the BCM953012ER reference board, adds the HW random
  number generator DT node and adds proper memory node information to the
  BCM958625HR reference board

* tag 'arm-soc/for-4.8/devicetree-part2' of http://github.com/Broadcom/stblinux:
  ARM: dts: NSP: Specify RAM amount for BCM958625HR board
  ARM: BCM5301X: Fix NAND ECC parameters for D-Link DIR-885L
  ARM: BCM5301X: Specify NAND chip select and ECC in separated files
  ARM: dts: Cygnus: Add Broadcom iproc-static-adc DT node
  ARM: dts: BCM5301x: Add BCM953012ER board
  ARM: dts: BCM5301x: Add RNG Device Tree node
  ARM: bcm2835: dt: Add the ethernet to the device trees
This commit is contained in:
Arnd Bergmann 2016-07-07 15:28:37 +02:00
commit 885a976e2c
16 changed files with 208 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/Makefile
View File

@ -87,6 +87,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
bcm47094-dlink-dir-885l.dtb \
bcm94708.dtb \
bcm94709.dtb \
bcm953012er.dtb \
bcm953012k.dtb
dtb-$(CONFIG_ARCH_BCM_63XX) += \
bcm963138dvt.dtb

11
arch/arm/boot/dts/bcm-cygnus.dtsi
View File

@ -366,5 +366,16 @@
interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
adc: adc@180a6000 {
compatible = "brcm,iproc-static-adc";
#io-channel-cells = <1>;
io-channel-ranges;
adc-syscon = <&ts_adc_syscon>;
clocks = <&asiu_clks BCM_CYGNUS_ASIU_ADC_CLK>;
clock-names = "tsc_clk";
interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
};
};

1
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
View File

@ -1,6 +1,7 @@
/dts-v1/;
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
/ {
compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";

1
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
View File

@ -1,6 +1,7 @@
/dts-v1/;
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm283x-rpi-smsc9512.dtsi"
/ {
compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";

1
arch/arm/boot/dts/bcm2835-rpi-b.dts
View File

@ -1,6 +1,7 @@
/dts-v1/;
#include "bcm2835.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm283x-rpi-smsc9512.dtsi"
/ {
compatible = "raspberrypi,model-b", "brcm,bcm2835";

1
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
View File

@ -1,6 +1,7 @@
/dts-v1/;
#include "bcm2836.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
/ {
compatible = "raspberrypi,2-model-b", "brcm,bcm2836";

19
arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi Normal file
View File

@ -0,0 +1,19 @@
/ {
aliases {
ethernet = &ethernet;
};
};
&usb {
usb1@1 {
compatible = "usb424,9512";
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
ethernet: usbether@1 {
compatible = "usb424,ec00";
reg = <1>;
};
};
};

19
arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi Normal file
View File

@ -0,0 +1,19 @@
/ {
aliases {
ethernet = &ethernet;
};
};
&usb {
usb1@1 {
compatible = "usb424,9514";
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
ethernet: usbether@1 {
compatible = "usb424,ec00";
reg = <1>;
};
};
};

2
arch/arm/boot/dts/bcm283x.dtsi
View File

@ -287,6 +287,8 @@
compatible = "brcm,bcm2835-usb";
reg = <0x7e980000 0x10000>;
interrupts = <1 9>;
#address-cells = <1>;
#size-cells = <0>;
};
v3d: v3d@7ec00000 {

2
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
View File

@ -10,7 +10,7 @@
/dts-v1/;
#include "bcm4708.dtsi"
#include "bcm5301x-nand-cs0-bch8.dtsi"
#include "bcm5301x-nand-cs0-bch1.dtsi"
/ {
compatible = "dlink,dir-885l", "brcm,bcm47094", "brcm,bcm4708";

15
arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi Normal file
View File

@ -0,0 +1,15 @@
/*
* Broadcom Northstar NAND.
*
* Copyright (C) 2016 Rafał Miłecki <rafal.milecki@gmail.com>
*
* Licensed under the ISC license.
*/
#include "bcm5301x-nand-cs0.dtsi"
&nandcs {
nand-ecc-algo = "bch";
nand-ecc-strength = <1>;
nand-ecc-step-size = <512>;
};

16
arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
View File

@ -9,16 +9,10 @@
* Licensed under the GNU/GPL. See COPYING for details.
*/
/ {
nand@18028000 {
nandcs@0 {
compatible = "brcm,nandcs";
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
#include "bcm5301x-nand-cs0.dtsi"
nand-ecc-strength = <8>;
nand-ecc-step-size = <512>;
};
};
&nandcs {
nand-ecc-algo = "bch";
nand-ecc-strength = <8>;
nand-ecc-step-size = <512>;
};

18
arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi Normal file
View File

@ -0,0 +1,18 @@
/*
* Broadcom Northstar NAND.
*
* Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
*
* Licensed under the GNU/GPL. See COPYING for details.
*/
/ {
nand@18028000 {
nandcs: nandcs@0 {
compatible = "brcm,nandcs";
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
};
};
};

5
arch/arm/boot/dts/bcm5301x.dtsi
View File

@ -302,6 +302,11 @@
/* ports are defined in board DTS */
};
rng: rng@18004000 {
compatible = "brcm,bcm5301x-rng";
reg = <0x18004000 0x14>;
};
nand: nand@18028000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;

104
arch/arm/boot/dts/bcm953012er.dts Normal file
View File

@ -0,0 +1,104 @@
/*
* BSD LICENSE
*
* Copyright(c) 2016 Broadcom. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Broadcom Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/dts-v1/;
#include "bcm4708.dtsi"
#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
model = "NorthStar Enterprise Router (BCM953012ER)";
compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
memory {
reg = <0x00000000 0x8000000>;
};
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
wps {
label = "WPS";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
};
restart {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
};
};
};
&uart0 {
status = "okay";
};
&spi_nor {
status = "okay";
};
&srab {
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "port0";
};
port@1 {
reg = <1>;
label = "port1";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
};
};
};

4
arch/arm/boot/dts/bcm958625hr.dts
View File

@ -45,6 +45,10 @@
chosen {
stdout-path = "serial0:115200n8";
};
memory {
reg = <0x60000000 0x20000000>;
};
};
&nand {