Merge branch 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351 into next/dt
From Christian Daudt, DT changes for Broadcom. * 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351: ARM: DT: binding fixup to align with vendor-prefixes.txt (DT) ARM: dts: add sdio blocks to bcm28155-ap board ARM: dts: align sdio numbers to HW definition ARM: bcm281xx: DT changes for reboot code ARM: bcm281xx: Adding bcm28155-ap.dts
This commit is contained in:
commit
103c6a7120
|
@ -6,4 +6,5 @@ bcm11351, bcm28145, bcm28155 SoCs) shall have the following properties:
|
|||
|
||||
Required root node property:
|
||||
|
||||
compatible = "bcm,bcm11351";
|
||||
compatible = "brcm,bcm11351";
|
||||
DEPRECATED: compatible = "bcm,bcm11351";
|
||||
|
|
|
@ -4,14 +4,15 @@ This timer is used in the following Broadcom SoCs:
|
|||
BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
|
||||
|
||||
Required properties:
|
||||
- compatible : "bcm,kona-timer"
|
||||
- compatible : "brcm,kona-timer"
|
||||
- DEPRECATED: compatible : "bcm,kona-timer"
|
||||
- reg : Register range for the timer
|
||||
- interrupts : interrupt for the timer
|
||||
- clock-frequency: frequency that the clock operates
|
||||
|
||||
Example:
|
||||
timer@35006000 {
|
||||
compatible = "bcm,kona-timer";
|
||||
compatible = "brcm,kona-timer";
|
||||
reg = <0x35006000 0x1000>;
|
||||
interrupts = <0x0 7 0x4>;
|
||||
clock-frequency = <32768>;
|
15
Documentation/devicetree/bindings/arm/bcm/kona-wdt.txt
Normal file
15
Documentation/devicetree/bindings/arm/bcm/kona-wdt.txt
Normal file
|
@ -0,0 +1,15 @@
|
|||
Broadcom Kona Family Watchdog Timer
|
||||
-----------------------------------
|
||||
|
||||
This watchdog timer is used in the following Broadcom SoCs:
|
||||
BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
|
||||
|
||||
Required properties:
|
||||
- compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";
|
||||
- reg: memory address & range
|
||||
|
||||
Example:
|
||||
watchdog@35002f40 {
|
||||
compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";
|
||||
reg = <0x35002f40 0x6c>;
|
||||
};
|
|
@ -4,11 +4,12 @@ This binding defines the location of the bounce buffer
|
|||
used for non-secure to secure communications.
|
||||
|
||||
Required properties:
|
||||
- compatible : "bcm,kona-smc"
|
||||
- compatible : "brcm,kona-smc"
|
||||
- DEPRECATED: compatible : "bcm,kona-smc"
|
||||
- reg : Location and size of bounce buffer
|
||||
|
||||
Example:
|
||||
smc@0x3404c000 {
|
||||
compatible = "bcm,bcm11351-smc", "bcm,kona-smc";
|
||||
compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
|
||||
reg = <0x3404c000 0x400>; //1 KiB in SRAM
|
||||
};
|
||||
|
|
|
@ -4,12 +4,13 @@ This file documents differences between the core properties in mmc.txt
|
|||
and the properties present in the bcm281xx SDHCI
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be "bcm,kona-sdhci"
|
||||
- compatible : Should be "brcm,kona-sdhci"
|
||||
- DEPRECATED: compatible : Should be "bcm,kona-sdhci"
|
||||
|
||||
Example:
|
||||
|
||||
sdio2: sdio@0x3f1a0000 {
|
||||
compatible = "bcm,kona-sdhci";
|
||||
compatible = "brcm,kona-sdhci";
|
||||
reg = <0x3f1a0000 0x10000>;
|
||||
interrupts = <0x0 74 0x4>;
|
||||
};
|
|
@ -42,7 +42,8 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb
|
|||
dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb
|
||||
|
||||
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
|
||||
dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb
|
||||
dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
|
||||
bcm28155-ap.dtb
|
||||
dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
|
||||
da850-evm.dtb
|
||||
dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
/ {
|
||||
model = "BCM11351 BRT board";
|
||||
compatible = "bcm,bcm11351-brt", "bcm,bcm11351";
|
||||
compatible = "brcm,bcm11351-brt", "brcm,bcm11351";
|
||||
|
||||
memory {
|
||||
reg = <0x80000000 0x40000000>; /* 1 GB */
|
||||
|
@ -27,18 +27,18 @@
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
sdio0: sdio@0x3f180000 {
|
||||
sdio1: sdio@3f180000 {
|
||||
max-frequency = <48000000>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
sdio1: sdio@0x3f190000 {
|
||||
sdio2: sdio@3f190000 {
|
||||
non-removable;
|
||||
max-frequency = <48000000>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
sdio3: sdio@0x3f1b0000 {
|
||||
sdio4: sdio@3f1b0000 {
|
||||
max-frequency = <48000000>;
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2012 Broadcom Corporation
|
||||
* Copyright (C) 2012-2013 Broadcom Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
|
@ -18,7 +18,7 @@
|
|||
|
||||
/ {
|
||||
model = "BCM11351 SoC";
|
||||
compatible = "bcm,bcm11351";
|
||||
compatible = "brcm,bcm11351";
|
||||
interrupt-parent = <&gic>;
|
||||
|
||||
chosen {
|
||||
|
@ -35,12 +35,12 @@
|
|||
};
|
||||
|
||||
smc@0x3404c000 {
|
||||
compatible = "bcm,bcm11351-smc", "bcm,kona-smc";
|
||||
compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
|
||||
reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */
|
||||
};
|
||||
|
||||
uart@3e000000 {
|
||||
compatible = "bcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
|
||||
compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
|
||||
status = "disabled";
|
||||
reg = <0x3e000000 0x1000>;
|
||||
clock-frequency = <13000000>;
|
||||
|
@ -50,42 +50,47 @@
|
|||
};
|
||||
|
||||
L2: l2-cache {
|
||||
compatible = "bcm,bcm11351-a2-pl310-cache";
|
||||
compatible = "brcm,bcm11351-a2-pl310-cache";
|
||||
reg = <0x3ff20000 0x1000>;
|
||||
cache-unified;
|
||||
cache-level = <2>;
|
||||
};
|
||||
|
||||
watchdog@35002f40 {
|
||||
compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";
|
||||
reg = <0x35002f40 0x6c>;
|
||||
};
|
||||
|
||||
timer@35006000 {
|
||||
compatible = "bcm,kona-timer";
|
||||
compatible = "brcm,kona-timer";
|
||||
reg = <0x35006000 0x1000>;
|
||||
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clock-frequency = <32768>;
|
||||
};
|
||||
|
||||
sdio0: sdio@0x3f180000 {
|
||||
compatible = "bcm,kona-sdhci";
|
||||
sdio1: sdio@3f180000 {
|
||||
compatible = "brcm,kona-sdhci";
|
||||
reg = <0x3f180000 0x10000>;
|
||||
interrupts = <0x0 77 0x4>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdio1: sdio@0x3f190000 {
|
||||
compatible = "bcm,kona-sdhci";
|
||||
sdio2: sdio@3f190000 {
|
||||
compatible = "brcm,kona-sdhci";
|
||||
reg = <0x3f190000 0x10000>;
|
||||
interrupts = <0x0 76 0x4>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdio2: sdio@0x3f1a0000 {
|
||||
compatible = "bcm,kona-sdhci";
|
||||
sdio3: sdio@3f1a0000 {
|
||||
compatible = "brcm,kona-sdhci";
|
||||
reg = <0x3f1a0000 0x10000>;
|
||||
interrupts = <0x0 74 0x4>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdio3: sdio@0x3f1b0000 {
|
||||
compatible = "bcm,kona-sdhci";
|
||||
sdio4: sdio@3f1b0000 {
|
||||
compatible = "brcm,kona-sdhci";
|
||||
reg = <0x3f1b0000 0x10000>;
|
||||
interrupts = <0x0 73 0x4>;
|
||||
status = "disabled";
|
||||
|
|
45
arch/arm/boot/dts/bcm28155-ap.dts
Normal file
45
arch/arm/boot/dts/bcm28155-ap.dts
Normal file
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
* Copyright (C) 2013 Broadcom Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation version 2.
|
||||
*
|
||||
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
||||
* kind, whether express or implied; without even the implied warranty
|
||||
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "bcm11351.dtsi"
|
||||
|
||||
/ {
|
||||
model = "BCM28155 AP board";
|
||||
compatible = "brcm,bcm28155-ap", "brcm,bcm11351";
|
||||
|
||||
memory {
|
||||
reg = <0x80000000 0x40000000>; /* 1 GB */
|
||||
};
|
||||
|
||||
uart@3e000000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
sdio1: sdio@3f180000 {
|
||||
max-frequency = <48000000>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
sdio2: sdio@3f190000 {
|
||||
non-removable;
|
||||
max-frequency = <48000000>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
sdio4: sdio@3f1b0000 {
|
||||
max-frequency = <48000000>;
|
||||
status = "okay";
|
||||
};
|
||||
};
|
Loading…
Reference in a new issue