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

Commit 62d4585f authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'arm-soc/for-4.2/dts-part3' of https://github.com/Broadcom/stblinux into next/dt 

This pull request contains Broadcom BCM5301x related changes:

- Hauke adds the interrupt mapping for the BCM5301x PCIe controller

- Haule adds support for NAND flash using the standard Broadcom NAND controller
  iProc specific binding on BCM4708/5301x

- Rafal adds support for the Asus RT-AC87U router

* tag 'arm-soc/for-4.2/dts-part3' of https://github.com/Broadcom/stblinux:
  ARM: BCM5301X: Add DT for Asus RT-AC87U
  ARM: BCM5301X: add IRQ numbers for PCIe controller
  ARM: BCM5301X: add NAND flash chip description
parents 338a6aaa 26343bda

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm47081-asus-rt-n18u.dtb \

	bcm47081-buffalo-wzr-600dhp2.dtb \

	bcm47081-buffalo-wzr-900dhp.dtb \

	bcm4709-asus-rt-ac87u.dtb \

	bcm4709-buffalo-wxr-1900dhp.dtb \

	bcm4709-netgear-r8000.dtb

dtb-$(CONFIG_ARCH_BCM_63XX) += \

arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
/dts-v1/;



#include "bcm4708.dtsi"

#include "bcm5301x-nand-cs0-bch8.dtsi"



/ {

	compatible = "asus,rt-ac56u", "brcm,bcm4708";

arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
/dts-v1/;



#include "bcm4708.dtsi"

#include "bcm5301x-nand-cs0-bch8.dtsi"



/ {

	compatible = "asus,rt-ac68u", "brcm,bcm4708";

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

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
/dts-v1/;



#include "bcm4708.dtsi"

#include "bcm5301x-nand-cs0-bch8.dtsi"



/ {

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

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

+3 −6
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
/dts-v1/;



#include "bcm4708.dtsi"

#include "bcm5301x-nand-cs0-bch8.dtsi"



/ {

	compatible = "luxul,xwc-1000", "brcm,bcm4708";
@@ -23,12 +24,8 @@ 
		reg = <0x00000000 0x08000000>;

	};



	axi@18000000 {

		nand@28000 {

			reg = <0x00028000 0x1000>;

			#address-cells = <1>;

			#size-cells = <1>;



	nand: nand@18028000 {

		nandcs@0 {

			partition@0 {

				label = "ubi";

				reg = <0x00000000 0x08000000>;