Hi,
there are some space vs tab errors. looks like they are int he original
patch and were not introduced by your mail client. please fix and resend
John
On 04/11/2014 09:55, [email protected] wrote:
> From: Jacek Kikiewicz <[email protected]>
>
> Signed-off-by: Jacek Kikiewicz <[email protected]>
>
> ---
> target/linux/ar71xx/base-files/etc/diag.sh | 1 +
> .../ar71xx/base-files/etc/uci-defaults/01_leds | 4 +
> .../ar71xx/base-files/etc/uci-defaults/02_network | 1 +
> .../base-files/etc/uci-defaults/04_led_migration | 1 +
> target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +
> .../ar71xx/base-files/lib/upgrade/platform.sh | 1 +
> target/linux/ar71xx/config-3.10 | 1 +
> .../files/arch/mips/ath79/mach-dhp-1565-a1.c | 170
> +++++++++++++++++++++
> target/linux/ar71xx/generic/profiles/d-link.mk | 11 ++
> target/linux/ar71xx/image/Makefile | 1 +
> .../730-MIPS-ath79-add-DHP-1565A1.patch | 40 +++++
> 11 files changed, 234 insertions(+)
> create mode 100644
> target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
> create mode 100644
> target/linux/ar71xx/patches-3.10/730-MIPS-ath79-add-DHP-1565A1.patch
>
> diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
> b/target/linux/ar71xx/base-files/etc/diag.sh
> index b3a8fc5..24f5871 100755
> --- a/target/linux/ar71xx/base-files/etc/diag.sh
> +++ b/target/linux/ar71xx/base-files/etc/diag.sh
> @@ -46,6 +46,7 @@ get_status_led() {
> db120)
> status_led="db120:green:status"
> ;;
> + dhp-1565-a1|\
here
> dir-505-a1 |\
> dir-600-a1 |\
> dir-615-e1 |\
> diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> index 599fc19..2e41250 100755
> --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> @@ -98,6 +98,10 @@ rb-2011uias-2hnd)
> ucidef_set_led_switch "eth10" "ETH10" "rb:green:eth10" "switch1" "0x02"
> ;;
>
> +dhp-1565-a1)
> + ucidef_set_led_switch "wan" "WAN" "d-link:green:planet" "switch0"
> "0x20"
> + ;;
> +
and here
> dir-505-a1)
> ucidef_set_led_netdev "lan" "LAN" "d-link:green:power" "eth1"
> ;;
> diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> index 743f9de..c7d8aec 100755
> --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> @@ -258,6 +258,7 @@ mynet-n750)
> [ -n "$mac" ] && ucidef_set_interface_macaddr "wan" "$mac"
> ;;
>
> +dhp-1565-a1 |\
> dir-835-a1 |\
> wndr3700v4 | \
> wndr4300)
> diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
> b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
> index 0df94a0..1cef8b9 100755
> --- a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
> +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
> @@ -46,6 +46,7 @@ migrate_leds()
> board=$(ar71xx_board_name)
>
> case "$board" in
> +dhp-1565-a1|\
> dir-825-c1|\
> dir-835-a1)
> migrate_leds ":orange:=:amber:" ":wifi_bgn=:wlan2g"
> diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> b/target/linux/ar71xx/base-files/lib/ar71xx.sh
> index 40e9303..bd7a276 100755
> --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
> @@ -305,6 +305,9 @@ ar71xx_board_detect() {
> *"DB120 reference board")
> name="db120"
> ;;
> + *"DHP-1565 rev. A1")
> + name="dhp-1565-a1"
> + ;;
> *"DIR-505 rev. A1")
> name="dir-505-a1"
> ;;
> diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> index 6220f16..3a3d4ee 100755
> --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> @@ -167,6 +167,7 @@ platform_check_image() {
> ap81 | \
> ap83 | \
> ap132 | \
> + dhp-1565-a1 |\
> dir-505-a1 | \
> dir-600-a1 | \
> dir-615-c1 | \
and here
> diff --git a/target/linux/ar71xx/config-3.10 b/target/linux/ar71xx/config-3.10
> index 1b3eddb..3a2b4af 100644
> --- a/target/linux/ar71xx/config-3.10
> +++ b/target/linux/ar71xx/config-3.10
> @@ -40,6 +40,7 @@ CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y
> CONFIG_ATH79_MACH_CAP4200AG=y
> CONFIG_ATH79_MACH_CARAMBOLA2=y
> CONFIG_ATH79_MACH_DB120=y
> +CONFIG_ATH79_MACH_DHP_1565_A1=y
> CONFIG_ATH79_MACH_DIR_505_A1=y
> CONFIG_ATH79_MACH_DIR_600_A1=y
> CONFIG_ATH79_MACH_DIR_615_C1=y
> diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
> b/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
> new file mode 100644
> index 0000000..ae47764
> --- /dev/null
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
> @@ -0,0 +1,170 @@
> +/*
> + * D-Link DHP-1565 rev. A1 board support
> + *
> + * Copyright (C) 2014 Jacek Kikiewicz
> + *
> + * 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/pci.h>
> +#include <linux/phy.h>
> +#include <linux/gpio.h>
> +#include <linux/platform_device.h>
> +#include <linux/ath9k_platform.h>
> +#include <linux/ar8216_platform.h>
> +
> +#include <asm/mach-ath79/ar71xx_regs.h>
> +
> +#include "common.h"
> +#include "dev-ap9x-pci.h"
> +#include "dev-eth.h"
> +#include "dev-gpio-buttons.h"
> +#include "dev-leds-gpio.h"
> +#include "dev-m25p80.h"
> +#include "dev-spi.h"
> +#include "dev-usb.h"
> +#include "dev-wmac.h"
> +#include "machtypes.h"
> +
> +#define DHP1565A1_GPIO_LED_BLUE_USB 11
> +#define DHP1565A1_GPIO_LED_AMBER_POWER 14
> +#define DHP1565A1_GPIO_LED_BLUE_POWER 22
> +#define DHP1565A1_GPIO_LED_BLUE_WPS 15
> +#define DHP1565A1_GPIO_LED_AMBER_PLANET 19
> +#define DHP1565A1_GPIO_LED_BLUE_PLANET 18
> +#define DHP1565A1_GPIO_LED_WLAN_2G 13
> +
> +#define DHP1565A1_GPIO_WAN_LED_ENABLE 20
> +
> +#define DHP1565A1_GPIO_BTN_RESET 17
> +#define DHP1565A1_GPIO_BTN_WPS 16
> +
> +#define DHP1565A1_KEYS_POLL_INTERVAL 20 /* msecs */
> +#define DHP1565A1_KEYS_DEBOUNCE_INTERVAL (3 *
> DHP1565A1_KEYS_POLL_INTERVAL)
> +
> +#define DHP1565A1_MAC0_OFFSET 0xFFA0
> +#define DHP1565A1_MAC1_OFFSET 0xFFB4
> +#define DHP1565A1_WMAC0_OFFSET 0x5
> +#define DHP1565A1_WMAC_CALDATA_OFFSET 0x1000
> +#define DHP1565A1_PCIE_CALDATA_OFFSET 0x5000
> +
> +static struct gpio_led dhp1565a1_leds_gpio[] __initdata = {
> + {
> + .name = "d-link:amber:power",
> + .gpio = DHP1565A1_GPIO_LED_AMBER_POWER,
> + .active_low = 1,
> + },
> + {
> + .name = "d-link:green:power",
> + .gpio = DHP1565A1_GPIO_LED_BLUE_POWER,
> + .active_low = 1,
> + },
> + {
> + .name = "d-link:amber:planet",
> + .gpio = DHP1565A1_GPIO_LED_AMBER_PLANET,
> + .active_low = 1,
> + },
> + {
> + .name = "d-link:green:planet",
> + .gpio = DHP1565A1_GPIO_LED_BLUE_PLANET,
> + .active_low = 1,
> + },
> +};
> +
> +static struct gpio_keys_button dhp1565a1_gpio_keys[] __initdata = {
> + {
> + .desc = "Soft reset",
> + .type = EV_KEY,
> + .code = KEY_RESTART,
> + .debounce_interval = DHP1565A1_KEYS_DEBOUNCE_INTERVAL,
> + .gpio = DHP1565A1_GPIO_BTN_RESET,
> + .active_low = 1,
> + },
> + {
> + .desc = "WPS button",
> + .type = EV_KEY,
> + .code = KEY_WPS_BUTTON,
> + .debounce_interval = DHP1565A1_KEYS_DEBOUNCE_INTERVAL,
> + .gpio = DHP1565A1_GPIO_BTN_WPS,
> + .active_low = 1,
> + },
> +};
> +
> +static struct ar8327_pad_cfg dhp1565a1_ar8327_pad0_cfg = {
> + .mode = AR8327_PAD_MAC_RGMII,
> + .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 dhp1565a1_ar8327_data = {
> + .pad0_cfg = &dhp1565a1_ar8327_pad0_cfg,
> + .port0_cfg = {
> + .force_link = 1,
> + .speed = AR8327_PORT_SPEED_1000,
> + .duplex = 1,
> + .txpause = 1,
> + .rxpause = 1,
> + },
> +};
> +
> +static struct mdio_board_info dhp1565a1_mdio0_info[] = {
> + {
> + .bus_id = "ag71xx-mdio.0",
> + .phy_addr = 0,
> + .platform_data = &dhp1565a1_ar8327_data,
> + },
> +};
> +
> +static void __init dhp1565a1_generic_setup(void)
> +{
> + u8 *mac = (u8 *) KSEG1ADDR(0x1ffe0000);
> + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
> + u8 mac0[ETH_ALEN], mac1[ETH_ALEN];
> + u8 wmac0[ETH_ALEN];
> +
> + ath79_parse_ascii_mac(mac + DHP1565A1_MAC0_OFFSET, mac0);
> + ath79_parse_ascii_mac(mac + DHP1565A1_MAC1_OFFSET, mac1);
> +
> + ath79_register_m25p80(NULL);
> +
> + ath79_register_gpio_keys_polled(-1, DHP1565A1_KEYS_POLL_INTERVAL,
> + ARRAY_SIZE(dhp1565a1_gpio_keys),
> + dhp1565a1_gpio_keys);
> +
> + ath79_init_mac(wmac0, mac0, 0);
> + ath79_register_wmac(art + DHP1565A1_WMAC_CALDATA_OFFSET, wmac0);
> +
> + ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0);
> +
> + mdiobus_register_board_info(dhp1565a1_mdio0_info,
> + ARRAY_SIZE(dhp1565a1_mdio0_info));
> +
> + ath79_register_mdio(0, 0x0);
> +
> + ath79_init_mac(ath79_eth0_data.mac_addr, mac0, 1);
> +
> + /* GMAC0 is connected to an AR8327N 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;
> + ath79_eth0_pll_data.pll_1000 = 0x06000000;
> + ath79_register_eth(0);
> +
> + ath79_register_usb();
> +}
> +
> +static void __init dhp1565a1_setup(void)
> +{
> + ath79_register_leds_gpio(-1, ARRAY_SIZE(dhp1565a1_leds_gpio),
> + dhp1565a1_leds_gpio);
> +
> + dhp1565a1_generic_setup();
> +}
> +
> +MIPS_MACHINE(ATH79_MACH_DHP_1565_A1, "DHP-1565-A1",
> + "D-Link DHP-1565 rev. A1",
> + dhp1565a1_setup);
> diff --git a/target/linux/ar71xx/generic/profiles/d-link.mk
> b/target/linux/ar71xx/generic/profiles/d-link.mk
> index eb721c3..b6eb66c 100644
> --- a/target/linux/ar71xx/generic/profiles/d-link.mk
> +++ b/target/linux/ar71xx/generic/profiles/d-link.mk
> @@ -5,6 +5,17 @@
> # See /LICENSE for more information.
> #
>
> +define Profile/DHP1565A1
> + NAME:=D-Link DHP-1565 rev. A1
> + PACKAGES:=kmod-usb-core kmod-usb2
> +endef
> +
> +define Profile/DHP1565A1/Description
> + Package set optimized for the D-Link DHP-1565 rev. A1.
> +endef
> +
> +$(eval $(call Profile,DHP1565A1))
> +
> define Profile/DIR505A1
> NAME:=D-Link DIR-505 rev. A1
> PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
> diff --git a/target/linux/ar71xx/image/Makefile
> b/target/linux/ar71xx/image/Makefile
> index 3256cb8..7d0c341 100644
> --- a/target/linux/ar71xx/image/Makefile
> +++ b/target/linux/ar71xx/image/Makefile
> @@ -1121,6 +1121,7 @@ $(eval $(call
> SingleProfile,CameoAP121,64kraw-nojffs,TEW712BR,tew-712br,TEW-712B
> $(eval $(call
> SingleProfile,CameoAP121,64kraw-nojffs,DIR601B1,dir-601-b1,TEW-712BR,ttyATH0,115200,"HORNET-RT-DIR601B1-3",2.99.99,""
> "NA"))
> $(eval $(call
> SingleProfile,CameoAP121_8M,64kraw-nojffs,DIR505A1,dir-505-a1,DIR-505-A1,ttyATH0,115200,"HORNET-PACKET-DIR505A1-3",1.99.99,""))
>
> +$(eval $(call
> SingleProfile,CameoDB120,64kraw,DHP1565A1,dhp-1565-a1,DHP-1565-A1,ttyS0,115200,"00DB120AR9344-RT-101214-00"))
> $(eval $(call
> SingleProfile,CameoDB120,64kraw,DIR825C1,dir-825-c1,DIR-825-C1,ttyS0,115200,"00DB120AR9344-RT-101214-00"))
> $(eval $(call
> SingleProfile,CameoDB120,64kraw,DIR835A1,dir-835-a1,DIR-835-A1,ttyS0,115200,"00DB120AR9344-RT-101214-00"))
>
> diff --git
> a/target/linux/ar71xx/patches-3.10/730-MIPS-ath79-add-DHP-1565A1.patch
> b/target/linux/ar71xx/patches-3.10/730-MIPS-ath79-add-DHP-1565A1.patch
> new file mode 100644
> index 0000000..6ca0595
> --- /dev/null
> +++ b/target/linux/ar71xx/patches-3.10/730-MIPS-ath79-add-DHP-1565A1.patch
> @@ -0,0 +1,40 @@
> +--- a/arch/mips/ath79/machtypes.h
> ++++ b/arch/mips/ath79/machtypes.h
> +@@ -39,6 +39,7 @@
> + ATH79_MACH_CARAMBOLA2, /* 8devices Carambola2 */
> + ATH79_MACH_DB120, /* Atheros DB120 reference board */
> + ATH79_MACH_PB44, /* Atheros PB44 reference board */
> ++ ATH79_MACH_DHP_1565_A1, /* D-Link DHP-1565 rev. A1 */
> + ATH79_MACH_DIR_505_A1, /* D-Link DIR-505 rev. A1 */
> + ATH79_MACH_DIR_600_A1, /* D-Link DIR-600 rev. A1 */
> + ATH79_MACH_DIR_615_C1, /* D-Link DIR-615 rev. C1 */
> +--- a/arch/mips/ath79/Kconfig
> ++++ b/arch/mips/ath79/Kconfig
> +@@ -283,6 +283,17 @@
> + select ATH79_DEV_USB
> + select MYLOADER
> +
> ++config ATH79_MACH_DHP_1565_A1
> ++ bool "D-Link DHP-1565 rev. A1 board support"
> ++ select SOC_AR934X
> ++ select ATH79_DEV_AP9X_PCI if PCI
> ++ 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_DIR_505_A1
> + bool "D-Link DIR-505-A1 support"
> + select SOC_AR933X
> +--- a/arch/mips/ath79/Makefile
> ++++ b/arch/mips/ath79/Makefile
> +@@ -54,6 +54,7 @@
> + obj-$(CONFIG_ATH79_MACH_BHU_BXU2000N2_A)+= mach-bhu-bxu2000n2-a.o
> + obj-$(CONFIG_ATH79_MACH_CAP4200AG) += mach-cap4200ag.o
> + obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o
> ++obj-$(CONFIG_ATH79_MACH_DHP_1565_A1) += mach-dhp-1565-a1.o
> + obj-$(CONFIG_ATH79_MACH_DIR_505_A1) += mach-dir-505-a1.o
> + obj-$(CONFIG_ATH79_MACH_DIR_600_A1) += mach-dir-600-a1.o
> + obj-$(CONFIG_ATH79_MACH_DIR_615_C1) += mach-dir-615-c1.o
>
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
