ef944dcb85
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37502
154 lines
3.9 KiB
Diff
154 lines
3.9 KiB
Diff
--- a/arch/mips/ath79/mach-pb44.c
|
|
+++ b/arch/mips/ath79/mach-pb44.c
|
|
@@ -8,23 +8,48 @@
|
|
* by the Free Software Foundation.
|
|
*/
|
|
|
|
+#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/i2c-gpio.h>
|
|
#include <linux/i2c/pcf857x.h>
|
|
+#include <linux/i2c/pcf857x.h>
|
|
+#include <linux/spi/flash.h>
|
|
+#include <linux/spi/vsc7385.h>
|
|
|
|
-#include "machtypes.h"
|
|
+#include <asm/mach-ath79/ar71xx_regs.h>
|
|
+#include <asm/mach-ath79/ath79.h>
|
|
+
|
|
+#include "dev-eth.h"
|
|
#include "dev-gpio-buttons.h"
|
|
#include "dev-leds-gpio.h"
|
|
#include "dev-spi.h"
|
|
#include "dev-usb.h"
|
|
+#include "machtypes.h"
|
|
#include "pci.h"
|
|
|
|
#define PB44_GPIO_I2C_SCL 0
|
|
#define PB44_GPIO_I2C_SDA 1
|
|
|
|
+#define PB44_PCF8757_VSC7395_CS 0
|
|
+#define PB44_PCF8757_STEREO_CS 1
|
|
+#define PB44_PCF8757_SLIC_CS0 2
|
|
+#define PB44_PCF8757_SLIC_TEST 3
|
|
+#define PB44_PCF8757_SLIC_INT0 4
|
|
+#define PB44_PCF8757_SLIC_INT1 5
|
|
+#define PB44_PCF8757_SW_RESET 6
|
|
+#define PB44_PCF8757_SW_JUMP 8
|
|
+#define PB44_PCF8757_LED_JUMP1 9
|
|
+#define PB44_PCF8757_LED_JUMP2 10
|
|
+#define PB44_PCF8757_TP24 11
|
|
+#define PB44_PCF8757_TP25 12
|
|
+#define PB44_PCF8757_TP26 13
|
|
+#define PB44_PCF8757_TP27 14
|
|
+#define PB44_PCF8757_TP28 15
|
|
+
|
|
#define PB44_GPIO_EXP_BASE 16
|
|
+#define PB44_GPIO_VSC7395_CS (PB44_GPIO_EXP_BASE + PB44_PCF8757_VSC7395_CS)
|
|
#define PB44_GPIO_SW_RESET (PB44_GPIO_EXP_BASE + 6)
|
|
#define PB44_GPIO_SW_JUMP (PB44_GPIO_EXP_BASE + 8)
|
|
#define PB44_GPIO_LED_JUMP1 (PB44_GPIO_EXP_BASE + 9)
|
|
@@ -92,21 +117,66 @@ static struct ath79_spi_controller_data
|
|
.cs_line = 0,
|
|
};
|
|
|
|
+static struct ath79_spi_controller_data pb44_spi1_data = {
|
|
+ .cs_type = ATH79_SPI_CS_TYPE_GPIO,
|
|
+ .cs_line = PB44_GPIO_VSC7395_CS,
|
|
+};
|
|
+
|
|
+static void pb44_vsc7395_reset(void)
|
|
+{
|
|
+ ath79_device_reset_set(AR71XX_RESET_GE1_PHY);
|
|
+ udelay(10);
|
|
+ ath79_device_reset_clear(AR71XX_RESET_GE1_PHY);
|
|
+ mdelay(50);
|
|
+}
|
|
+
|
|
+static struct vsc7385_platform_data pb44_vsc7395_data = {
|
|
+ .reset = pb44_vsc7395_reset,
|
|
+ .ucode_name = "vsc7395_ucode_pb44.bin",
|
|
+ .mac_cfg = {
|
|
+ .tx_ipg = 6,
|
|
+ .bit2 = 1,
|
|
+ .clk_sel = 0,
|
|
+ },
|
|
+};
|
|
+
|
|
+static const char *pb44_part_probes[] = {
|
|
+ "RedBoot",
|
|
+ NULL,
|
|
+};
|
|
+
|
|
+static struct flash_platform_data pb44_flash_data = {
|
|
+ .part_probes = pb44_part_probes,
|
|
+};
|
|
+
|
|
static struct spi_board_info pb44_spi_info[] = {
|
|
{
|
|
.bus_num = 0,
|
|
.chip_select = 0,
|
|
.max_speed_hz = 25000000,
|
|
.modalias = "m25p64",
|
|
+ .platform_data = &pb44_flash_data,
|
|
.controller_data = &pb44_spi0_data,
|
|
},
|
|
+ {
|
|
+ .bus_num = 0,
|
|
+ .chip_select = 1,
|
|
+ .max_speed_hz = 25000000,
|
|
+ .modalias = "spi-vsc7385",
|
|
+ .platform_data = &pb44_vsc7395_data,
|
|
+ .controller_data = &pb44_spi1_data,
|
|
+ }
|
|
};
|
|
|
|
static struct ath79_spi_platform_data pb44_spi_data = {
|
|
.bus_num = 0,
|
|
- .num_chipselect = 1,
|
|
+ .num_chipselect = 2,
|
|
};
|
|
|
|
+#define PB44_WAN_PHYMASK BIT(0)
|
|
+#define PB44_LAN_PHYMASK 0
|
|
+#define PB44_MDIO_PHYMASK (PB44_LAN_PHYMASK | PB44_WAN_PHYMASK)
|
|
+
|
|
static void __init pb44_init(void)
|
|
{
|
|
i2c_register_board_info(0, pb44_i2c_board_info,
|
|
@@ -122,6 +192,22 @@ static void __init pb44_init(void)
|
|
ARRAY_SIZE(pb44_spi_info));
|
|
ath79_register_usb();
|
|
ath79_register_pci();
|
|
+
|
|
+ ath79_register_mdio(0, ~PB44_MDIO_PHYMASK);
|
|
+
|
|
+ ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
|
|
+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
|
|
+ ath79_eth0_data.phy_mask = PB44_WAN_PHYMASK;
|
|
+
|
|
+ ath79_register_eth(0);
|
|
+
|
|
+ ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
|
|
+ ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
|
|
+ ath79_eth1_data.speed = SPEED_1000;
|
|
+ ath79_eth1_data.duplex = DUPLEX_FULL;
|
|
+ ath79_eth1_pll_data.pll_1000 = 0x110000;
|
|
+
|
|
+ ath79_register_eth(1);
|
|
}
|
|
|
|
MIPS_MACHINE(ATH79_MACH_PB44, "PB44", "Atheros PB44 reference board",
|
|
--- a/arch/mips/ath79/Kconfig
|
|
+++ b/arch/mips/ath79/Kconfig
|
|
@@ -58,6 +58,7 @@ config ATH79_MACH_DB120
|
|
config ATH79_MACH_PB44
|
|
bool "Atheros PB44 reference board"
|
|
select SOC_AR71XX
|
|
+ select ATH79_DEV_ETH
|
|
select ATH79_DEV_GPIO_BUTTONS
|
|
select ATH79_DEV_LEDS_GPIO
|
|
select ATH79_DEV_SPI
|