From 5e1e039c459374ac2908318a7bfdad5eac8b0bff Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 4 Jul 2011 15:04:58 +0000
Subject: [PATCH] [brcm63xx] hw553: fix missing has_uart0 in board definition
 (#9533)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27448 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../linux/brcm63xx/patches-2.6.39/449-board_hw553.patch   | 8 +++++---
 .../brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch   | 2 +-
 .../linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch | 2 +-
 .../linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch  | 6 +++---
 .../linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch | 2 +-
 .../brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch  | 2 +-
 .../patches-2.6.39/500-ssb-add-callback-for-sprom.patch   | 4 ++--
 .../patches-2.6.39/977-ssb_export_fallback_sprom.patch    | 4 ++--
 target/linux/brcm63xx/patches-3.0/449-board_hw553.patch   | 8 +++++---
 .../brcm63xx/patches-3.0/450-board_rta1320_16m.patch      | 2 +-
 target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch | 2 +-
 target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch  | 6 +++---
 target/linux/brcm63xx/patches-3.0/453-board_BTV2110.patch | 2 +-
 .../brcm63xx/patches-3.0/455-board_ct536_ct5621.patch     | 2 +-
 .../patches-3.0/977-ssb_export_fallback_sprom.patch       | 4 ++--
 15 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch b/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch
index f806ad078c..e9ac36600d 100644
--- a/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1706,6 +1706,79 @@ static struct board_info __initdata boar
+@@ -1706,6 +1706,81 @@ static struct board_info __initdata boar
  };
  #endif
  
@@ -8,6 +8,8 @@
 +	.name                           = "HW553",
 +	.expected_cpu_id                = 0x6358,
 +
++	.has_uart0			= 1,
++
 +	.has_enet0                      = 1,
 +	.has_enet1                      = 1,
 +	.has_pci                        = 1,
@@ -26,7 +28,7 @@
 +	.has_ehci0 = 1,
 +
 +	.leds = {
-+		/*Each led on HW553 is bi-color (except wifi) */		
++		/*Each led on HW553 is bi-color (except wifi) */
 +		{
 +			.name		= "lan:red",
 +			.gpio		= 34,
@@ -80,7 +82,7 @@
  /*
   * all boards
   */
-@@ -1746,6 +1819,7 @@ static const struct board_info __initdat
+@@ -1746,6 +1821,7 @@ static const struct board_info __initdat
  	&board_nb4_ser_r2,
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,
diff --git a/target/linux/brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch
index 537a88bae4..ed5a33b628 100644
--- a/target/linux/brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/450-board_rta1320_16m.patch
@@ -44,7 +44,7 @@
  #endif
  
  /*
-@@ -1787,6 +1824,7 @@ static const struct board_info __initdat
+@@ -1789,6 +1826,7 @@ static const struct board_info __initdat
  	&board_96338gw,
  	&board_96338w,
  	&board_96338w2_e7t,
diff --git a/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch b/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch
index 25b7140fba..7a5f2feb51 100644
--- a/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch
@@ -73,7 +73,7 @@
  #endif
  
  static struct board_info __initdata board_HW553 = {
-@@ -1858,6 +1924,7 @@ static const struct board_info __initdat
+@@ -1860,6 +1926,7 @@ static const struct board_info __initdat
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,
  	&board_HW553,
diff --git a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
index f1cfff614d..8ee99847bb 100644
--- a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
@@ -64,7 +64,7 @@
  #endif
  
  /*
-@@ -1909,6 +1966,7 @@ static const struct board_info __initdat
+@@ -1911,6 +1968,7 @@ static const struct board_info __initdat
  	&board_96348_D4PW,
  	&board_spw500v,
  	&board_96348sv,
@@ -72,7 +72,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2057,6 +2115,22 @@ void __init board_prom_init(void)
+@@ -2059,6 +2117,22 @@ void __init board_prom_init(void)
  		val &= MPI_CSBASE_BASE_MASK;
  	}
  	boot_addr = (u8 *)KSEG1ADDR(val);
@@ -95,7 +95,7 @@
  
  	/* dump cfe version */
  	cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2260,6 +2334,14 @@ int __init board_register_devices(void)
+@@ -2262,6 +2336,14 @@ int __init board_register_devices(void)
  		val = bcm_mpi_readl(MPI_CSBASE_REG(0));
  		val &= MPI_CSBASE_BASE_MASK;
  	}
diff --git a/target/linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch b/target/linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch
index 9e280b49f5..a9e49eb969 100644
--- a/target/linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/453-board_BTV2110.patch
@@ -63,7 +63,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -1967,6 +2023,7 @@ static const struct board_info __initdat
+@@ -1969,6 +2025,7 @@ static const struct board_info __initdat
  	&board_spw500v,
  	&board_96348sv,
  	&board_V2500V_BB,
diff --git a/target/linux/brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch
index 1af07ae112..cdb931ff6e 100644
--- a/target/linux/brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/455-board_ct536_ct5621.patch
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -2024,6 +2067,7 @@ static const struct board_info __initdat
+@@ -2026,6 +2069,7 @@ static const struct board_info __initdat
  	&board_96348sv,
  	&board_V2500V_BB,
  	&board_V2110,
diff --git a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
index 23f4d94aa1..25e75eea0c 100644
--- a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2128,6 +2128,17 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2130,6 +2130,17 @@ static struct ssb_sprom bcm63xx_sprom =
  	.boardflags_lo		= 0x2848,
  	.boardflags_hi		= 0x0000,
  };
@@ -18,7 +18,7 @@
  #endif
  
  /*
-@@ -2403,8 +2414,9 @@ int __init board_register_devices(void)
+@@ -2405,8 +2416,9 @@ int __init board_register_devices(void)
  	if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
  		memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
  		memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
diff --git a/target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch
index 478019d99e..a7f54732ee 100644
--- a/target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void)
+@@ -2110,7 +2110,7 @@ static void __init nb4_nvram_fixup(void)
   * bcm4318 WLAN work
   */
  #ifdef CONFIG_SSB_PCIHOST
@@ -9,7 +9,7 @@
  	.revision		= 0x02,
  	.board_rev		= 0x17,
  	.country_code		= 0x0,
-@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2130,6 +2130,7 @@ static struct ssb_sprom bcm63xx_sprom =
  	.boardflags_lo		= 0x2848,
  	.boardflags_hi		= 0x0000,
  };
diff --git a/target/linux/brcm63xx/patches-3.0/449-board_hw553.patch b/target/linux/brcm63xx/patches-3.0/449-board_hw553.patch
index f806ad078c..e9ac36600d 100644
--- a/target/linux/brcm63xx/patches-3.0/449-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.0/449-board_hw553.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1706,6 +1706,79 @@ static struct board_info __initdata boar
+@@ -1706,6 +1706,81 @@ static struct board_info __initdata boar
  };
  #endif
  
@@ -8,6 +8,8 @@
 +	.name                           = "HW553",
 +	.expected_cpu_id                = 0x6358,
 +
++	.has_uart0			= 1,
++
 +	.has_enet0                      = 1,
 +	.has_enet1                      = 1,
 +	.has_pci                        = 1,
@@ -26,7 +28,7 @@
 +	.has_ehci0 = 1,
 +
 +	.leds = {
-+		/*Each led on HW553 is bi-color (except wifi) */		
++		/*Each led on HW553 is bi-color (except wifi) */
 +		{
 +			.name		= "lan:red",
 +			.gpio		= 34,
@@ -80,7 +82,7 @@
  /*
   * all boards
   */
-@@ -1746,6 +1819,7 @@ static const struct board_info __initdat
+@@ -1746,6 +1821,7 @@ static const struct board_info __initdat
  	&board_nb4_ser_r2,
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,
diff --git a/target/linux/brcm63xx/patches-3.0/450-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.0/450-board_rta1320_16m.patch
index 537a88bae4..ed5a33b628 100644
--- a/target/linux/brcm63xx/patches-3.0/450-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.0/450-board_rta1320_16m.patch
@@ -44,7 +44,7 @@
  #endif
  
  /*
-@@ -1787,6 +1824,7 @@ static const struct board_info __initdat
+@@ -1789,6 +1826,7 @@ static const struct board_info __initdat
  	&board_96338gw,
  	&board_96338w,
  	&board_96338w2_e7t,
diff --git a/target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch b/target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch
index 25b7140fba..7a5f2feb51 100644
--- a/target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch
@@ -73,7 +73,7 @@
  #endif
  
  static struct board_info __initdata board_HW553 = {
-@@ -1858,6 +1924,7 @@ static const struct board_info __initdat
+@@ -1860,6 +1926,7 @@ static const struct board_info __initdat
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,
  	&board_HW553,
diff --git a/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch b/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
index 4ad8e6f9a0..12d03f3f70 100644
--- a/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
@@ -64,7 +64,7 @@
  #endif
  
  /*
-@@ -1909,6 +1966,7 @@ static const struct board_info __initdat
+@@ -1911,6 +1968,7 @@ static const struct board_info __initdat
  	&board_96348_D4PW,
  	&board_spw500v,
  	&board_96348sv,
@@ -72,7 +72,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2068,6 +2126,22 @@ void __init board_prom_init(void)
+@@ -2070,6 +2128,22 @@ void __init board_prom_init(void)
  		val &= MPI_CSBASE_BASE_MASK;
  	}
  	boot_addr = (u8 *)KSEG1ADDR(val);
@@ -95,7 +95,7 @@
  
  	/* dump cfe version */
  	cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2272,6 +2346,14 @@ int __init board_register_devices(void)
+@@ -2274,6 +2348,14 @@ int __init board_register_devices(void)
  		val = bcm_mpi_readl(MPI_CSBASE_REG(0));
  		val &= MPI_CSBASE_BASE_MASK;
  	}
diff --git a/target/linux/brcm63xx/patches-3.0/453-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.0/453-board_BTV2110.patch
index 9e280b49f5..a9e49eb969 100644
--- a/target/linux/brcm63xx/patches-3.0/453-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.0/453-board_BTV2110.patch
@@ -63,7 +63,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -1967,6 +2023,7 @@ static const struct board_info __initdat
+@@ -1969,6 +2025,7 @@ static const struct board_info __initdat
  	&board_spw500v,
  	&board_96348sv,
  	&board_V2500V_BB,
diff --git a/target/linux/brcm63xx/patches-3.0/455-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.0/455-board_ct536_ct5621.patch
index 1af07ae112..cdb931ff6e 100644
--- a/target/linux/brcm63xx/patches-3.0/455-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.0/455-board_ct536_ct5621.patch
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -2024,6 +2067,7 @@ static const struct board_info __initdat
+@@ -2026,6 +2069,7 @@ static const struct board_info __initdat
  	&board_96348sv,
  	&board_V2500V_BB,
  	&board_V2110,
diff --git a/target/linux/brcm63xx/patches-3.0/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.0/977-ssb_export_fallback_sprom.patch
index 478019d99e..a7f54732ee 100644
--- a/target/linux/brcm63xx/patches-3.0/977-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.0/977-ssb_export_fallback_sprom.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void)
+@@ -2110,7 +2110,7 @@ static void __init nb4_nvram_fixup(void)
   * bcm4318 WLAN work
   */
  #ifdef CONFIG_SSB_PCIHOST
@@ -9,7 +9,7 @@
  	.revision		= 0x02,
  	.board_rev		= 0x17,
  	.country_code		= 0x0,
-@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2130,6 +2130,7 @@ static struct ssb_sprom bcm63xx_sprom =
  	.boardflags_lo		= 0x2848,
  	.boardflags_hi		= 0x0000,
  };