Commit e44cfd46 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarHauke 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: default avatarArnd Bergmann <arnd@arndb.de>
parents 6ecbdabe dd6d2e5f

arch/arm/boot/dts/bcm4708-netgear-r6250.dts

+34 −0
Original line number Diff line number Diff line
@@ -32,4 +32,38 @@ 
			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";

		};

	};

};

arch/arm/boot/dts/bcm5301x.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -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 @@ 
			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>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE