X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F526-board_CT6373-1.patch;fp=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F526-board_CT6373-1.patch;h=ac24ebd047eb942f05e74ebce01bc8cf01db800b;hb=8e04efe3e59dcf31a7ab62ef613b77d8d00af122;hp=d08822a6c57b98618519db53513ddb9635e8ba69;hpb=ce25f4b294fba8cc550ba00dd3fb619a7e95eb1c;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
index d08822a6c5..ac24ebd047 100644
--- a/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
@@ -1,61 +1,9 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -43,6 +43,12 @@
- #define NB4_SPI_GPIO_CLK	6
- #define NB4_74HC64_GPIO(X)	(NB4_74X164_GPIO_BASE + (X))
- 
-+#define CT6373_PID_OFFSET		0xff80
-+#define CT6373_74X164_GPIO_BASE	64
-+#define CT6373_SPI_GPIO_MOSI	7
-+#define CT6373_SPI_GPIO_CLK		6
-+#define CT6373_74HC64_GPIO(X)	(CT6373_74X164_GPIO_BASE + (X))
-+
- /*
-  * known 3368 boards
-  */
-@@ -2035,6 +2041,124 @@ static struct board_info __initdata boar
- 	.num_spis = ARRAY_SIZE(nb4_spi_devices),
+@@ -1251,6 +1251,31 @@ static struct board_info __initdata boar
+ 	.num_usbh_ports			= 2,
  };
  
-+
-+struct spi_gpio_platform_data ct6373_spi_gpio_data = {
-+	.sck		= CT6373_SPI_GPIO_CLK,
-+	.mosi		= CT6373_SPI_GPIO_MOSI,
-+	.miso		= SPI_GPIO_NO_MISO,
-+	.num_chipselect	= 1,
-+};
-+
-+static struct platform_device ct6373_spi_gpio = {
-+	.name = "spi_gpio",
-+	.id   = 1,
-+	.dev = {
-+		.platform_data = &ct6373_spi_gpio_data,
-+	},
-+};
-+
-+static struct platform_device * __initdata ct6373_devices[] = {
-+	&ct6373_spi_gpio,
-+};
-+
-+#if 0 /* FIXME: 3.14 dropped non-DT support */
-+const struct gen_74x164_chip_platform_data ct6373_74x164_platform_data = {
-+	.base = CT6373_74X164_GPIO_BASE
-+};
-+#endif
-+
-+static struct spi_board_info ct6373_spi_devices[] = {
-+#if 0 /* FIXME: 3.14 dropped non-DT support */
-+	{
-+		.modalias = "74x164",
-+		.max_speed_hz = 781000,
-+		.bus_num = 1,
-+		.controller_data = (void *) SPI_GPIO_NO_CHIPSELECT,
-+		.mode = SPI_MODE_0,
-+		.platform_data = &ct6373_74x164_platform_data
-+	}
-+#endif
-+};
-+
 +static struct board_info __initdata board_ct6373_1 = {
 +	.name				= "CT6373-1",
 +	.expected_cpu_id	= 0x6358,
@@ -74,71 +22,17 @@
 +		.force_duplex_full	= 1,
 +	},
 +
-+	.leds = {
-+		{
-+			.name		= "CT6373-1:green:power",
-+			.gpio		= 0,
-+			.default_trigger = "default-on",
-+		},
-+		{
-+			.name		= "CT6373-1:green:usb",
-+			.gpio		= 3,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "CT6373-1:green:wlan",
-+			.gpio		= 9,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "CT6373-1:green:adsl",
-+			.gpio		= CT6373_74HC64_GPIO(0),
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "CT6373-1:green:line",
-+			.gpio		= CT6373_74HC64_GPIO(1),
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "CT6373-1:green:fxs1",
-+			.gpio		= CT6373_74HC64_GPIO(2),
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "CT6373-1:green:fxs2",
-+			.gpio		= CT6373_74HC64_GPIO(3),
-+			.active_low	= 1,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc		= "reset",
-+			.gpio		= 35,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= KEY_RESTART,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
-+
 +	.fallback_sprom = {
 +		.type 				= SPROM_BCM4318,
 +		.pci_bus			= 0,
 +		.pci_dev			= 1,
 +	},
-+
-+	.devs = ct6373_devices,
-+	.num_devs = ARRAY_SIZE(ct6373_devices),
-+	.spis = ct6373_spi_devices,
-+	.num_spis = ARRAY_SIZE(ct6373_spi_devices),
 +};
 +
  static struct board_info __initdata board_HW553 = {
  	.name                           = "HW553",
  	.expected_cpu_id                = 0x6358,
-@@ -2376,6 +2500,7 @@ static const struct board_info __initcon
+@@ -1440,6 +1465,7 @@ static const struct board_info __initcon
  	&board_dsl_274xb_rev_c,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
@@ -146,7 +40,7 @@
  	&board_HW553,
  	&board_spw303v,
  #endif
-@@ -2429,6 +2554,7 @@ static struct of_device_id const bcm963x
+@@ -1493,6 +1519,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
  	{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },