diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-k2t.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-k2t.c index ae5239e6a7..6c712292e4 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-k2t.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-k2t.c @@ -1,46 +1,32 @@ /* * Phicomm k2t support * - * Copyright (c) 2012 Qualcomm Atheros - * Copyright (c) 2012-2013 Gabor Juhos - * Copyright (c) 2018 wheretoteardown - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * Copyright (C) 2018 Lean * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. */ -#include #include +#include +#include #include #include - -#include -#include -#include - #include +#include + +#include #include "common.h" -#include "pci.h" #include "dev-ap9x-pci.h" #include "dev-eth.h" #include "dev-gpio-buttons.h" #include "dev-leds-gpio.h" +#include "dev-spi.h" #include "dev-m25p80.h" #include "dev-wmac.h" -#include "dev-usb.h" #include "machtypes.h" -#include "nvram.h" - #define K2T_GPIO_LED_BLUE 6 @@ -52,11 +38,11 @@ #define K2T_KEYS_POLL_INTERVAL 20 /* msecs */ #define K2T_KEYS_DEBOUNCE_INTERVAL (3 * K2T_KEYS_POLL_INTERVAL) -#define K2T_MAC0_OFFSET 0 -#define K2T_MAC1_OFFSET 6 -#define K2T_WMAC_OFFSET 12 -#define K2T_WMAC_CALDATA_OFFSET 0x1000 -#define K2T_PCIE_CALDATA_OFFSET 0x5000 +#define K2T_LAN_MAC_OFFSET 0 +#define K2T_WAN_MAC_OFFSET 6 +#define K2T_WLAN_MAC_OFFSET 12 +#define K2T_WMAC_CALDATA_OFFSET 0x1000 +#define K2T_PCIE_CALDATA_OFFSET 0x5000 static struct gpio_led k2t_leds_gpio[] __initdata = { { @@ -87,22 +73,13 @@ static struct gpio_keys_button K2T_GPIO_keys[] __initdata = { } }; -static struct ar8327_pad_cfg k2t_qca8337_pad6_cfg = { +static struct ar8327_pad_cfg k2t_qca8337_pad0_cfg = { .mode = AR8327_PAD_MAC_SGMII, .sgmii_delay_en = true, }; -static struct ar8327_pad_cfg k2t_qca8337_pad0_cfg = { - .mode = AR8327_PAD_MAC_SGMII, - .txclk_delay_en = true, - .rxclk_delay_en = true, - .txclk_delay_sel = AR8327_CLK_DELAY_SEL1, - .rxclk_delay_sel = AR8327_CLK_DELAY_SEL2, -}; - static struct ar8327_platform_data k2t_qca8337_data = { .pad0_cfg = &k2t_qca8337_pad0_cfg, - .pad6_cfg = &k2t_qca8337_pad6_cfg, .port0_cfg = { .force_link = 1, .speed = AR8327_PORT_SPEED_1000, @@ -110,13 +87,6 @@ static struct ar8327_platform_data k2t_qca8337_data = { .txpause = 1, .rxpause = 1, }, - .port6_cfg = { - .force_link = 1, - .speed = AR8327_PORT_SPEED_1000, - .duplex = 1, - .txpause = 1, - .rxpause = 1, - }, }; static struct mdio_board_info k2t_mdio0_info[] = { @@ -130,45 +100,38 @@ static struct mdio_board_info k2t_mdio0_info[] = { static void __init k2t_setup(void) { u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + u8 tmpmac[ETH_ALEN]; ath79_register_m25p80(NULL); ath79_register_leds_gpio(-1, ARRAY_SIZE(k2t_leds_gpio), k2t_leds_gpio); + ath79_register_gpio_keys_polled(-1, K2T_KEYS_POLL_INTERVAL, ARRAY_SIZE(K2T_GPIO_keys), K2T_GPIO_keys); - ath79_register_usb(); - ath79_register_pci(); + ath79_init_mac(tmpmac, art + K2T_WLAN_MAC_OFFSET, 0); + ath79_register_wmac(art + K2T_WMAC_CALDATA_OFFSET, tmpmac); - ath79_register_wmac(art + K2T_WMAC_CALDATA_OFFSET, art + K2T_WMAC_OFFSET); - - ath79_setup_qca956x_eth_cfg(QCA956X_ETH_CFG_RGMII_EN); - - ath79_register_mdio(0, 0x0); - - ath79_init_mac(ath79_eth0_data.mac_addr, art + K2T_MAC0_OFFSET, 0); - ath79_init_mac(ath79_eth1_data.mac_addr, art + K2T_MAC1_OFFSET, 0); + ath79_init_mac(tmpmac, art + K2T_WLAN_MAC_OFFSET, 1); + ap91_pci_init(art + K2T_PCIE_CALDATA_OFFSET, tmpmac); mdiobus_register_board_info(k2t_mdio0_info, ARRAY_SIZE(k2t_mdio0_info)); + ath79_register_mdio(0, 0x0); + + ath79_init_mac(ath79_eth0_data.mac_addr, art + K2T_LAN_MAC_OFFSET, 0); - /* GMAC0 is connected to the RMGII interface */ + /* GMAC0 is connected to a QCA8337 switch SMGII interface*/ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; + ath79_eth0_data.speed = SPEED_1000; + ath79_eth0_data.duplex = DUPLEX_FULL; ath79_eth0_data.phy_mask = BIT(0); ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; - ath79_eth0_pll_data.pll_1000 = 0x56000000; - + ath79_register_eth(0); - /* GMAC1 is connected tot eh SGMII interface */ - 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 = 0x03000101; - - ath79_register_eth(1); } MIPS_MACHINE(ATH79_MACH_K2T, "K2T", "Phicomm K2T", k2t_setup); diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 6cdfc959ae..36c0802409 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -1298,7 +1298,7 @@ TARGET_DEVICES += fritz300e define Device/k2t DEVICE_TITLE := Phicomm K2T - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ath9k kmod-ath10k ath10k-firmware-qca9888 + DEVICE_PACKAGES := kmod-ath9k kmod-ath10k ath10k-firmware-qca9888 BOARDNAME := K2T SUPPORTED_DEVICES := k2t DEVICE_PROFILE := K2T