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

Commit 4d0b756e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.1/devicetree' of http://github.com/broadcom/stblinux into next/dt 

Pull "Broadcom Device Tree changes for 4.1 #1" from Florian Fainelli:

This pull request contains the following Broadcom SoCs Device Tree changes:

- Jonathan adds support for the Broadcom Cygnus BCM958305K board

- Rafal adds support for Netgear R8000 and fixes the default for power LEDs
  on Netgear R6250

* tag 'arm-soc/for-4.1/devicetree' of http://github.com/broadcom/stblinux:
  ARM: BCM5301X: Fix default state of power LEDs on Netgear R6250
  ARM: BCM5301X: Add DT for Netgear R8000
  ARM: dts: Enable Broadcom Cygnus BCM958305K
parents e3d00145 7875b470

arch/arm/boot/dts/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -60,13 +60,15 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm4708-netgear-r6300-v2.dtb \

	bcm47081-asus-rt-n18u.dtb \

	bcm47081-buffalo-wzr-600dhp2.dtb \

	bcm47081-buffalo-wzr-900dhp.dtb

	bcm47081-buffalo-wzr-900dhp.dtb \

	bcm4709-netgear-r8000.dtb

dtb-$(CONFIG_ARCH_BCM_63XX) += \

	bcm963138dvt.dtb

dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \

	bcm911360_entphn.dtb \

	bcm911360k.dtb \

	bcm958300k.dtb

	bcm958300k.dtb \

	bcm958305k.dtb

dtb-$(CONFIG_ARCH_BCM_MOBILE) += \

	bcm28155-ap.dtb \

	bcm21664-garnet.dtb

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

+2 −2
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ 
		power0 {

			label = "bcm53xx:green:power";

			gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;

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

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

		};



		power1 {

			label = "bcm53xx:amber:power";

			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;

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

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

		};



		usb {

arch/arm/boot/dts/bcm4709-netgear-r8000.dts

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

 * Broadcom BCM470X / BCM5301X ARM platform code.

 * DTS for Netgear R8000

 *

 * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>

 *

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

 */



/dts-v1/;



#include "bcm4708.dtsi"



/ {

	compatible = "netgear,r8000", "brcm,bcm4709", "brcm,bcm4708";

	model = "Netgear R8000 (BCM4709)";



	chosen {

		bootargs = "console=ttyS0,115200";

	};



	memory {

		reg = <0x00000000 0x08000000>;

	};



	leds {

		compatible = "gpio-leds";



		power0 {

			label = "bcm53xx:white:power";

			gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;

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

		};



		power1 {

			label = "bcm53xx:amber:power";

			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;

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

		};



		5ghz-1 {

			label = "bcm53xx:white:5ghz-1";

			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;

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

		};



		2ghz {

			label = "bcm53xx:white:2ghz";

			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;

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

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		rfkill {

			label = "WiFi";

			linux,code = <KEY_RFKILL>;

			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;

		};



		wps {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;

		};



		restart {

			label = "Reset";

			linux,code = <KEY_RESTART>;

			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;

		};

	};

};

arch/arm/boot/dts/bcm958305k.dts

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

 *  BSD LICENSE

 *

 *  Copyright(c) 2015 Broadcom Corporation.  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 "bcm-cygnus.dtsi"



/ {

	model = "Cygnus Wireless Audio (BCM958305K)";

	compatible = "brcm,bcm58305", "brcm,cygnus";



	aliases {

		serial0 = &uart3;

	};



	chosen {

		stdout-path = &uart3;

		bootargs = "console=ttyS0,115200";

	};



	uart3: serial@18023000 {

		status = "okay";

	};

};