p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: BCM5301X: Add some more devices to device tree 

The most important part is adding the axi bus to the SoC dtsi file,
 this is the main bus on the SoC.
 
 These patches were all send to the arm list and I haven't got any
 negative responses.
 
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUd5jfAAoJEIZ0px9YPRMyQDgP/3EKRthup3LVF0K5Y/z256Xm
 95F7fjrQSAeo47WXL5YkZPhFh2Brs0tcmR/Xt9J+sm4jRUMDgaa0DIH0R1FD6R/z
 j7J2mLQ+NORMQg2A0gtJPJg+o/PMi9+jZ2I3D6dyewaQOemEbs7dej7INzRQWxik
 8gKjIlPm0yKIcFnkLOg6W6++GseCM4DiP2714l6SM+W4hExZUQuVqW7yNR3Y2jPt
 h3omY+kWUHIhjN7iOCvoF70x89d0pgYl6u9BIjda63a9flpiAUs7+0to1dgsSn3i
 QWgIB0rxVPDrtW2TYmzxKNQgRlzKJzyzowlf+uqgE48Z9CwFlwirCIa6D8bOP27G
 hJ7E7FgZZdKGI7W0OB2wru7jNLgwuVVursMh0ef7T1vQXJjZGqqXdCLQWx4i/XoW
 PIPTvEwr37/oI8Zx9yxPW4jxKOmDK9lW17DR1JIn4C8QWMvWJ3/wcgUCpblWhY0k
 yrtenOWc83NDcrcufonhr293lBuLi9gCZel58rkj3GP02/MijkcDSslVSCgO0nH8
 YLQcTzU66vnwWAhVZXp5X0BJtkAvmbxXXkKqJxa1nGMpr8aF7QHKPFZPmRqzhnHG
 JKLdANoaPygJjHACgkPjvUetIdv95Pq4CRXppsqcnm7tzu6nn2LBRRxHQiXvVlyJ
 7neCvZGAtQz/WpBSHriX
 =oMPU
 -----END PGP SIGNATURE-----

Merge tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux into next/dt

Pull "ARM: BCM5301X: Add some more devices to device tree" from Hauke Mehrtens:

The most important part is adding the axi bus to the SoC dtsi file,
this is the main bus on the SoC.

These patches were all send to the arm list and I haven't got any
negative responses.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

* tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux:
  ARM: BCM5301X: Add LEDs for Netgear R6250 V1
  ARM: BCM5301X: Add Broadcom's bus-axi to the DTS file

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2014-11-28 22:39:01 +01:00
parent 6ecbdabe51 dd6d2e5f4b
commit e44cfd469b
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/arm/boot/dts/bcm4708-netgear-r6250.dts
View File

@ -32,4 +32,38 @@ uart1: serial@0400 {
status = "okay";
};
};
leds {
compatible = "gpio-leds";
logo {
label = "bcm53xx:white:logo";
gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "default-on";
};
power0 {
label = "bcm53xx:green:power";
gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
linux,default-trigger = "default-off";
};
power1 {
label = "bcm53xx:amber:power";
gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
linux,default-trigger = "default-on";
};
usb {
label = "bcm53xx:blue:usb";
gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
linux,default-trigger = "default-off";
};
wireless {
label = "bcm53xx:blue:wireless";
gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
linux,default-trigger = "default-off";
};
};
};

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

@ -8,6 +8,7 @@
* Licensed under the GNU/GPL. See COPYING for details.
*/
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
@ -92,4 +93,19 @@ clk_periph: periph {
clock-frequency = <400000000>;
};
};
axi@18000000 {
compatible = "brcm,bus-axi";
reg = <0x18000000 0x1000>;
ranges = <0x00000000 0x18000000 0x00100000>;
#address-cells = <1>;
#size-cells = <1>;
chipcommon: chipcommon@0 {
reg = <0x00000000 0x1000>;
gpio-controller;
#gpio-cells = <2>;
};
};
};