[OpenWrt-Devel] [PATCH] [SIGNED-OFF] Add WeIO board (http://we-io.net) profile. This patch adds support for WeIO board, which is based on Carambola2 board from 8Devices.
Drasko DRASKOVIC
drasko.draskovic at gmail.com
Tue Sep 8 14:07:48 EDT 2015
Hi Karl,
corrected patch re-sent.
My comments below.
BR,
Drasko
On Sat, Aug 8, 2015 at 3:03 AM, Karl Palsson <karlp at tweak.net.au> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Comments inline...
>
> Drasko DRASKOVIC <drasko.draskovic at gmail.com> wrote:
>> Signed-off-by: Drasko DRASKOVIC <drasko.draskovic at gmail.com>
>> ---
>
>
> Might just be my mail client, but might be yours, did you change
> anything to send this? you seem to have lost all the commit message up
> into the subject?
Actually, I use `git send-email` directly, exactly to avoid problems
with different mail clients. All my patches are send via git.
>
>
>> target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +
>> .../ar71xx/base-files/lib/upgrade/platform.sh | 3 +-
>> target/linux/ar71xx/config-4.1 | 1 +
>> .../linux/ar71xx/files/arch/mips/ath79/mach-weio.c | 146 +++++++++++++++++++++
>> target/linux/ar71xx/generic/profiles/weio.mk | 17 +++
>> target/linux/ar71xx/image/Makefile | 8 ++
>> .../700-MIPS-ath79-openwrt-machines.patch | 21 ++-
>> 7 files changed, 193 insertions(+), 6 deletions(-)
>> create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-weio.c
>> create mode 100644 target/linux/ar71xx/generic/profiles/weio.mk
>>
>> diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
>> b/target/linux/ar71xx/base-files/lib/ar71xx.sh
>> index 256bd10..80af14b 100755
>> --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
>> +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
>> @@ -823,6 +823,9 @@ ar71xx_board_detect() {
>> *"UniFi AP Pro")
>> name="uap-pro"
>> ;;
>> + *"WeIO")
>> + name="weio"
>> + ;;
>> *WHR-G301N)
>> name="whr-g301n"
>> ;;
>> diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
>> b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
>> index 76d8c5b..57df672 100755
>> --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
>> +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
>> @@ -250,7 +250,8 @@ platform_check_image() {
>> nbg460n_550n_550nh | \
>> unifi | \
>> unifi-outdoor | \
>> - carambola2 )
>> + carambola2 | \
>> + weio )
>> [ "$magic" != "2705" ] && {
>> echo "Invalid image type."
>> return 1
>> diff --git a/target/linux/ar71xx/config-4.1
>> b/target/linux/ar71xx/config-4.1
>> index 1e31a01..0f80804 100644
>> --- a/target/linux/ar71xx/config-4.1
>> +++ b/target/linux/ar71xx/config-4.1
>> @@ -137,6 +137,7 @@ CONFIG_ATH79_MACH_TL_WR941ND=y
>> CONFIG_ATH79_MACH_TUBE2H=y
>> CONFIG_ATH79_MACH_UBNT=y
>> CONFIG_ATH79_MACH_UBNT_XM=y
>> +CONFIG_ATH79_MACH_WEIO=y
>> CONFIG_ATH79_MACH_WHR_HP_G300N=y
>> CONFIG_ATH79_MACH_WLAE_AG300N=y
>> CONFIG_ATH79_MACH_WLR8100=y
>> diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-weio.c
>> b/target/linux/ar71xx/files/arch/mips/ath79/mach-weio.c
>> new file mode 100644
>> index 0000000..5c707ec
>> --- /dev/null
>> +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-weio.c
>> @@ -0,0 +1,146 @@
>> +/**
>> + * WEIO Web Of Things Platform
>> + *
>> + * Copyright (C) 2013 Drasko DRASKOVIC and Uros PETREVSKI
>> + *
>> + * ## ## ######## #### #######
>> + * ## ## ## ## ## ## ##
>> + * ## ## ## ## ## ## ##
>> + * ## ## ## ###### ## ## ##
>> + * ## ## ## ## ## ## ##
>> + * ## ## ## ## ## ## ##
>> + * ### ### ######## #### #######
>> + *
>> + * Web Of Things Platform
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License
>> + * as published by the Free Software Foundation; either version 2
>> + * of the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>> + *
>> + * Authors :
>> + * Drasko DRASKOVIC <drasko.draskovic at gmail.com>
>> + * Uros PETREVSKI <uros at nodesign.net>
>> + */
>> +
>> +#include <asm/mach-ath79/ath79.h>
>> +#include <asm/mach-ath79/ar71xx_regs.h>
>> +#include "common.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"
>> +#include "linux/i2c-gpio.h"
>> +#include "linux/platform_device.h"
>> +
>> +#define WEIO_GPIO_LED_STA 1
>> +#define WEIO_GPIO_LED_AP 16
>> +//#define WEIO_GPIO_LED_ETH0 13
>
> It's good that you've removed the commented out ethernet code in the
> other part of this file, so why is this still left here?
Removed!
>
>> +
>> +#define WEIO_GPIO_BTN_AP 20
>> +#define WEIO_GPIO_BTN_RESET 23
>> +
>> +#define WEIO_KEYS_POLL_INTERVAL 20 /* msecs */
>> +#define WEIO_KEYS_DEBOUNCE_INTERVAL (3 * WEIO_KEYS_POLL_INTERVAL)
>> +
>> +#define WEIO_MAC0_OFFSET 0x0000
>> +#define WEIO_MAC1_OFFSET 0x0006
>> +#define WEIO_CALDATA_OFFSET 0x1000
>> +#define WEIO_WMAC_MAC_OFFSET 0x1002
>> +
>> +static struct gpio_led weio_leds_gpio[] __initdata = {
>> + {
>> + .name = "weio:green:sta",
>> + .gpio = WEIO_GPIO_LED_STA,
>> + .active_low = 1,
>> + .default_state = LEDS_GPIO_DEFSTATE_ON,
>> + }, {
>> + .name = "weio:green:ap",
>> + .gpio = WEIO_GPIO_LED_AP,
>> + .active_low = 1,
>> + .default_state = LEDS_GPIO_DEFSTATE_ON,
>> + }
>> +};
>> +
>> +static struct gpio_keys_button weio_gpio_keys[] __initdata = {
>> + {
>> + .desc = "ap button",
>> + .type = EV_KEY,
>> + .code = BTN_0,
>> + .debounce_interval = WEIO_KEYS_DEBOUNCE_INTERVAL,
>> + .gpio = WEIO_GPIO_BTN_AP,
>> + .active_low = 1,
>> + },
>> + {
>> + .desc = "soft-reset button",
>> + .type = EV_KEY,
>> + .code = BTN_1,
>> + .debounce_interval = WEIO_KEYS_DEBOUNCE_INTERVAL,
>> + .gpio = WEIO_GPIO_BTN_RESET,
>> + .active_low = 1,
>> + }
>> +};
>> +
>> +static struct i2c_gpio_platform_data weio_i2c_gpio_data = {
>> + .sda_pin = 18,
>> + .scl_pin = 19,
>> +};
>> +
>> +static struct platform_device weio_i2c_gpio = {
>> + .name = "i2c-gpio",
>> + .id = 0,
>> + .dev = {
>> + .platform_data = &weio_i2c_gpio_data,
>> + },
>> +};
>> +
>> +static struct platform_device *weio_devices[] __initdata = {
>> + &weio_i2c_gpio
>> +};
>> +
>> +static void __init weio_common_setup(void)
>> +{
>> + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
>> +
>> + ath79_register_m25p80(NULL);
>> + ath79_register_wmac(art + WEIO_CALDATA_OFFSET,
>> + art + WEIO_WMAC_MAC_OFFSET);
>> +}
>
> It looks like the whitespace in those structs is all of mixed style?
Should be OK now. Please do not hold the patch because of white
spaces, this one is pretty difficult to rebase every time because of
target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch
that must be dealt qith quilt every time, which is pretty tedious.
BR,
Drasko
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list