Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68f173f5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'bcm5301x-dt-2015-01-20' of https://github.com/hauke/linux into next/dt 

Merge "ARM: BCM5301X: DT changes for v3.20" from Hauke Mehrtens:

bcm5301x-dt-2015-01-20: ARM: BCM5301X: dts updates for 3.20

* tag 'bcm5301x-dt-2015-01-20' of https://github.com/hauke/linux

:
  ARM: BCM5301X: Add DT for Buffalo WZR-900DHP
  ARM: BCM5301X: Add LEDs for Buffalo devices
  ARM: BCM5301X: Drop unused poll-interval from gpio-keys
  ARM: BCM5301X: Add DT for Luxul XWC-1000

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 362c9a77 5b1864b8

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -64,10 +64,12 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2835-rpi-b-plus.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += \

	bcm4708-buffalo-wzr-1750dhp.dtb \

	bcm4708-luxul-xwc-1000.dtb \

	bcm4708-netgear-r6250.dtb \

	bcm4708-netgear-r6300-v2.dtb \

	bcm47081-asus-rt-n18u.dtb \

	bcm47081-buffalo-wzr-600dhp2.dtb

	bcm47081-buffalo-wzr-600dhp2.dtb \

	bcm47081-buffalo-wzr-900dhp.dtb

dtb-$(CONFIG_ARCH_BCM_63XX) += \

	bcm963138dvt.dtb

dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \

arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts

+67 −1
Original line number Diff line number Diff line
@@ -23,11 +23,77 @@ 
		reg = <0x00000000 0x08000000>;

	};



	spi {

		compatible = "spi-gpio";

		num-chipselects = <1>;

		gpio-sck = <&chipcommon 7 0>;

		gpio-mosi = <&chipcommon 4 0>;

		cs-gpios = <&chipcommon 6 0>;

		#address-cells = <1>;

		#size-cells = <0>;



		hc595: gpio_spi@0 {

			compatible = "fairchild,74hc595";

			reg = <0>;

			registers-number = <1>;

			spi-max-frequency = <100000>;



			gpio-controller;

			#gpio-cells = <2>;



		};

	};



	leds {

		compatible = "gpio-leds";



		power0 {

			label = "bcm53xx:red:power";

			gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "default-off";

		};



		power1 {

			label = "bcm53xx:white:power";

			gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "default-on";

		};



		router0 {

			label = "bcm53xx:blue:router";

			gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "default-on";

		};



		router1 {

			label = "bcm53xx:amber:router";

			gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "default-off";

		};



		wan {

			label = "bcm53xx:blue:wan";

			gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "default-on";

		};



		wireless0 {

			label = "bcm53xx:blue:wireless";

			gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "default-off";

		};



		wireless1 {

			label = "bcm53xx:amber:wireless";

			gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "default-off";

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <200>;



		restart {

			label = "Reset";

arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 * Broadcom BCM470X / BCM5301X ARM platform code.

 * DTS for Luxul XWC-1000

 *

 * Copyright 2014 Luxul Inc.

 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */



/dts-v1/;



#include "bcm4708.dtsi"



/ {

	compatible = "luxul,xwc-1000", "brcm,bcm4708";

	model = "Luxul XWC-1000 (BCM4708)";



	chosen {

		bootargs = "console=ttyS0,115200";

	};



	memory {

		reg = <0x00000000 0x08000000>;

	};



	axi@18000000 {

		nand@28000 {

			reg = <0x00028000 0x1000>;

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "ubi";

				reg = <0x00000000 0x08000000>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";



		status {

			label = "bcm53xx:green:status";

			gpios = <&chipcommon 0 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "timer";

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		restart {

			label = "Reset";

			linux,code = <KEY_RESTART>;

			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;

		};

	};

};

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

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ 
		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <200>;



		wps {

			label = "WPS";

arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <200>;



		wps {

			label = "WPS";