Author: blogic Date: 2015-06-29 10:24:03 +0200 (Mon, 29 Jun 2015) New Revision: 46142
Removed: branches/chaos_calmer/target/linux/ar71xx/files/arch/mips/ath79/mach-epg5000.c branches/chaos_calmer/target/linux/ar71xx/patches-3.18/718-MIPS-ath79-add-EPG5000-support.patch Modified: branches/chaos_calmer/target/linux/ar71xx/config-3.18 Log: Revert "ar71xx: add kernel support for EnGenius EPG5000." This reverts commit 27386b74adfe868f693176f55861984432afd2ce. Signed-off-by: John Crispin <[email protected]> Modified: branches/chaos_calmer/target/linux/ar71xx/config-3.18 =================================================================== --- branches/chaos_calmer/target/linux/ar71xx/config-3.18 2015-06-29 06:59:45 UTC (rev 46141) +++ branches/chaos_calmer/target/linux/ar71xx/config-3.18 2015-06-29 08:24:03 UTC (rev 46142) @@ -58,7 +58,6 @@ CONFIG_ATH79_MACH_EAP7660D=y CONFIG_ATH79_MACH_EL_M150=y CONFIG_ATH79_MACH_EL_MINI=y -CONFIG_ATH79_MACH_EPG5000=y CONFIG_ATH79_MACH_ESR1750=y CONFIG_ATH79_MACH_ESR900=y CONFIG_ATH79_MACH_EW_DORIN=y Deleted: branches/chaos_calmer/target/linux/ar71xx/files/arch/mips/ath79/mach-epg5000.c =================================================================== --- branches/chaos_calmer/target/linux/ar71xx/files/arch/mips/ath79/mach-epg5000.c 2015-06-29 06:59:45 UTC (rev 46141) +++ branches/chaos_calmer/target/linux/ar71xx/files/arch/mips/ath79/mach-epg5000.c 2015-06-29 08:24:03 UTC (rev 46142) @@ -1,178 +0,0 @@ -/* - * EnGenius EPG5000 board support - * - * Copyright (c) 2014 Jon Suphammer <[email protected]> - * Copyright (c) 2015 Christian Beier <[email protected]> - * - * 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 <linux/platform_device.h> -#include <linux/ar8216_platform.h> - -#include <asm/mach-ath79/ar71xx_regs.h> - -#include "common.h" -#include "pci.h" -#include "dev-ap9x-pci.h" -#include "dev-gpio-buttons.h" -#include "dev-eth.h" -#include "dev-leds-gpio.h" -#include "dev-m25p80.h" -#include "dev-usb.h" -#include "dev-wmac.h" -#include "machtypes.h" -#include "nvram.h" - -#define EPG5000_GPIO_LED_WLAN_5G 23 -#define EPG5000_GPIO_LED_WLAN_2G 13 -#define EPG5000_GPIO_LED_POWER_AMBER 2 -#define EPG5000_GPIO_LED_WPS_AMBER 22 -#define EPG5000_GPIO_LED_WPS_BLUE 19 - -#define EPG5000_GPIO_BTN_WPS 16 -#define EPG5000_GPIO_BTN_RESET 17 - -#define EPG5000_KEYS_POLL_INTERVAL 20 /* msecs */ -#define EPG5000_KEYS_DEBOUNCE_INTERVAL (3 * EPG5000_KEYS_POLL_INTERVAL) - -#define EPG5000_CALDATA_ADDR 0x1fff0000 -#define EPG5000_WMAC_CALDATA_OFFSET 0x1000 -#define EPG5000_PCIE_CALDATA_OFFSET 0x5000 - -#define EPG5000_NVRAM_ADDR 0x1f030000 -#define EPG5000_NVRAM_SIZE 0x10000 - -static struct gpio_led epg5000_leds_gpio[] __initdata = { - { - .name = "epg5000:amber:power", - .gpio = EPG5000_GPIO_LED_POWER_AMBER, - .active_low = 1, - }, - { - .name = "epg5000:blue:wps", - .gpio = EPG5000_GPIO_LED_WPS_BLUE, - .active_low = 1, - }, - { - .name = "epg5000:amber:wps", - .gpio = EPG5000_GPIO_LED_WPS_AMBER, - .active_low = 1, - }, - { - .name = "epg5000:blue:wlan-2g", - .gpio = EPG5000_GPIO_LED_WLAN_2G, - .active_low = 1, - }, - { - .name = "epg5000:blue:wlan-5g", - .gpio = EPG5000_GPIO_LED_WLAN_5G, - .active_low = 1, - } -}; - -static struct gpio_keys_button epg5000_gpio_keys[] __initdata = { - { - .desc = "WPS button", - .type = EV_KEY, - .code = KEY_WPS_BUTTON, - .debounce_interval = EPG5000_KEYS_DEBOUNCE_INTERVAL, - .gpio = EPG5000_GPIO_BTN_WPS, - .active_low = 1, - }, - { - .desc = "Reset button", - .type = EV_KEY, - .code = KEY_RESTART, - .debounce_interval = EPG5000_KEYS_DEBOUNCE_INTERVAL, - .gpio = EPG5000_GPIO_BTN_RESET, - .active_low = 1, - }, -}; - -static struct ar8327_pad_cfg epg5000_ar8327_pad0_cfg = { - .mode = AR8327_PAD_MAC_RGMII, - .txclk_delay_en = true, - .rxclk_delay_en = true, - .txclk_delay_sel = AR8327_CLK_DELAY_SEL2, - .rxclk_delay_sel = AR8327_CLK_DELAY_SEL2, - .mac06_exchange_en = true, -}; - -static struct ar8327_platform_data epg5000_ar8327_data = { - .pad0_cfg = &epg5000_ar8327_pad0_cfg, - .port0_cfg = { - .force_link = 1, - .speed = AR8327_PORT_SPEED_1000, - .duplex = 1, - .txpause = 1, - .rxpause = 1, - }, -}; - -static struct mdio_board_info epg5000_mdio0_info[] = { - { - .bus_id = "ag71xx-mdio.0", - .phy_addr = 0, - .platform_data = &epg5000_ar8327_data, - }, -}; - -static int epg5000_get_mac(const char *name, char *mac) -{ - u8 *nvram = (u8 *) KSEG1ADDR(EPG5000_NVRAM_ADDR); - int err; - - err = ath79_nvram_parse_mac_addr(nvram, EPG5000_NVRAM_SIZE, - name, mac); - if (err) { - pr_err("no MAC address found for %s\n", name); - return false; - } - - return true; -} - -static void __init epg5000_setup(void) -{ - u8 *caldata = (u8 *) KSEG1ADDR(EPG5000_CALDATA_ADDR); - u8 mac1[ETH_ALEN]; - - ath79_register_m25p80(NULL); - - ath79_register_leds_gpio(-1, ARRAY_SIZE(epg5000_leds_gpio), - epg5000_leds_gpio); - ath79_register_gpio_keys_polled(-1, EPG5000_KEYS_POLL_INTERVAL, - ARRAY_SIZE(epg5000_gpio_keys), - epg5000_gpio_keys); - - ath79_register_usb(); - - ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN); - - ath79_register_mdio(0, 0x0); - - mdiobus_register_board_info(epg5000_mdio0_info, - ARRAY_SIZE(epg5000_mdio0_info)); - - /* GMAC0 is connected to an QCA8327N switch */ - ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; - ath79_eth0_data.phy_mask = BIT(0); - ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; - - if (epg5000_get_mac("ethaddr=", mac1)) - ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0); - - ath79_eth0_pll_data.pll_1000 = 0xa6000000; - ath79_register_eth(0); - - ath79_register_wmac(caldata + EPG5000_WMAC_CALDATA_OFFSET, mac1); - - ath79_register_pci(); -} - -MIPS_MACHINE(ATH79_MACH_EPG5000, "EPG5000", - "EnGenius EPG5000", - epg5000_setup); Deleted: branches/chaos_calmer/target/linux/ar71xx/patches-3.18/718-MIPS-ath79-add-EPG5000-support.patch =================================================================== --- branches/chaos_calmer/target/linux/ar71xx/patches-3.18/718-MIPS-ath79-add-EPG5000-support.patch 2015-06-29 06:59:45 UTC (rev 46141) +++ branches/chaos_calmer/target/linux/ar71xx/patches-3.18/718-MIPS-ath79-add-EPG5000-support.patch 2015-06-29 08:24:03 UTC (rev 46142) @@ -1,39 +0,0 @@ ---- a/arch/mips/ath79/Kconfig -+++ b/arch/mips/ath79/Kconfig -@@ -196,6 +196,16 @@ config ATH79_MACH_F9K1115V2 - select ATH79_DEV_USB - select ATH79_DEV_WMAC - -+config ATH79_MACH_EPG5000 -+ bool "EnGenius EPG5000 board support" -+ select SOC_QCA955X -+ select ATH79_DEV_ETH -+ select ATH79_DEV_GPIO_BUTTONS -+ select ATH79_DEV_LEDS_GPIO -+ select ATH79_DEV_M25P80 -+ select ATH79_DEV_USB -+ select ATH79_DEV_WMAC -+ - config ATH79_MACH_ESR1750 - bool "EnGenius ESR1750 board support" - select SOC_QCA955X ---- a/arch/mips/ath79/Makefile -+++ b/arch/mips/ath79/Makefile -@@ -69,6 +69,7 @@ obj-$(CONFIG_ATH79_MACH_EAP300V2) += mach-eap300v2.o - obj-$(CONFIG_ATH79_MACH_EAP7660D) += mach-eap7660d.o - obj-$(CONFIG_ATH79_MACH_EL_M150) += mach-el-m150.o - obj-$(CONFIG_ATH79_MACH_EL_MINI) += mach-el-mini.o -+obj-$(CONFIG_ATH79_MACH_EPG5000) += mach-epg5000.o - obj-$(CONFIG_ATH79_MACH_ESR1750) += mach-esr1750.o - obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o - obj-$(CONFIG_ATH79_MACH_GL_INET) += mach-gl-inet.o ---- a/arch/mips/ath79/machtypes.h -+++ b/arch/mips/ath79/machtypes.h -@@ -59,6 +59,7 @@ enum ath79_mach_type { - ATH79_MACH_EL_M150, /* EasyLink EL-M150 */ - ATH79_MACH_EL_MINI, /* EasyLink EL-MINI */ - ATH79_MACH_ESR1750, /* EnGenius ESR1750 */ -+ ATH79_MACH_EPG5000, /* EnGenius EPG5000 */ - ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */ - ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */ - ATH79_MACH_GS_OOLITE, /* GS OOLITE V1.0 */ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
