diff options
14 files changed, 150 insertions, 1 deletions
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index d02b1e0b4..32c97fce4 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -59,6 +59,7 @@ case "$FIRMWARE" in all5002 | \ argus-atp52b | \ bc2 | \ + broadway | \ carambola | \ dir-615-h1 | \ dir-620-a1 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds b/target/linux/ramips/base-files/etc/uci-defaults/leds index 81d9c44ea..e444db7ce 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/leds @@ -28,6 +28,10 @@ case $board in bc2) set_usb_led "bc2:blue:usb" ;; + broadway) + set_usb_led "red:diskmounted" + set_wifi_led "red:wps_active" + ;; dir-300-b1|\ dir-600-b1|\ dir-600-b2|\ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network index dff0fd66f..5d49923bb 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ b/target/linux/ramips/base-files/etc/uci-defaults/network @@ -43,7 +43,8 @@ ramips_setup_interfaces() case $board in all0256n | \ - all5002) + all5002 | \ + broadway) ucidef_set_interface_lan "eth0" ;; @@ -141,6 +142,7 @@ ramips_setup_macs() 3g-6200n | \ argus-atp52b | \ bc2 | \ + broadway | \ f5d8235-v1 | \ nw718 | \ psr-680w | \ diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 379f74dd5..b04ec7744 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -13,6 +13,7 @@ preinit_set_mac_address() { ifconfig eth0 hw ether $mac 2>/dev/null ;; bc2 |\ + broadway |\ dir-620-a1 |\ esr-9753 |\ freestation5 |\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index abefdc520..2d8a7e65d 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -110,6 +110,9 @@ ramips_board_name() { *"F5D8235 v2") name="f5d8235-v2" ;; + *"Hauppauge Broadway") + name="broadway" + ;; *"La Fonera 2.0N") name="fonera20n" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 1acbbffa4..2ec4749f9 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -19,6 +19,7 @@ platform_check_image() { all0256n | \ all5002 | \ bc2 | \ + broadway | \ carambola | \ dir-300-b1 | \ dir-600-b1 | \ diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h index d71bd1c02..f8dbcbc25 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h @@ -39,6 +39,7 @@ enum ramips_mach_type { RAMIPS_MACH_ALL0239_3G, /* ALL0239-3G */ RAMIPS_MACH_ARGUS_ATP52B, /* Argus ATP-52B */ RAMIPS_MACH_BC2, /* NexAira BC2 */ + RAMIPS_MACH_BROADWAY, /* Hauppauge Broadway */ RAMIPS_MACH_DAP_1350, /* D-Link DAP-1350 */ RAMIPS_MACH_ESR_9753, /* Senao / EnGenius ESR-9753*/ RAMIPS_MACH_F5D8235_V2, /* Belkin F5D8235 v2 */ diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig b/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig index 562bea6af..769603dc8 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig @@ -91,6 +91,11 @@ config RT305X_MACH_ESR_9753 select RALINK_DEV_GPIO_BUTTONS select RALINK_DEV_GPIO_LEDS +config RT305X_MACH_BROADWAY + bool "Hauppauge Broadway support" + select RALINK_DEV_GPIO_BUTTONS + select RALINK_DEV_GPIO_LEDS + config RT305X_MACH_FONERA20N bool "La Fonera20N board support" select RALINK_DEV_GPIO_BUTTONS diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile b/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile index 2cf25a152..c61fba88c 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_RT305X_MACH_ARGUS_ATP52B) += mach-argus-atp52b.o obj-$(CONFIG_RT305X_MACH_BC2) += mach-bc2.o obj-$(CONFIG_RT305X_MACH_ALL0256N) += mach-all0256n.o obj-$(CONFIG_RT305X_MACH_ALL5002) += mach-all5002.o +obj-$(CONFIG_RT305X_MACH_BROADWAY) += mach-broadway.o obj-$(CONFIG_RT305X_MACH_CARAMBOLA) += mach-carambola.o obj-$(CONFIG_RT305X_MACH_DIR_300_REVB) += mach-dir-300-revb.o obj-$(CONFIG_RT305X_MACH_DIR_615_H1) += mach-dir-615-h1.o diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-broadway.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-broadway.c new file mode 100644 index 000000000..74dfaa30b --- /dev/null +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-broadway.c @@ -0,0 +1,87 @@ +/* + * Hauppauge/PCTV Broadway Support + * + * Copyright (C) 2012 Devin Heitmueller <dheitmueller@kernellabs.com> + * + * 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/init.h> +#include <linux/platform_device.h> + +#include <asm/mach-ralink/machine.h> +#include <asm/mach-ralink/dev-gpio-buttons.h> +#include <asm/mach-ralink/dev-gpio-leds.h> +#include <asm/mach-ralink/rt305x.h> +#include <asm/mach-ralink/rt305x_regs.h> + +#include "devices.h" + +#define BROADWAY_GPIO_LED_DISKMOUNT 9 +#define BROADWAY_GPIO_LED_WPS 14 + +#define BROADWAY_GPIO_BUTTON_WPS 0 +#define BROADWAY_GPIO_BUTTON_FACTORYRESET 13 + +#define BROADWAY_KEYS_POLL_INTERVAL 20 +#define BROADWAY_KEYS_DEBOUNCE_INTERVAL (3 * BROADWAY_KEYS_POLL_INTERVAL) + +static struct gpio_led broadway_leds_gpio[] __initdata = { + { + .name = "red:diskmounted", + .gpio = BROADWAY_GPIO_LED_DISKMOUNT, + .active_low = 1, + }, + { + .name = "red:wps_active", + .gpio = BROADWAY_GPIO_LED_WPS, + .active_low = 1, + }, +}; + +static struct gpio_keys_button broadway_gpio_buttons[] __initdata = { + { + .desc = "Factory Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = BROADWAY_KEYS_DEBOUNCE_INTERVAL, + .gpio = BROADWAY_GPIO_BUTTON_FACTORYRESET, + .active_low = 1, + }, +#ifdef DJH_WPS_BUTTON_NOT_WIRED_TO_GPIO + { + .desc = "WPS button", + .type = EV_KEY, + .code = KEY_WPS_BUTTON, + .debounce_interval = BROADWAY_KEYS_DEBOUNCE_INTERVAL, + .gpio = BROADWAY_GPIO_BUTTON_WPS, + .active_low = 1, + }, +#endif +}; + +static void __init broadway_init(void) +{ + rt305x_gpio_init((RT305X_GPIO_MODE_GPIO << + RT305X_GPIO_MODE_UART0_SHIFT)); + + rt305x_register_flash(0); + + rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_WLLLL; + rt305x_register_ethernet(); + + ramips_register_gpio_leds(-1, ARRAY_SIZE(broadway_leds_gpio), + broadway_leds_gpio); + ramips_register_gpio_buttons(-1, BROADWAY_KEYS_POLL_INTERVAL, + ARRAY_SIZE(broadway_gpio_buttons), + broadway_gpio_buttons); + + rt305x_register_wifi(); + rt305x_register_wdt(); + rt305x_register_usb(); +} + +MIPS_MACHINE(RAMIPS_MACH_BROADWAY, "BROADWAY", "Hauppauge Broadway", + broadway_init); diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 585eeac3f..e7f78c9df 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -162,6 +162,22 @@ define BuildFirmware/ARGUS_ATP52B $(call BuildFirmware/Generic,$(1),$(2),board=$(3) $(call mkmtd/phys,$(mtdlayout_argus_atp52b)),$(mtd_argus_atp52b_kernel_part_size),$(mtd_argus_atp52b_rootfs_part_size)) endef +# djh - Note all of these are marked Read-Only for now +mtdlayout_broadway=192k(bootloader)ro,64k(config)ro,64k(factory)ro,1024k(kernel)ro,6720k(rootfs),7744k@0x50000(firmware) +mtd_broadway_kernel_part_size=1048576 +mtd_broadway_rootfs_part_size=6881280 +define BuildFirmware/BROADWAY + $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)) $(call mkmtd/$(6),$(mtdlayout_broadway)),$(mtd_broadway_kernel_part_size),$(mtd_broadway_rootfs_part_size)) + mkimage -A mips -O linux -T kernel -C lzma $(call kernel_entry)\ + -n 'Broadway Kernel Image' \ + -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage + $(call CatFiles,$(KDIR)/vmlinux-$(2).uImage,$(mtd_broadway_kernel_part_size),$(KDIR)/root.$(1),$(mtd_broadway_rootfs_part_size),$(call imgname,$(1),$(2))-factory.bin) +endef + +define BuildFirmware/BROADWAY/initramfs + $(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)) $(call mkmtd/$(6),$(mtdlayout_broadway))) +endef + define BuildFirmware/Buffalo $(call MkImageLzma,$(2),$(3)) $(call Sysupgrade/KRuImage,$(1),$(2),$(4),$(5)) @@ -461,6 +477,10 @@ define Image/Build/Profile/BC2 $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,bc2,BC2,ttyS1,57600,phys) endef +define Image/Build/Profile/BROADWAY + $(call Image/Build/Template/$(fs_squash)/$(1),BROADWAY,broadway,BROADWAY,ttyS1,57600,phys) +endef + define Image/Build/Profile/CARAMBOLA $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,carambola,CARAMBOLA,ttyS1,115200,phys) endef @@ -604,6 +624,7 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/ALL5002,$(1)) $(call Image/Build/Profile/ARGUS_ATP52B,$(1)) $(call Image/Build/Profile/BC2,$(1)) + $(call Image/Build/Profile/BROADWAY,$(1)) $(call Image/Build/Profile/CARAMBOLA,$(1)) $(call Image/Build/Profile/DIR300B1,$(1)) $(call Image/Build/Profile/DIR615H1,$(1)) diff --git a/target/linux/ramips/rt305x/config-3.3 b/target/linux/ramips/rt305x/config-3.3 index 7b6bafdf1..8105b0fa6 100644 --- a/target/linux/ramips/rt305x/config-3.3 +++ b/target/linux/ramips/rt305x/config-3.3 @@ -91,6 +91,7 @@ CONFIG_RT305X_MACH_ALL0256N=y CONFIG_RT305X_MACH_ALL5002=y CONFIG_RT305X_MACH_ARGUS_ATP52B=y CONFIG_RT305X_MACH_BC2=y +CONFIG_RT305X_MACH_BROADWAY=y CONFIG_RT305X_MACH_CARAMBOLA=y CONFIG_RT305X_MACH_DAP_1350=y CONFIG_RT305X_MACH_DIR_300_REVB=y diff --git a/target/linux/ramips/rt305x/config-3.6 b/target/linux/ramips/rt305x/config-3.6 index 86361af9e..1971c2ac3 100644 --- a/target/linux/ramips/rt305x/config-3.6 +++ b/target/linux/ramips/rt305x/config-3.6 @@ -43,6 +43,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_CLK=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_ATTRS=y @@ -96,6 +97,7 @@ CONFIG_RT305X_MACH_ALL0256N=y CONFIG_RT305X_MACH_ALL5002=y CONFIG_RT305X_MACH_ARGUS_ATP52B=y CONFIG_RT305X_MACH_BC2=y +CONFIG_RT305X_MACH_BROADWAY=y CONFIG_RT305X_MACH_CARAMBOLA=y CONFIG_RT305X_MACH_DAP_1350=y CONFIG_RT305X_MACH_DIR_300_REVB=y diff --git a/target/linux/ramips/rt305x/profiles/broadway.mk b/target/linux/ramips/rt305x/profiles/broadway.mk new file mode 100644 index 000000000..8e994bdb8 --- /dev/null +++ b/target/linux/ramips/rt305x/profiles/broadway.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/BROADWAY + NAME:=Hauppauge Broadway + PACKAGES:=\ + kmod-usb-core kmod-usb-rt305x-dwc_otg \ + kmod-ledtrig-usbdev restorefactory +endef + +define Profile/BROADWAY/Description + Package set for Hauppauge Broadway +endef + +$(eval $(call Profile,BROADWAY)) |