From 4525986b7e984464c1b78eac4fbd5427ddb7df8b Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Mon, 1 Dec 2014 00:51:08 +0000
Subject: [PATCH] brcm63xx: Add DT support for F@ST2504n
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 43450
---
 target/linux/brcm63xx/dts/fast2504n.dts                  | 8 ++++++++
 target/linux/brcm63xx/image/Makefile                     | 5 ++---
 .../brcm63xx/patches-3.14/537-board_fast2504n.patch      | 8 ++++++++
 target/linux/brcm63xx/profiles/sagem.mk                  | 9 +++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 target/linux/brcm63xx/dts/fast2504n.dts

diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/fast2504n.dts
new file mode 100644
index 0000000000..2f202a30bf
--- /dev/null
+++ b/target/linux/brcm63xx/dts/fast2504n.dts
@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/include/ "bcm6362.dtsi"
+
+/ {
+	model = "Sagem F@ST2504n";
+	compatible = "sagem,f@st2504n", "brcm,bcm6362";
+};
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 14d07309f7..26063e9615 100755
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -200,9 +200,6 @@ define Image/Build
 	# RTA1320_16M (numerous routers)
 	$(call Image/Build/CFE,$(1),RTA1320_16M,6338,RTA1320_16M,,--layoutver 5)
 
-	# Sagem F@ST2504n
-	$(call Image/Build/CFE,$(1),F@ST2504n,6362,F@ST2504n,OpenWRT-$(REVISION))
-
 	# USR 9108
 	$(call Image/Build/CFE,$(1),96348GW-A,6348,USR9108)
 	# NetGear DG834GT, DG834PN
@@ -319,6 +316,8 @@ $(eval $(call ImageDTB,CFEDTB,A226M,a226m,DWV-S0,6358,A226M,--signature2 IMAGE -
 $(eval $(call ImageDTB,CFEDTB,A226M,a226m-fwb,DWV-S0,6358,A226M-FWB,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8))
 # Sagem F@ST2404
 $(eval $(call ImageDTB,CFEDTB,FAST2404,fast2404,F@ST2404,6348,F@ST2404))
+# Sagem F@ST2504n
+$(eval $(call ImageDTB,CFEDTB,FAST2504n,fast2504n,F@ST2504n,6362,F@ST2504n))
 # Sagem F@ST2604
 $(eval $(call ImageDTB,CFEDTB,FAST2604,fast2604,F@ST2604,6348,F@ST2604))
 # Sagem F@ST2704V2
diff --git a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
index 27c83446cf..1b00d464eb 100644
--- a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
@@ -111,3 +111,11 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
+@@ -3738,6 +3829,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "t-com,spw303v", .data = &board_spw303v, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6362
++	{ .compatible = "sagem,f@st2504n", .data = &board_fast2504n, },
+ 	{ .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6368
diff --git a/target/linux/brcm63xx/profiles/sagem.mk b/target/linux/brcm63xx/profiles/sagem.mk
index 80ae8932f1..5afb2b7259 100644
--- a/target/linux/brcm63xx/profiles/sagem.mk
+++ b/target/linux/brcm63xx/profiles/sagem.mk
@@ -14,6 +14,15 @@ define Profile/FAST2404/Description
 endef
 $(eval $(call Profile,FAST2404))
 
+define Profile/FAST2504n
+  NAME:=Sagem F@ST2504n
+  PACKAGES:=kmod-b43 wpad-mini
+endef
+define Profile/FAST2504n/Description
+  Package set optimized for F@ST2504n.
+endef
+$(eval $(call Profile,FAST2504n))
+
 define Profile/FAST2604
   NAME:=Sagem F@ST2604
   PACKAGES:=kmod-b43 wpad-mini
-- 
2.30.2