Commit 83b63c69 authored by Olof Johansson's avatar Olof Johansson
Browse files

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



Merge "ARM: BCM5301X: DT changes for v3.19 #2" from Hauke Mehrtens:

ARM: BCM5301X: dts updates

This adds the IRQ number to the main dts file and some new dts files
for newly added devices.

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

* tag 'bcm5301x-dt-2014-12-04' of https://github.com/hauke/linux

:
  ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2
  ARM: BCM5301X: Add DT for Asus RT-N18U
  ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP
  ARM: BCM5301X: Add DT for Netgear R6300 V2
  ARM: BCM5301X: Add buttons for Netgear R6250
  ARM: BCM5301X: Add IRQs to Broadcom's bus-axi in DTS file

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 403ea7f6 dd7733da

arch/arm/boot/dts/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -55,7 +55,12 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb 
dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb

dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += \

	bcm4708-buffalo-wzr-1750dhp.dtb \

	bcm4708-netgear-r6250.dtb \

	bcm4708-netgear-r6300-v2.dtb \

	bcm47081-asus-rt-n18u.dtb \

	bcm47081-buffalo-wzr-600dhp2.dtb

dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb

dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \

	bcm911360k.dtb \

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

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

 * Broadcom BCM470X / BCM5301X ARM platform code.

 * DTS for Buffalo WZR-1750DHP

 *

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

 *

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

 */



/dts-v1/;



#include "bcm4708.dtsi"



/ {

	compatible = "buffalo,wzr-1750dhp", "brcm,bcm4708";

	model = "Buffalo WZR-1750DHP (BCM4708)";



	chosen {

		bootargs = "console=ttyS0,115200";

	};



	memory {

		reg = <0x00000000 0x08000000>;

	};



	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <200>;



		restart {

			label = "Reset";

			linux,code = <KEY_RESTART>;

			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;

		};



		aoss {

			label = "AOSS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;

		};



		/* Commit mode set by switch? */

		mode {

			label = "Mode";

			linux,code = <KEY_SETUP>;

			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;

		};



		/* Switch: AP mode */

		sw_ap {

			label = "AP";

			linux,code = <BTN_0>;

			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;

		};



		eject {

			label = "USB eject";

			linux,code = <KEY_EJECTCD>;

			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;

		};

	};

};

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

+25 −0
Original line number Diff line number Diff line
@@ -66,4 +66,29 @@ 
			linux,default-trigger = "default-off";

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <200>;



		wps {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;

		};



		rfkill {

			label = "WiFi";

			linux,code = <KEY_RFKILL>;

			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;

		};



		restart {

			label = "Reset";

			linux,code = <KEY_RESTART>;

			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;

		};

	};

};

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

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

 * Broadcom BCM470X / BCM5301X ARM platform code.

 * DTS for Netgear R6300 V2

 *

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

 *

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

 */



/dts-v1/;



#include "bcm4708.dtsi"



/ {

	compatible = "netgear,r6300v2", "brcm,bcm4708";

	model = "Netgear R6300 V2 (BCM4708)";



	chosen {

		bootargs = "console=ttyS0,115200";

	};



	memory {

		reg = <0x00000000 0x08000000>;

	};



	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";

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <200>;



		wps {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;

		};



		rfkill {

			label = "WiFi";

			linux,code = <KEY_RFKILL>;

			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;

		};



		restart {

			label = "Reset";

			linux,code = <KEY_RESTART>;

			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;

		};

	};

};

arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts

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

 * Broadcom BCM470X / BCM5301X ARM platform code.

 * DTS for Asus RT-N18U

 *

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

 *

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

 */



/dts-v1/;



#include "bcm47081.dtsi"



/ {

	compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";

	model = "Asus RT-N18U (BCM47081)";



	chosen {

		bootargs = "console=ttyS0,115200";

	};



	memory {

		reg = <0x00000000 0x08000000>;

	};



	leds {

		compatible = "gpio-leds";



		power {

			label = "bcm53xx:blue:power";

			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;

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

		};



		usb2 {

			label = "bcm53xx:blue:usb2";

			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;

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

		};



		wan {

			label = "bcm53xx:blue:wan";

			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;

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

		};



		lan {

			label = "bcm53xx:blue:lan";

			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;

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

		};



		usb3 {

			label = "bcm53xx:blue:usb3";

			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;

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

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <200>;



		restart {

			label = "Reset";

			linux,code = <KEY_RESTART>;

			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;

		};



		wps {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE