* [PATCH 01/18] MIPS: add initial support for the Atheros AR71XX/AR724X/AR931X SoCs
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 02/18] MIPS: ath79: add GPIOLIB support Gabor Juhos
` (17 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
This patch adds initial support for various Atheros SoCs based on the
MIPS 24Kc core. The following models are supported at the moment:
- AR7130
- AR7141
- AR7161
- AR9130
- AR9132
- AR7240
- AR7241
- AR7242
The current patch contains minimal support only, but the resulting
kernel can boot into user-space with using of an initramfs image on
various boards which are using these SoCs. Support for more built-in
devices and individual boards will be implemented in further patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
Changes since RFC:
- the ATH79_DEV_UART Kconfig option is removed, and the URT platform
code has been moved into dev-common[ch]
arch/mips/Kbuild.platforms | 1 +
arch/mips/Kconfig | 15 ++
arch/mips/ath79/Kconfig | 12 +
arch/mips/ath79/Makefile | 18 ++
arch/mips/ath79/Platform | 7 +
arch/mips/ath79/common.c | 113 +++++++++
arch/mips/ath79/common.h | 62 +++++
arch/mips/ath79/dev-common.c | 59 +++++
arch/mips/ath79/dev-common.h | 17 ++
arch/mips/ath79/early_printk.c | 36 +++
arch/mips/ath79/irq.c | 187 ++++++++++++++
arch/mips/ath79/prom.c | 57 +++++
arch/mips/ath79/setup.c | 263 ++++++++++++++++++++
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 207 +++++++++++++++
arch/mips/include/asm/mach-ath79/ath79.h | 50 ++++
.../include/asm/mach-ath79/cpu-feature-overrides.h | 56 ++++
arch/mips/include/asm/mach-ath79/irq.h | 36 +++
.../include/asm/mach-ath79/kernel-entry-init.h | 32 +++
arch/mips/include/asm/mach-ath79/war.h | 25 ++
19 files changed, 1253 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/ath79/Kconfig
create mode 100644 arch/mips/ath79/Makefile
create mode 100644 arch/mips/ath79/Platform
create mode 100644 arch/mips/ath79/common.c
create mode 100644 arch/mips/ath79/common.h
create mode 100644 arch/mips/ath79/dev-common.c
create mode 100644 arch/mips/ath79/dev-common.h
create mode 100644 arch/mips/ath79/early_printk.c
create mode 100644 arch/mips/ath79/irq.c
create mode 100644 arch/mips/ath79/prom.c
create mode 100644 arch/mips/ath79/setup.c
create mode 100644 arch/mips/include/asm/mach-ath79/ar71xx_regs.h
create mode 100644 arch/mips/include/asm/mach-ath79/ath79.h
create mode 100644 arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
create mode 100644 arch/mips/include/asm/mach-ath79/irq.h
create mode 100644 arch/mips/include/asm/mach-ath79/kernel-entry-init.h
create mode 100644 arch/mips/include/asm/mach-ath79/war.h
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 78439b8..7ff9b54 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -2,6 +2,7 @@
platforms += alchemy
platforms += ar7
+platforms += ath79
platforms += bcm47xx
platforms += bcm63xx
platforms += cavium-octeon
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7fc6bd1..50d4f5d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -65,6 +65,20 @@ config AR7
Support for the Texas Instruments AR7 System-on-a-Chip
family: TNETD7100, 7200 and 7300.
+config ATH79
+ bool "Atheros AR71XX/AR724X/AR913X based boards"
+ select BOOT_RAW
+ select CEVT_R4K
+ select CSRC_R4K
+ select DMA_NONCOHERENT
+ select IRQ_CPU
+ select SYS_HAS_CPU_MIPS32_R2
+ select SYS_HAS_EARLY_PRINTK
+ select SYS_SUPPORTS_32BIT_KERNEL
+ select SYS_SUPPORTS_BIG_ENDIAN
+ help
+ Support for the Atheros AR71XX/AR724X/AR913X SoCs.
+
config BCM47XX
bool "Broadcom BCM47XX based boards"
select CEVT_R4K
@@ -717,6 +731,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
endchoice
source "arch/mips/alchemy/Kconfig"
+source "arch/mips/ath79/Kconfig"
source "arch/mips/bcm63xx/Kconfig"
source "arch/mips/jazz/Kconfig"
source "arch/mips/jz4740/Kconfig"
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
new file mode 100644
index 0000000..50b9334
--- /dev/null
+++ b/arch/mips/ath79/Kconfig
@@ -0,0 +1,12 @@
+if ATH79
+
+config SOC_AR71XX
+ def_bool n
+
+config SOC_AR724X
+ def_bool n
+
+config SOC_AR913X
+ def_bool n
+
+endif
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
new file mode 100644
index 0000000..b4ec9c2
--- /dev/null
+++ b/arch/mips/ath79/Makefile
@@ -0,0 +1,18 @@
+#
+# Makefile for the Atheros AR71XX/AR724X/AR913X specific parts of the kernel
+#
+# Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+# Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+#
+# 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.
+
+obj-y := prom.o setup.o irq.o common.o
+
+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+
+#
+# Devices
+#
+obj-y += dev-common.o
diff --git a/arch/mips/ath79/Platform b/arch/mips/ath79/Platform
new file mode 100644
index 0000000..2bd6636
--- /dev/null
+++ b/arch/mips/ath79/Platform
@@ -0,0 +1,7 @@
+#
+# Atheros AR71xx/AR724x/AR913x
+#
+
+platform-$(CONFIG_ATH79) += ath79/
+cflags-$(CONFIG_ATH79) += -I$(srctree)/arch/mips/include/asm/mach-ath79
+load-$(CONFIG_ATH79) = 0xffffffff80060000
diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c
new file mode 100644
index 0000000..b6eaaf5
--- /dev/null
+++ b/arch/mips/ath79/common.c
@@ -0,0 +1,113 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X common routines
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/spinlock.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include "common.h"
+
+static DEFINE_SPINLOCK(ath79_device_lock);
+
+u32 ath79_cpu_freq;
+EXPORT_SYMBOL_GPL(ath79_cpu_freq);
+
+u32 ath79_ahb_freq;
+EXPORT_SYMBOL_GPL(ath79_ahb_freq);
+
+u32 ath79_ddr_freq;
+EXPORT_SYMBOL_GPL(ath79_ddr_freq);
+
+enum ath79_soc_type ath79_soc;
+
+void __iomem *ath79_pll_base;
+void __iomem *ath79_reset_base;
+EXPORT_SYMBOL_GPL(ath79_reset_base);
+void __iomem *ath79_ddr_base;
+
+void ath79_ddr_wb_flush(u32 reg)
+{
+ void __iomem *flush_reg = ath79_ddr_base + reg;
+
+ /* Flush the DDR write buffer. */
+ __raw_writel(0x1, flush_reg);
+ while (__raw_readl(flush_reg) & 0x1)
+ ;
+
+ /* It must be run twice. */
+ __raw_writel(0x1, flush_reg);
+ while (__raw_readl(flush_reg) & 0x1)
+ ;
+}
+EXPORT_SYMBOL_GPL(ath79_ddr_wb_flush);
+
+void ath79_device_stop(u32 mask)
+{
+ unsigned long flags;
+ u32 mask_inv;
+ u32 t;
+
+ if (soc_is_ar71xx()) {
+ spin_lock_irqsave(&ath79_device_lock, flags);
+ t = ath79_reset_rr(AR71XX_RESET_REG_RESET_MODULE);
+ ath79_reset_wr(AR71XX_RESET_REG_RESET_MODULE, t | mask);
+ spin_unlock_irqrestore(&ath79_device_lock, flags);
+ } else if (soc_is_ar724x()) {
+ mask_inv = mask & AR724X_RESET_OHCI_DLL;
+ spin_lock_irqsave(&ath79_device_lock, flags);
+ t = ath79_reset_rr(AR724X_RESET_REG_RESET_MODULE);
+ t |= mask;
+ t &= ~mask_inv;
+ ath79_reset_wr(AR724X_RESET_REG_RESET_MODULE, t);
+ spin_unlock_irqrestore(&ath79_device_lock, flags);
+ } else if (soc_is_ar913x()) {
+ spin_lock_irqsave(&ath79_device_lock, flags);
+ t = ath79_reset_rr(AR913X_RESET_REG_RESET_MODULE);
+ ath79_reset_wr(AR913X_RESET_REG_RESET_MODULE, t | mask);
+ spin_unlock_irqrestore(&ath79_device_lock, flags);
+ } else {
+ BUG();
+ }
+}
+EXPORT_SYMBOL_GPL(ath79_device_stop);
+
+void ath79_device_start(u32 mask)
+{
+ unsigned long flags;
+ u32 mask_inv;
+ u32 t;
+
+ if (soc_is_ar71xx()) {
+ spin_lock_irqsave(&ath79_device_lock, flags);
+ t = ath79_reset_rr(AR71XX_RESET_REG_RESET_MODULE);
+ ath79_reset_wr(AR71XX_RESET_REG_RESET_MODULE, t & ~mask);
+ spin_unlock_irqrestore(&ath79_device_lock, flags);
+ } else if (soc_is_ar724x()) {
+ mask_inv = mask & AR724X_RESET_OHCI_DLL;
+ spin_lock_irqsave(&ath79_device_lock, flags);
+ t = ath79_reset_rr(AR724X_RESET_REG_RESET_MODULE);
+ t &= ~mask;
+ t |= mask_inv;
+ ath79_reset_wr(AR724X_RESET_REG_RESET_MODULE, t);
+ spin_unlock_irqrestore(&ath79_device_lock, flags);
+ } else if (soc_is_ar913x()) {
+ spin_lock_irqsave(&ath79_device_lock, flags);
+ t = ath79_reset_rr(AR913X_RESET_REG_RESET_MODULE);
+ ath79_reset_wr(AR913X_RESET_REG_RESET_MODULE, t & ~mask);
+ spin_unlock_irqrestore(&ath79_device_lock, flags);
+ } else {
+ BUG();
+ }
+}
+EXPORT_SYMBOL_GPL(ath79_device_start);
diff --git a/arch/mips/ath79/common.h b/arch/mips/ath79/common.h
new file mode 100644
index 0000000..62d7503
--- /dev/null
+++ b/arch/mips/ath79/common.h
@@ -0,0 +1,62 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X common definitions
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ *
+ * 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.
+ */
+
+#ifndef __ATH79_COMMON_H
+#define __ATH79_COMMON_H
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/bitops.h>
+
+#define ATH79_MEM_SIZE_MIN (2 * 1024 * 1024)
+#define ATH79_MEM_SIZE_MAX (128 * 1024 * 1024)
+
+extern void __iomem *ath79_ddr_base;
+void ath79_ddr_wb_flush(unsigned int reg);
+
+enum ath79_soc_type {
+ ATH79_SOC_UNKNOWN,
+ ATH79_SOC_AR7130,
+ ATH79_SOC_AR7141,
+ ATH79_SOC_AR7161,
+ ATH79_SOC_AR7240,
+ ATH79_SOC_AR7241,
+ ATH79_SOC_AR7242,
+ ATH79_SOC_AR9130,
+ ATH79_SOC_AR9132
+};
+
+extern enum ath79_soc_type ath79_soc;
+
+static inline int soc_is_ar71xx(void)
+{
+ return (ath79_soc == ATH79_SOC_AR7130 ||
+ ath79_soc == ATH79_SOC_AR7141 ||
+ ath79_soc == ATH79_SOC_AR7161);
+}
+
+static inline int soc_is_ar724x(void)
+{
+ return (ath79_soc == ATH79_SOC_AR7240 ||
+ ath79_soc == ATH79_SOC_AR7241 ||
+ ath79_soc == ATH79_SOC_AR7242);
+}
+
+static inline int soc_is_ar913x(void)
+{
+ return (ath79_soc == ATH79_SOC_AR9130 ||
+ ath79_soc == ATH79_SOC_AR9132);
+}
+
+#endif /* __ATH79_COMMON_H */
diff --git a/arch/mips/ath79/dev-common.c b/arch/mips/ath79/dev-common.c
new file mode 100644
index 0000000..897522c
--- /dev/null
+++ b/arch/mips/ath79/dev-common.c
@@ -0,0 +1,59 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X common devices
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/serial_8250.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include "common.h"
+#include "dev-common.h"
+
+static struct resource ath79_uart_resources[] = {
+ {
+ .start = AR71XX_UART_BASE,
+ .end = AR71XX_UART_BASE + AR71XX_UART_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+#define AR71XX_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
+static struct plat_serial8250_port ath79_uart_data[] = {
+ {
+ .mapbase = AR71XX_UART_BASE,
+ .irq = ATH79_MISC_IRQ_UART,
+ .flags = AR71XX_UART_FLAGS,
+ .iotype = UPIO_MEM32,
+ .regshift = 2,
+ }, {
+ /* terminating entry */
+ }
+};
+
+static struct platform_device ath79_uart_device = {
+ .name = "serial8250",
+ .id = PLAT8250_DEV_PLATFORM,
+ .resource = ath79_uart_resources,
+ .num_resources = ARRAY_SIZE(ath79_uart_resources),
+ .dev = {
+ .platform_data = ath79_uart_data
+ },
+};
+
+void __init ath79_register_uart(void)
+{
+ ath79_uart_data[0].uartclk = ath79_ahb_freq;
+ platform_device_register(&ath79_uart_device);
+}
diff --git a/arch/mips/ath79/dev-common.h b/arch/mips/ath79/dev-common.h
new file mode 100644
index 0000000..1cec894
--- /dev/null
+++ b/arch/mips/ath79/dev-common.h
@@ -0,0 +1,17 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X common devices
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_DEV_COMMON_H
+#define _ATH79_DEV_COMMON_H
+
+void ath79_register_uart(void) __init;
+
+#endif /* _ATH79_DEV_COMMON_H */
diff --git a/arch/mips/ath79/early_printk.c b/arch/mips/ath79/early_printk.c
new file mode 100644
index 0000000..7499b0e
--- /dev/null
+++ b/arch/mips/ath79/early_printk.c
@@ -0,0 +1,36 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X SoC early printk support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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/io.h>
+#include <linux/serial_reg.h>
+#include <asm/addrspace.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+static inline void prom_wait_thre(void __iomem *base)
+{
+ u32 lsr;
+
+ do {
+ lsr = __raw_readl(base + UART_LSR * 4);
+ if (lsr & UART_LSR_THRE)
+ break;
+ } while (1);
+}
+
+void prom_putchar(unsigned char ch)
+{
+ void __iomem *base = (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE));
+
+ prom_wait_thre(base);
+ __raw_writel(ch, base + UART_TX * 4);
+ prom_wait_thre(base);
+}
diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c
new file mode 100644
index 0000000..1bf7f71
--- /dev/null
+++ b/arch/mips/ath79/irq.c
@@ -0,0 +1,187 @@
+/*
+ * Atheros AR71xx/AR724x/AR913x specific interrupt handling
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+
+#include <asm/irq_cpu.h>
+#include <asm/mipsregs.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include "common.h"
+
+static unsigned int ath79_ip2_flush_reg;
+static unsigned int ath79_ip3_flush_reg;
+
+static void ath79_misc_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+ void __iomem *base = ath79_reset_base;
+ u32 pending;
+
+ pending = __raw_readl(base + AR71XX_RESET_REG_MISC_INT_STATUS) &
+ __raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);
+
+ if (pending & MISC_INT_UART)
+ generic_handle_irq(ATH79_MISC_IRQ_UART);
+
+ else if (pending & MISC_INT_DMA)
+ generic_handle_irq(ATH79_MISC_IRQ_DMA);
+
+ else if (pending & MISC_INT_PERFC)
+ generic_handle_irq(ATH79_MISC_IRQ_PERFC);
+
+ else if (pending & MISC_INT_TIMER)
+ generic_handle_irq(ATH79_MISC_IRQ_TIMER);
+
+ else if (pending & MISC_INT_OHCI)
+ generic_handle_irq(ATH79_MISC_IRQ_OHCI);
+
+ else if (pending & MISC_INT_ERROR)
+ generic_handle_irq(ATH79_MISC_IRQ_ERROR);
+
+ else if (pending & MISC_INT_GPIO)
+ generic_handle_irq(ATH79_MISC_IRQ_GPIO);
+
+ else if (pending & MISC_INT_WDOG)
+ generic_handle_irq(ATH79_MISC_IRQ_WDOG);
+
+ else
+ spurious_interrupt();
+}
+
+static void ar71xx_misc_irq_unmask(unsigned int irq)
+{
+ void __iomem *base = ath79_reset_base;
+ u32 t;
+
+ irq -= ATH79_MISC_IRQ_BASE;
+
+ t = __raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);
+ __raw_writel(t | (1 << irq), base + AR71XX_RESET_REG_MISC_INT_ENABLE);
+
+ /* flush write */
+ __raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);
+}
+
+static void ar71xx_misc_irq_mask(unsigned int irq)
+{
+ void __iomem *base = ath79_reset_base;
+ u32 t;
+
+ irq -= ATH79_MISC_IRQ_BASE;
+
+ t = __raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);
+ __raw_writel(t & ~(1 << irq), base + AR71XX_RESET_REG_MISC_INT_ENABLE);
+
+ /* flush write */
+ __raw_readl(base + AR71XX_RESET_REG_MISC_INT_ENABLE);
+}
+
+static void ar724x_misc_irq_ack(unsigned int irq)
+{
+ void __iomem *base = ath79_reset_base;
+ u32 t;
+
+ irq -= ATH79_MISC_IRQ_BASE;
+
+ t = __raw_readl(base + AR71XX_RESET_REG_MISC_INT_STATUS);
+ __raw_writel(t & ~(1 << irq), base + AR71XX_RESET_REG_MISC_INT_STATUS);
+
+ /* flush write */
+ __raw_readl(base + AR71XX_RESET_REG_MISC_INT_STATUS);
+}
+
+static struct irq_chip ath79_misc_irq_chip = {
+ .name = "MISC",
+ .unmask = ar71xx_misc_irq_unmask,
+ .mask = ar71xx_misc_irq_mask,
+};
+
+static void __init ath79_misc_irq_init(void)
+{
+ void __iomem *base = ath79_reset_base;
+ int i;
+
+ __raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_ENABLE);
+ __raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_STATUS);
+
+ if (soc_is_ar71xx() || soc_is_ar913x())
+ ath79_misc_irq_chip.mask_ack = ar71xx_misc_irq_mask;
+ else if (soc_is_ar724x())
+ ath79_misc_irq_chip.ack = ar724x_misc_irq_ack;
+ else
+ BUG();
+
+ for (i = ATH79_MISC_IRQ_BASE;
+ i < ATH79_MISC_IRQ_BASE + ATH79_MISC_IRQ_COUNT; i++) {
+ irq_desc[i].status = IRQ_DISABLED;
+ set_irq_chip_and_handler(i, &ath79_misc_irq_chip,
+ handle_level_irq);
+ }
+
+ set_irq_chained_handler(ATH79_CPU_IRQ_MISC, ath79_misc_irq_handler);
+}
+
+asmlinkage void plat_irq_dispatch(void)
+{
+ unsigned long pending;
+
+ pending = read_c0_status() & read_c0_cause() & ST0_IM;
+
+ if (pending & STATUSF_IP7)
+ do_IRQ(ATH79_CPU_IRQ_TIMER);
+
+ else if (pending & STATUSF_IP2) {
+ ath79_ddr_wb_flush(ath79_ip2_flush_reg);
+ do_IRQ(ATH79_CPU_IRQ_IP2);
+ }
+
+ else if (pending & STATUSF_IP4)
+ do_IRQ(ATH79_CPU_IRQ_GE0);
+
+ else if (pending & STATUSF_IP5)
+ do_IRQ(ATH79_CPU_IRQ_GE1);
+
+ else if (pending & STATUSF_IP3) {
+ ath79_ddr_wb_flush(ath79_ip3_flush_reg);
+ do_IRQ(ATH79_CPU_IRQ_USB);
+ }
+
+ else if (pending & STATUSF_IP6)
+ do_IRQ(ATH79_CPU_IRQ_MISC);
+
+ else
+ spurious_interrupt();
+}
+
+void __init arch_init_irq(void)
+{
+ if (soc_is_ar71xx()) {
+ ath79_ip2_flush_reg = AR71XX_DDR_REG_FLUSH_PCI;
+ ath79_ip3_flush_reg = AR71XX_DDR_REG_FLUSH_USB;
+ } else if (soc_is_ar724x()) {
+ ath79_ip2_flush_reg = AR724X_DDR_REG_FLUSH_PCIE;
+ ath79_ip3_flush_reg = AR724X_DDR_REG_FLUSH_USB;
+ } else if (soc_is_ar913x()) {
+ ath79_ip2_flush_reg = AR913X_DDR_REG_FLUSH_WMAC;
+ ath79_ip3_flush_reg = AR913X_DDR_REG_FLUSH_USB;
+ } else
+ BUG();
+
+ cp0_perfcount_irq = ATH79_MISC_IRQ_PERFC;
+ mips_cpu_irq_init();
+ ath79_misc_irq_init();
+}
diff --git a/arch/mips/ath79/prom.c b/arch/mips/ath79/prom.c
new file mode 100644
index 0000000..e9cbd7c
--- /dev/null
+++ b/arch/mips/ath79/prom.c
@@ -0,0 +1,57 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X specific prom routines
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/string.h>
+
+#include <asm/bootinfo.h>
+#include <asm/addrspace.h>
+
+#include "common.h"
+
+static inline int is_valid_ram_addr(void *addr)
+{
+ if (((u32) addr > KSEG0) &&
+ ((u32) addr < (KSEG0 + ATH79_MEM_SIZE_MAX)))
+ return 1;
+
+ if (((u32) addr > KSEG1) &&
+ ((u32) addr < (KSEG1 + ATH79_MEM_SIZE_MAX)))
+ return 1;
+
+ return 0;
+}
+
+static __init void ath79_prom_init_cmdline(int argc, char **argv)
+{
+ int i;
+
+ if (!is_valid_ram_addr(argv))
+ return;
+
+ for (i = 0; i < argc; i++)
+ if (is_valid_ram_addr(argv[i])) {
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+ strlcat(arcs_cmdline, argv[i], sizeof(arcs_cmdline));
+ }
+}
+
+void __init prom_init(void)
+{
+ ath79_prom_init_cmdline(fw_arg0, (char **)fw_arg1);
+}
+
+void __init prom_free_prom_memory(void)
+{
+ /* We do not have to prom memory to free */
+}
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
new file mode 100644
index 0000000..ee620e1
--- /dev/null
+++ b/arch/mips/ath79/setup.c
@@ -0,0 +1,263 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X specific setup
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/bootmem.h>
+
+#include <asm/bootinfo.h>
+#include <asm/time.h> /* for mips_hpt_frequency */
+#include <asm/reboot.h> /* for _machine_{restart,halt} */
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include "common.h"
+#include "dev-common.h"
+
+#define ATH79_SYS_TYPE_LEN 64
+
+#define AR71XX_BASE_FREQ 40000000
+#define AR724X_BASE_FREQ 5000000
+#define AR913X_BASE_FREQ 5000000
+
+static char ath79_sys_type[ATH79_SYS_TYPE_LEN];
+
+static void ath79_restart(char *command)
+{
+ ath79_device_stop(AR71XX_RESET_FULL_CHIP);
+ for (;;)
+ if (cpu_wait)
+ cpu_wait();
+}
+
+static void ath79_halt(void)
+{
+ while (1)
+ cpu_wait();
+}
+
+static void __init ath79_detect_mem_size(void)
+{
+ unsigned long size;
+
+ for (size = ATH79_MEM_SIZE_MIN; size < ATH79_MEM_SIZE_MAX;
+ size <<= 1) {
+ if (!memcmp(ath79_detect_mem_size,
+ ath79_detect_mem_size + size, 1024))
+ break;
+ }
+
+ add_memory_region(0, size, BOOT_MEM_RAM);
+}
+
+static void __init ath79_detect_sys_type(void)
+{
+ char *chip = "????";
+ u32 id;
+ u32 major;
+ u32 minor;
+ u32 rev = 0;
+
+ id = ath79_reset_rr(AR71XX_RESET_REG_REV_ID);
+ major = id & REV_ID_MAJOR_MASK;
+
+ switch (major) {
+ case REV_ID_MAJOR_AR71XX:
+ minor = id & AR71XX_REV_ID_MINOR_MASK;
+ rev = id >> AR71XX_REV_ID_REVISION_SHIFT;
+ rev &= AR71XX_REV_ID_REVISION_MASK;
+ switch (minor) {
+ case AR71XX_REV_ID_MINOR_AR7130:
+ ath79_soc = ATH79_SOC_AR7130;
+ chip = "7130";
+ break;
+
+ case AR71XX_REV_ID_MINOR_AR7141:
+ ath79_soc = ATH79_SOC_AR7141;
+ chip = "7141";
+ break;
+
+ case AR71XX_REV_ID_MINOR_AR7161:
+ ath79_soc = ATH79_SOC_AR7161;
+ chip = "7161";
+ break;
+ }
+ break;
+
+ case REV_ID_MAJOR_AR7240:
+ ath79_soc = ATH79_SOC_AR7240;
+ chip = "7240";
+ rev = (id & AR724X_REV_ID_REVISION_MASK);
+ break;
+
+ case REV_ID_MAJOR_AR7241:
+ ath79_soc = ATH79_SOC_AR7241;
+ chip = "7241";
+ rev = (id & AR724X_REV_ID_REVISION_MASK);
+ break;
+
+ case REV_ID_MAJOR_AR7242:
+ ath79_soc = ATH79_SOC_AR7242;
+ chip = "7242";
+ rev = (id & AR724X_REV_ID_REVISION_MASK);
+ break;
+
+ case REV_ID_MAJOR_AR913X:
+ minor = id & AR913X_REV_ID_MINOR_MASK;
+ rev = id >> AR913X_REV_ID_REVISION_SHIFT;
+ rev &= AR913X_REV_ID_REVISION_MASK;
+ switch (minor) {
+ case AR913X_REV_ID_MINOR_AR9130:
+ ath79_soc = ATH79_SOC_AR9130;
+ chip = "9130";
+ break;
+
+ case AR913X_REV_ID_MINOR_AR9132:
+ ath79_soc = ATH79_SOC_AR9132;
+ chip = "9132";
+ break;
+ }
+ break;
+
+ default:
+ panic("ath79: unknown SoC, id:0x%08x\n", id);
+ }
+
+ sprintf(ath79_sys_type, "Atheros AR%s rev %u", chip, rev);
+}
+
+static void __init ar71xx_detect_sys_frequency(void)
+{
+ u32 pll;
+ u32 freq;
+ u32 div;
+
+ pll = ath79_pll_rr(AR71XX_PLL_REG_CPU_CONFIG);
+
+ div = ((pll >> AR71XX_PLL_DIV_SHIFT) & AR71XX_PLL_DIV_MASK) + 1;
+ freq = div * AR71XX_BASE_FREQ;
+
+ div = ((pll >> AR71XX_CPU_DIV_SHIFT) & AR71XX_CPU_DIV_MASK) + 1;
+ ath79_cpu_freq = freq / div;
+
+ div = ((pll >> AR71XX_DDR_DIV_SHIFT) & AR71XX_DDR_DIV_MASK) + 1;
+ ath79_ddr_freq = freq / div;
+
+ div = (((pll >> AR71XX_AHB_DIV_SHIFT) & AR71XX_AHB_DIV_MASK) + 1) * 2;
+ ath79_ahb_freq = ath79_cpu_freq / div;
+}
+
+static void __init ar724x_detect_sys_frequency(void)
+{
+ u32 pll;
+ u32 freq;
+ u32 div;
+
+ pll = ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
+
+ div = ((pll >> AR724X_PLL_DIV_SHIFT) & AR724X_PLL_DIV_MASK);
+ freq = div * AR724X_BASE_FREQ;
+
+ div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK);
+ freq *= div;
+
+ ath79_cpu_freq = freq;
+
+ div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
+ ath79_ddr_freq = freq / div;
+
+ div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
+ ath79_ahb_freq = ath79_cpu_freq / div;
+}
+
+static void __init ar913x_detect_sys_frequency(void)
+{
+ u32 pll;
+ u32 freq;
+ u32 div;
+
+ pll = ath79_pll_rr(AR913X_PLL_REG_CPU_CONFIG);
+
+ div = ((pll >> AR913X_PLL_DIV_SHIFT) & AR913X_PLL_DIV_MASK);
+ freq = div * AR913X_BASE_FREQ;
+
+ ath79_cpu_freq = freq;
+
+ div = ((pll >> AR913X_DDR_DIV_SHIFT) & AR913X_DDR_DIV_MASK) + 1;
+ ath79_ddr_freq = freq / div;
+
+ div = (((pll >> AR913X_AHB_DIV_SHIFT) & AR913X_AHB_DIV_MASK) + 1) * 2;
+ ath79_ahb_freq = ath79_cpu_freq / div;
+}
+
+static void __init ath79_detect_sys_frequency(void)
+{
+ if (soc_is_ar71xx())
+ ar71xx_detect_sys_frequency();
+ else if (soc_is_ar724x())
+ ar724x_detect_sys_frequency();
+ else if (soc_is_ar913x())
+ ar913x_detect_sys_frequency();
+ else
+ BUG();
+}
+
+const char *get_system_type(void)
+{
+ return ath79_sys_type;
+}
+
+unsigned int __cpuinit get_c0_compare_int(void)
+{
+ return CP0_LEGACY_COMPARE_IRQ;
+}
+
+void __init plat_mem_setup(void)
+{
+ set_io_port_base(KSEG1);
+
+ ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
+ AR71XX_RESET_SIZE);
+ ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,
+ AR71XX_PLL_SIZE);
+
+ ath79_ddr_base = ioremap_nocache(AR71XX_DDR_CTRL_BASE,
+ AR71XX_DDR_CTRL_SIZE);
+
+ ath79_detect_sys_type();
+ ath79_detect_mem_size();
+ ath79_detect_sys_frequency();
+
+ pr_info("SoC: %s, CPU:%u.%03u MHz, DDR:%u.%03u MHz, AHB:%u.%03u MHz\n",
+ ath79_sys_type,
+ ath79_cpu_freq / 1000000, (ath79_cpu_freq / 1000) % 1000,
+ ath79_ddr_freq / 1000000, (ath79_ddr_freq / 1000) % 1000,
+ ath79_ahb_freq / 1000000, (ath79_ahb_freq / 1000) % 1000);
+
+ _machine_restart = ath79_restart;
+ _machine_halt = ath79_halt;
+ pm_power_off = ath79_halt;
+}
+
+void __init plat_time_init(void)
+{
+ mips_hpt_frequency = ath79_cpu_freq / 2;
+}
+
+static int __init ath79_setup(void)
+{
+ ath79_register_uart();
+ return 0;
+}
+
+arch_initcall(ath79_setup);
diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
new file mode 100644
index 0000000..5a9e5e1
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -0,0 +1,207 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X SoC register definitions
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ *
+ * 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.
+ */
+
+#ifndef __ASM_MACH_AR71XX_REGS_H
+#define __ASM_MACH_AR71XX_REGS_H
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/bitops.h>
+
+#define AR71XX_APB_BASE 0x18000000
+
+#define AR71XX_DDR_CTRL_BASE (AR71XX_APB_BASE + 0x00000000)
+#define AR71XX_DDR_CTRL_SIZE 0x100
+#define AR71XX_UART_BASE (AR71XX_APB_BASE + 0x00020000)
+#define AR71XX_UART_SIZE 0x100
+#define AR71XX_PLL_BASE (AR71XX_APB_BASE + 0x00050000)
+#define AR71XX_PLL_SIZE 0x100
+#define AR71XX_RESET_BASE (AR71XX_APB_BASE + 0x00060000)
+#define AR71XX_RESET_SIZE 0x100
+
+/*
+ * DDR_CTRL block
+ */
+#define AR71XX_DDR_REG_PCI_WIN0 0x7c
+#define AR71XX_DDR_REG_PCI_WIN1 0x80
+#define AR71XX_DDR_REG_PCI_WIN2 0x84
+#define AR71XX_DDR_REG_PCI_WIN3 0x88
+#define AR71XX_DDR_REG_PCI_WIN4 0x8c
+#define AR71XX_DDR_REG_PCI_WIN5 0x90
+#define AR71XX_DDR_REG_PCI_WIN6 0x94
+#define AR71XX_DDR_REG_PCI_WIN7 0x98
+#define AR71XX_DDR_REG_FLUSH_GE0 0x9c
+#define AR71XX_DDR_REG_FLUSH_GE1 0xa0
+#define AR71XX_DDR_REG_FLUSH_USB 0xa4
+#define AR71XX_DDR_REG_FLUSH_PCI 0xa8
+
+#define AR724X_DDR_REG_FLUSH_GE0 0x7c
+#define AR724X_DDR_REG_FLUSH_GE1 0x80
+#define AR724X_DDR_REG_FLUSH_USB 0x84
+#define AR724X_DDR_REG_FLUSH_PCIE 0x88
+
+#define AR913X_DDR_REG_FLUSH_GE0 0x7c
+#define AR913X_DDR_REG_FLUSH_GE1 0x80
+#define AR913X_DDR_REG_FLUSH_USB 0x84
+#define AR913X_DDR_REG_FLUSH_WMAC 0x88
+
+/*
+ * PLL block
+ */
+#define AR71XX_PLL_REG_CPU_CONFIG 0x00
+#define AR71XX_PLL_REG_SEC_CONFIG 0x04
+#define AR71XX_PLL_REG_ETH0_INT_CLOCK 0x10
+#define AR71XX_PLL_REG_ETH1_INT_CLOCK 0x14
+
+#define AR71XX_PLL_DIV_SHIFT 3
+#define AR71XX_PLL_DIV_MASK 0x1f
+#define AR71XX_CPU_DIV_SHIFT 16
+#define AR71XX_CPU_DIV_MASK 0x3
+#define AR71XX_DDR_DIV_SHIFT 18
+#define AR71XX_DDR_DIV_MASK 0x3
+#define AR71XX_AHB_DIV_SHIFT 20
+#define AR71XX_AHB_DIV_MASK 0x7
+
+#define AR724X_PLL_REG_CPU_CONFIG 0x00
+#define AR724X_PLL_REG_PCIE_CONFIG 0x18
+
+#define AR724X_PLL_DIV_SHIFT 0
+#define AR724X_PLL_DIV_MASK 0x3ff
+#define AR724X_PLL_REF_DIV_SHIFT 10
+#define AR724X_PLL_REF_DIV_MASK 0xf
+#define AR724X_AHB_DIV_SHIFT 19
+#define AR724X_AHB_DIV_MASK 0x1
+#define AR724X_DDR_DIV_SHIFT 22
+#define AR724X_DDR_DIV_MASK 0x3
+
+#define AR913X_PLL_REG_CPU_CONFIG 0x00
+#define AR913X_PLL_REG_ETH_CONFIG 0x04
+#define AR913X_PLL_REG_ETH0_INT_CLOCK 0x14
+#define AR913X_PLL_REG_ETH1_INT_CLOCK 0x18
+
+#define AR913X_PLL_DIV_SHIFT 0
+#define AR913X_PLL_DIV_MASK 0x3ff
+#define AR913X_DDR_DIV_SHIFT 22
+#define AR913X_DDR_DIV_MASK 0x3
+#define AR913X_AHB_DIV_SHIFT 19
+#define AR913X_AHB_DIV_MASK 0x1
+
+/*
+ * RESET block
+ */
+#define AR71XX_RESET_REG_TIMER 0x00
+#define AR71XX_RESET_REG_TIMER_RELOAD 0x04
+#define AR71XX_RESET_REG_WDOG_CTRL 0x08
+#define AR71XX_RESET_REG_WDOG 0x0c
+#define AR71XX_RESET_REG_MISC_INT_STATUS 0x10
+#define AR71XX_RESET_REG_MISC_INT_ENABLE 0x14
+#define AR71XX_RESET_REG_PCI_INT_STATUS 0x18
+#define AR71XX_RESET_REG_PCI_INT_ENABLE 0x1c
+#define AR71XX_RESET_REG_GLOBAL_INT_STATUS 0x20
+#define AR71XX_RESET_REG_RESET_MODULE 0x24
+#define AR71XX_RESET_REG_PERFC_CTRL 0x2c
+#define AR71XX_RESET_REG_PERFC0 0x30
+#define AR71XX_RESET_REG_PERFC1 0x34
+#define AR71XX_RESET_REG_REV_ID 0x90
+
+#define AR913X_RESET_REG_GLOBAL_INT_STATUS 0x18
+#define AR913X_RESET_REG_RESET_MODULE 0x1c
+#define AR913X_RESET_REG_PERF_CTRL 0x20
+#define AR913X_RESET_REG_PERFC0 0x24
+#define AR913X_RESET_REG_PERFC1 0x28
+
+#define AR724X_RESET_REG_RESET_MODULE 0x1c
+
+#define MISC_INT_DMA BIT(7)
+#define MISC_INT_OHCI BIT(6)
+#define MISC_INT_PERFC BIT(5)
+#define MISC_INT_WDOG BIT(4)
+#define MISC_INT_UART BIT(3)
+#define MISC_INT_GPIO BIT(2)
+#define MISC_INT_ERROR BIT(1)
+#define MISC_INT_TIMER BIT(0)
+
+#define AR71XX_RESET_EXTERNAL BIT(28)
+#define AR71XX_RESET_FULL_CHIP BIT(24)
+#define AR71XX_RESET_CPU_NMI BIT(21)
+#define AR71XX_RESET_CPU_COLD BIT(20)
+#define AR71XX_RESET_DMA BIT(19)
+#define AR71XX_RESET_SLIC BIT(18)
+#define AR71XX_RESET_STEREO BIT(17)
+#define AR71XX_RESET_DDR BIT(16)
+#define AR71XX_RESET_GE1_MAC BIT(13)
+#define AR71XX_RESET_GE1_PHY BIT(12)
+#define AR71XX_RESET_USBSUS_OVERRIDE BIT(10)
+#define AR71XX_RESET_GE0_MAC BIT(9)
+#define AR71XX_RESET_GE0_PHY BIT(8)
+#define AR71XX_RESET_USB_OHCI_DLL BIT(6)
+#define AR71XX_RESET_USB_HOST BIT(5)
+#define AR71XX_RESET_USB_PHY BIT(4)
+#define AR71XX_RESET_PCI_BUS BIT(1)
+#define AR71XX_RESET_PCI_CORE BIT(0)
+
+#define AR724X_RESET_GE1_MDIO BIT(23)
+#define AR724X_RESET_GE0_MDIO BIT(22)
+#define AR724X_RESET_PCIE_PHY_SERIAL BIT(10)
+#define AR724X_RESET_PCIE_PHY BIT(7)
+#define AR724X_RESET_PCIE BIT(6)
+#define AR724X_RESET_OHCI_DLL BIT(3)
+
+#define AR913X_RESET_AMBA2WMAC BIT(22)
+
+#define REV_ID_MAJOR_MASK 0xfff0
+#define REV_ID_MAJOR_AR71XX 0x00a0
+#define REV_ID_MAJOR_AR913X 0x00b0
+#define REV_ID_MAJOR_AR7240 0x00c0
+#define REV_ID_MAJOR_AR7241 0x0100
+#define REV_ID_MAJOR_AR7242 0x1100
+
+#define AR71XX_REV_ID_MINOR_MASK 0x3
+#define AR71XX_REV_ID_MINOR_AR7130 0x0
+#define AR71XX_REV_ID_MINOR_AR7141 0x1
+#define AR71XX_REV_ID_MINOR_AR7161 0x2
+#define AR71XX_REV_ID_REVISION_MASK 0x3
+#define AR71XX_REV_ID_REVISION_SHIFT 2
+
+#define AR913X_REV_ID_MINOR_MASK 0x3
+#define AR913X_REV_ID_MINOR_AR9130 0x0
+#define AR913X_REV_ID_MINOR_AR9132 0x1
+#define AR913X_REV_ID_REVISION_MASK 0x3
+#define AR913X_REV_ID_REVISION_SHIFT 2
+
+#define AR724X_REV_ID_REVISION_MASK 0x3
+
+/*
+ * SPI block
+ */
+#define AR71XX_SPI_REG_FS 0x00 /* Function Select */
+#define AR71XX_SPI_REG_CTRL 0x04 /* SPI Control */
+#define AR71XX_SPI_REG_IOC 0x08 /* SPI I/O Control */
+#define AR71XX_SPI_REG_RDS 0x0c /* Read Data Shift */
+
+#define AR71XX_SPI_FS_GPIO BIT(0) /* Enable GPIO mode */
+
+#define AR71XX_SPI_CTRL_RD BIT(6) /* Remap Disable */
+#define AR71XX_SPI_CTRL_DIV_MASK 0x3f
+
+#define AR71XX_SPI_IOC_DO BIT(0) /* Data Out pin */
+#define AR71XX_SPI_IOC_CLK BIT(8) /* CLK pin */
+#define AR71XX_SPI_IOC_CS(n) BIT(16 + (n))
+#define AR71XX_SPI_IOC_CS0 AR71XX_SPI_IOC_CS(0)
+#define AR71XX_SPI_IOC_CS1 AR71XX_SPI_IOC_CS(1)
+#define AR71XX_SPI_IOC_CS2 AR71XX_SPI_IOC_CS(2)
+#define AR71XX_SPI_IOC_CS_ALL (AR71XX_SPI_IOC_CS0 | AR71XX_SPI_IOC_CS1 | \
+ AR71XX_SPI_IOC_CS2)
+
+#endif /* __ASM_MACH_AR71XX_REGS_H */
diff --git a/arch/mips/include/asm/mach-ath79/ath79.h b/arch/mips/include/asm/mach-ath79/ath79.h
new file mode 100644
index 0000000..14248c9
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/ath79.h
@@ -0,0 +1,50 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X common definitions
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ *
+ * 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.
+ */
+
+#ifndef __ASM_MACH_ATH79_H
+#define __ASM_MACH_ATH79_H
+
+#include <linux/types.h>
+#include <linux/io.h>
+
+extern u32 ath79_ahb_freq;
+extern u32 ath79_cpu_freq;
+extern u32 ath79_ddr_freq;
+
+extern void __iomem *ath79_pll_base;
+extern void __iomem *ath79_reset_base;
+
+static inline void ath79_pll_wr(unsigned reg, u32 val)
+{
+ __raw_writel(val, ath79_pll_base + reg);
+}
+
+static inline u32 ath79_pll_rr(unsigned reg)
+{
+ return __raw_readl(ath79_pll_base + reg);
+}
+
+static inline void ath79_reset_wr(unsigned reg, u32 val)
+{
+ __raw_writel(val, ath79_reset_base + reg);
+}
+
+static inline u32 ath79_reset_rr(unsigned reg)
+{
+ return __raw_readl(ath79_reset_base + reg);
+}
+
+void ath79_device_stop(u32 mask);
+void ath79_device_start(u32 mask);
+
+#endif /* __ASM_MACH_ATH79_H */
diff --git a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
new file mode 100644
index 0000000..4476fa0
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
@@ -0,0 +1,56 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X specific CPU feature overrides
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This file was derived from: include/asm-mips/cpu-features.h
+ * Copyright (C) 2003, 2004 Ralf Baechle
+ * Copyright (C) 2004 Maciej W. Rozycki
+ *
+ * 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.
+ *
+ */
+#ifndef __ASM_MACH_ATH79_CPU_FEATURE_OVERRIDES_H
+#define __ASM_MACH_ATH79_CPU_FEATURE_OVERRIDES_H
+
+#define cpu_has_tlb 1
+#define cpu_has_4kex 1
+#define cpu_has_3k_cache 0
+#define cpu_has_4k_cache 1
+#define cpu_has_tx39_cache 0
+#define cpu_has_sb1_cache 0
+#define cpu_has_fpu 0
+#define cpu_has_32fpr 0
+#define cpu_has_counter 1
+#define cpu_has_watch 1
+#define cpu_has_divec 1
+
+#define cpu_has_prefetch 1
+#define cpu_has_ejtag 1
+#define cpu_has_llsc 1
+
+#define cpu_has_mips16 1
+#define cpu_has_mdmx 0
+#define cpu_has_mips3d 0
+#define cpu_has_smartmips 0
+
+#define cpu_has_mips32r1 1
+#define cpu_has_mips32r2 1
+#define cpu_has_mips64r1 0
+#define cpu_has_mips64r2 0
+
+#define cpu_has_dsp 0
+#define cpu_has_mipsmt 0
+
+#define cpu_has_64bits 0
+#define cpu_has_64bit_zero_reg 0
+#define cpu_has_64bit_gp_regs 0
+#define cpu_has_64bit_addresses 0
+
+#define cpu_dcache_line_size() 32
+#define cpu_icache_line_size() 32
+
+#endif /* __ASM_MACH_ATH79_CPU_FEATURE_OVERRIDES_H */
diff --git a/arch/mips/include/asm/mach-ath79/irq.h b/arch/mips/include/asm/mach-ath79/irq.h
new file mode 100644
index 0000000..189bc6e
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/irq.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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.
+ */
+#ifndef __ASM_MACH_ATH79_IRQ_H
+#define __ASM_MACH_ATH79_IRQ_H
+
+#define MIPS_CPU_IRQ_BASE 0
+#define NR_IRQS 16
+
+#define ATH79_MISC_IRQ_BASE 8
+#define ATH79_MISC_IRQ_COUNT 8
+
+#define ATH79_CPU_IRQ_IP2 (MIPS_CPU_IRQ_BASE + 2)
+#define ATH79_CPU_IRQ_USB (MIPS_CPU_IRQ_BASE + 3)
+#define ATH79_CPU_IRQ_GE0 (MIPS_CPU_IRQ_BASE + 4)
+#define ATH79_CPU_IRQ_GE1 (MIPS_CPU_IRQ_BASE + 5)
+#define ATH79_CPU_IRQ_MISC (MIPS_CPU_IRQ_BASE + 6)
+#define ATH79_CPU_IRQ_TIMER (MIPS_CPU_IRQ_BASE + 7)
+
+#define ATH79_MISC_IRQ_TIMER (ATH79_MISC_IRQ_BASE + 0)
+#define ATH79_MISC_IRQ_ERROR (ATH79_MISC_IRQ_BASE + 1)
+#define ATH79_MISC_IRQ_GPIO (ATH79_MISC_IRQ_BASE + 2)
+#define ATH79_MISC_IRQ_UART (ATH79_MISC_IRQ_BASE + 3)
+#define ATH79_MISC_IRQ_WDOG (ATH79_MISC_IRQ_BASE + 4)
+#define ATH79_MISC_IRQ_PERFC (ATH79_MISC_IRQ_BASE + 5)
+#define ATH79_MISC_IRQ_OHCI (ATH79_MISC_IRQ_BASE + 6)
+#define ATH79_MISC_IRQ_DMA (ATH79_MISC_IRQ_BASE + 7)
+
+#include_next <irq.h>
+
+#endif /* __ASM_MACH_ATH79_IRQ_H */
diff --git a/arch/mips/include/asm/mach-ath79/kernel-entry-init.h b/arch/mips/include/asm/mach-ath79/kernel-entry-init.h
new file mode 100644
index 0000000..d8d046b
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/kernel-entry-init.h
@@ -0,0 +1,32 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X specific kernel entry setup
+ *
+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * 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.
+ *
+ */
+#ifndef __ASM_MACH_ATH79_KERNEL_ENTRY_H
+#define __ASM_MACH_ATH79_KERNEL_ENTRY_H
+
+ /*
+ * Some bootloaders set the 'Kseg0 coherency algorithm' to
+ * 'Cacheable, noncoherent, write-through, no write allocate'
+ * and this cause performance issues. Let's go and change it to
+ * 'Cacheable, noncoherent, write-back, write allocate'
+ */
+ .macro kernel_entry_setup
+ mfc0 t0, CP0_CONFIG
+ li t1, ~CONF_CM_CMASK
+ and t0, t1
+ ori t0, CONF_CM_CACHABLE_NONCOHERENT
+ mtc0 t0, CP0_CONFIG
+ nop
+ .endm
+
+ .macro smp_slave_setup
+ .endm
+
+#endif /* __ASM_MACH_ATH79_KERNEL_ENTRY_H */
diff --git a/arch/mips/include/asm/mach-ath79/war.h b/arch/mips/include/asm/mach-ath79/war.h
new file mode 100644
index 0000000..323d9f1
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/war.h
@@ -0,0 +1,25 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
+ */
+#ifndef __ASM_MACH_ATH79_WAR_H
+#define __ASM_MACH_ATH79_WAR_H
+
+#define R4600_V1_INDEX_ICACHEOP_WAR 0
+#define R4600_V1_HIT_CACHEOP_WAR 0
+#define R4600_V2_HIT_CACHEOP_WAR 0
+#define R5432_CP0_INTERRUPT_WAR 0
+#define BCM1250_M3_WAR 0
+#define SIBYTE_1956_WAR 0
+#define MIPS4K_ICACHE_REFILL_WAR 0
+#define MIPS_CACHE_SYNC_WAR 0
+#define TX49XX_ICACHE_INDEX_INV_WAR 0
+#define RM9000_CDEX_SMP_WAR 0
+#define ICACHE_REFILLS_WORKAROUND_WAR 0
+#define R10000_LLSC_WAR 0
+#define MIPS34K_MISSED_ITLB_WAR 0
+
+#endif /* __ASM_MACH_ATH79_WAR_H */
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 02/18] MIPS: ath79: add GPIOLIB support
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
2010-11-23 15:06 ` [PATCH 01/18] MIPS: add initial support for the Atheros AR71XX/AR724X/AR931X SoCs Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel Gabor Juhos
` (16 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos,
David Brownell
This patch implements generic GPIO routines for the built-in
GPIO controllers of the Atheros AR71XX/AR724X/AR913X SoCs.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Cc: David Brownell <dbrownell@users.sourceforge.net>
---
Changes since RFC: ---
arch/mips/Kconfig | 1 +
arch/mips/ath79/Makefile | 2 +-
arch/mips/ath79/common.h | 5 +
arch/mips/ath79/gpio.c | 196 ++++++++++++++++++++++++
arch/mips/ath79/setup.c | 2 +-
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 21 +++
arch/mips/include/asm/mach-ath79/gpio.h | 26 +++
7 files changed, 251 insertions(+), 2 deletions(-)
create mode 100644 arch/mips/ath79/gpio.c
create mode 100644 arch/mips/include/asm/mach-ath79/gpio.h
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 50d4f5d..ec69df5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -67,6 +67,7 @@ config AR7
config ATH79
bool "Atheros AR71XX/AR724X/AR913X based boards"
+ select ARCH_REQUIRE_GPIOLIB
select BOOT_RAW
select CEVT_R4K
select CSRC_R4K
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index b4ec9c2..facbb70 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -8,7 +8,7 @@
# under the terms of the GNU General Public License version 2 as published
# by the Free Software Foundation.
-obj-y := prom.o setup.o irq.o common.o
+obj-y := prom.o setup.o irq.o common.o gpio.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
diff --git a/arch/mips/ath79/common.h b/arch/mips/ath79/common.h
index 62d7503..041ca7e 100644
--- a/arch/mips/ath79/common.h
+++ b/arch/mips/ath79/common.h
@@ -59,4 +59,9 @@ static inline int soc_is_ar913x(void)
ath79_soc == ATH79_SOC_AR9132);
}
+void ath79_gpio_function_enable(u32 mask);
+void ath79_gpio_function_disable(u32 mask);
+void ath79_gpio_function_setup(u32 set, u32 clear);
+void ath79_gpio_init(void) __init;
+
#endif /* __ATH79_COMMON_H */
diff --git a/arch/mips/ath79/gpio.c b/arch/mips/ath79/gpio.c
new file mode 100644
index 0000000..fd88c64
--- /dev/null
+++ b/arch/mips/ath79/gpio.c
@@ -0,0 +1,196 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X GPIO API support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include "common.h"
+
+static void __iomem *ath79_gpio_base;
+static unsigned long ath79_gpio_count;
+static DEFINE_SPINLOCK(ath79_gpio_lock);
+
+static void __ath79_gpio_set_value(unsigned gpio, int value)
+{
+ void __iomem *base = ath79_gpio_base;
+
+ if (value)
+ __raw_writel(1 << gpio, base + AR71XX_GPIO_REG_SET);
+ else
+ __raw_writel(1 << gpio, base + AR71XX_GPIO_REG_CLEAR);
+}
+
+static int __ath79_gpio_get_value(unsigned gpio)
+{
+ return (__raw_readl(ath79_gpio_base + AR71XX_GPIO_REG_IN) >> gpio) & 1;
+}
+
+static int ath79_gpio_get_value(struct gpio_chip *chip, unsigned offset)
+{
+ return __ath79_gpio_get_value(offset);
+}
+
+static void ath79_gpio_set_value(struct gpio_chip *chip,
+ unsigned offset, int value)
+{
+ __ath79_gpio_set_value(offset, value);
+}
+
+static int ath79_gpio_direction_input(struct gpio_chip *chip,
+ unsigned offset)
+{
+ void __iomem *base = ath79_gpio_base;
+ unsigned long flags;
+
+ spin_lock_irqsave(&ath79_gpio_lock, flags);
+
+ __raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) & ~(1 << offset),
+ base + AR71XX_GPIO_REG_OE);
+
+ spin_unlock_irqrestore(&ath79_gpio_lock, flags);
+
+ return 0;
+}
+
+static int ath79_gpio_direction_output(struct gpio_chip *chip,
+ unsigned offset, int value)
+{
+ void __iomem *base = ath79_gpio_base;
+ unsigned long flags;
+
+ spin_lock_irqsave(&ath79_gpio_lock, flags);
+
+ if (value)
+ __raw_writel(1 << offset, base + AR71XX_GPIO_REG_SET);
+ else
+ __raw_writel(1 << offset, base + AR71XX_GPIO_REG_CLEAR);
+
+ __raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) | (1 << offset),
+ base + AR71XX_GPIO_REG_OE);
+
+ spin_unlock_irqrestore(&ath79_gpio_lock, flags);
+
+ return 0;
+}
+
+static struct gpio_chip ath79_gpio_chip = {
+ .label = "ath79",
+ .get = ath79_gpio_get_value,
+ .set = ath79_gpio_set_value,
+ .direction_input = ath79_gpio_direction_input,
+ .direction_output = ath79_gpio_direction_output,
+ .base = 0,
+};
+
+void ath79_gpio_function_enable(u32 mask)
+{
+ void __iomem *base = ath79_gpio_base;
+ unsigned long flags;
+
+ spin_lock_irqsave(&ath79_gpio_lock, flags);
+
+ __raw_writel(__raw_readl(base + AR71XX_GPIO_REG_FUNC) | mask,
+ base + AR71XX_GPIO_REG_FUNC);
+ /* flush write */
+ __raw_readl(base + AR71XX_GPIO_REG_FUNC);
+
+ spin_unlock_irqrestore(&ath79_gpio_lock, flags);
+}
+
+void ath79_gpio_function_disable(u32 mask)
+{
+ void __iomem *base = ath79_gpio_base;
+ unsigned long flags;
+
+ spin_lock_irqsave(&ath79_gpio_lock, flags);
+
+ __raw_writel(__raw_readl(base + AR71XX_GPIO_REG_FUNC) & ~mask,
+ base + AR71XX_GPIO_REG_FUNC);
+ /* flush write */
+ __raw_readl(base + AR71XX_GPIO_REG_FUNC);
+
+ spin_unlock_irqrestore(&ath79_gpio_lock, flags);
+}
+
+void ath79_gpio_function_setup(u32 set, u32 clear)
+{
+ void __iomem *base = ath79_gpio_base;
+ unsigned long flags;
+
+ spin_lock_irqsave(&ath79_gpio_lock, flags);
+
+ __raw_writel((__raw_readl(base + AR71XX_GPIO_REG_FUNC) & ~clear) | set,
+ base + AR71XX_GPIO_REG_FUNC);
+ /* flush write */
+ __raw_readl(base + AR71XX_GPIO_REG_FUNC);
+
+ spin_unlock_irqrestore(&ath79_gpio_lock, flags);
+}
+
+void __init ath79_gpio_init(void)
+{
+ int err;
+
+ if (soc_is_ar71xx())
+ ath79_gpio_count = AR71XX_GPIO_COUNT;
+ else if (soc_is_ar724x())
+ ath79_gpio_count = AR724X_GPIO_COUNT;
+ else if (soc_is_ar913x())
+ ath79_gpio_count = AR913X_GPIO_COUNT;
+ else
+ BUG();
+
+ ath79_gpio_base = ioremap_nocache(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE);
+ ath79_gpio_chip.ngpio = ath79_gpio_count;
+
+ err = gpiochip_add(&ath79_gpio_chip);
+ if (err)
+ panic("cannot add AR71xx GPIO chip, error=%d", err);
+}
+
+int gpio_get_value(unsigned gpio)
+{
+ if (gpio < ath79_gpio_count)
+ return __ath79_gpio_get_value(gpio);
+
+ return __gpio_get_value(gpio);
+}
+EXPORT_SYMBOL(gpio_get_value);
+
+void gpio_set_value(unsigned gpio, int value)
+{
+ if (gpio < ath79_gpio_count)
+ __ath79_gpio_set_value(gpio, value);
+ else
+ __gpio_set_value(gpio, value);
+}
+EXPORT_SYMBOL(gpio_set_value);
+
+int gpio_to_irq(unsigned gpio)
+{
+ /* FIXME */
+ return -EINVAL;
+}
+EXPORT_SYMBOL(gpio_to_irq);
+
+int irq_to_gpio(unsigned irq)
+{
+ /* FIXME */
+ return -EINVAL;
+}
+EXPORT_SYMBOL(irq_to_gpio);
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index ee620e1..dbbf050 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -230,7 +230,6 @@ void __init plat_mem_setup(void)
AR71XX_RESET_SIZE);
ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,
AR71XX_PLL_SIZE);
-
ath79_ddr_base = ioremap_nocache(AR71XX_DDR_CTRL_BASE,
AR71XX_DDR_CTRL_SIZE);
@@ -256,6 +255,7 @@ void __init plat_time_init(void)
static int __init ath79_setup(void)
{
+ ath79_gpio_init();
ath79_register_uart();
return 0;
}
diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index 5a9e5e1..7f2933d 100644
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -25,6 +25,8 @@
#define AR71XX_DDR_CTRL_SIZE 0x100
#define AR71XX_UART_BASE (AR71XX_APB_BASE + 0x00020000)
#define AR71XX_UART_SIZE 0x100
+#define AR71XX_GPIO_BASE (AR71XX_APB_BASE + 0x00040000)
+#define AR71XX_GPIO_SIZE 0x100
#define AR71XX_PLL_BASE (AR71XX_APB_BASE + 0x00050000)
#define AR71XX_PLL_SIZE 0x100
#define AR71XX_RESET_BASE (AR71XX_APB_BASE + 0x00060000)
@@ -204,4 +206,23 @@
#define AR71XX_SPI_IOC_CS_ALL (AR71XX_SPI_IOC_CS0 | AR71XX_SPI_IOC_CS1 | \
AR71XX_SPI_IOC_CS2)
+/*
+ * GPIO block
+ */
+#define AR71XX_GPIO_REG_OE 0x00
+#define AR71XX_GPIO_REG_IN 0x04
+#define AR71XX_GPIO_REG_OUT 0x08
+#define AR71XX_GPIO_REG_SET 0x0c
+#define AR71XX_GPIO_REG_CLEAR 0x10
+#define AR71XX_GPIO_REG_INT_MODE 0x14
+#define AR71XX_GPIO_REG_INT_TYPE 0x18
+#define AR71XX_GPIO_REG_INT_POLARITY 0x1c
+#define AR71XX_GPIO_REG_INT_PENDING 0x20
+#define AR71XX_GPIO_REG_INT_ENABLE 0x24
+#define AR71XX_GPIO_REG_FUNC 0x28
+
+#define AR71XX_GPIO_COUNT 16
+#define AR724X_GPIO_COUNT 18
+#define AR913X_GPIO_COUNT 22
+
#endif /* __ASM_MACH_AR71XX_REGS_H */
diff --git a/arch/mips/include/asm/mach-ath79/gpio.h b/arch/mips/include/asm/mach-ath79/gpio.h
new file mode 100644
index 0000000..60dcb62
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/gpio.h
@@ -0,0 +1,26 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X GPIO API definitions
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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.
+ *
+ */
+
+#ifndef __ASM_MACH_ATH79_GPIO_H
+#define __ASM_MACH_ATH79_GPIO_H
+
+#define ARCH_NR_GPIOS 64
+#include <asm-generic/gpio.h>
+
+int gpio_to_irq(unsigned gpio);
+int irq_to_gpio(unsigned irq);
+int gpio_get_value(unsigned gpio);
+void gpio_set_value(unsigned gpio, int value);
+
+#define gpio_cansleep __gpio_cansleep
+
+#endif /* __ASM_MACH_ATH79_GPIO_H */
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
2010-11-23 15:06 ` [PATCH 01/18] MIPS: add initial support for the Atheros AR71XX/AR724X/AR931X SoCs Gabor Juhos
2010-11-23 15:06 ` [PATCH 02/18] MIPS: ath79: add GPIOLIB support Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 18:29 ` Arnaud Lacombe
2010-11-23 15:06 ` [PATCH 04/18] MIPS: ath79: utilize the MIPS multi-machine support Gabor Juhos
` (15 subsequent siblings)
18 siblings, 1 reply; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
This patch adds a generic solution to support multiple machines based on
a given SoC within a single kernel image. It is implemented already for
several other architectures but MIPS has no generic support for that yet.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
Changes since RFC: ---
arch/mips/Kconfig | 3 +
arch/mips/include/asm/mips_machine.h | 54 +++++++++++++++++++++
arch/mips/kernel/Makefile | 1 +
arch/mips/kernel/mips_machine.c | 86 ++++++++++++++++++++++++++++++++++
arch/mips/kernel/proc.c | 7 ++-
arch/mips/kernel/vmlinux.lds.S | 7 +++
6 files changed, 157 insertions(+), 1 deletions(-)
create mode 100644 arch/mips/include/asm/mips_machine.h
create mode 100644 arch/mips/kernel/mips_machine.c
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ec69df5..307c2e4 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -899,6 +899,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
config SYNC_R4K
bool
+config MIPS_MACHINE
+ def_bool n
+
config NO_IOPORT
def_bool n
diff --git a/arch/mips/include/asm/mips_machine.h b/arch/mips/include/asm/mips_machine.h
new file mode 100644
index 0000000..363bb35
--- /dev/null
+++ b/arch/mips/include/asm/mips_machine.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * 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.
+ *
+ */
+
+#ifndef __ASM_MIPS_MACHINE_H
+#define __ASM_MIPS_MACHINE_H
+
+#include <linux/init.h>
+#include <linux/stddef.h>
+
+#include <asm/bootinfo.h>
+
+struct mips_machine {
+ unsigned long mach_type;
+ const char *mach_id;
+ const char *mach_name;
+ void (*mach_setup)(void);
+};
+
+#define MIPS_MACHINE(_type, _id, _name, _setup) \
+static const char machine_name_##_type[] __initconst \
+ __aligned(1) = _name; \
+static const char machine_id_##_type[] __initconst \
+ __aligned(1) = _id; \
+static struct mips_machine machine_##_type \
+ __used __section(.mips.machines.init) = \
+{ \
+ .mach_type = _type, \
+ .mach_id = machine_id_##_type, \
+ .mach_name = machine_name_##_type, \
+ .mach_setup = _setup, \
+};
+
+extern long __mips_machines_start;
+extern long __mips_machines_end;
+
+#ifdef CONFIG_MIPS_MACHINE
+int mips_machtype_setup(char *id) __init;
+void mips_machine_setup(void) __init;
+void mips_set_machine_name(const char *name) __init;
+char *mips_get_machine_name(void);
+#else
+static inline int mips_machtype_setup(char *id) { return 1; }
+static inline void mips_machine_setup(void) { }
+static inline void mips_set_machine_name(const char *name) { }
+static inline char *mips_get_machine_name(void) { return NULL; }
+#endif /* CONFIG_MIPS_MACHINE */
+
+#endif /* __ASM_MIPS_MACHINE_H */
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 22b2e0e..3977397 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -95,6 +95,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_SPINLOCK_TEST) += spinlock_test.o
+obj-$(CONFIG_MIPS_MACHINE) += mips_machine.o
obj-$(CONFIG_OF) += prom.o
diff --git a/arch/mips/kernel/mips_machine.c b/arch/mips/kernel/mips_machine.c
new file mode 100644
index 0000000..411a058
--- /dev/null
+++ b/arch/mips/kernel/mips_machine.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * 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/mm.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
+#include <asm/mips_machine.h>
+
+static struct mips_machine *mips_machine __initdata;
+static char *mips_machine_name = "Unknown";
+
+#define for_each_machine(mach) \
+ for ((mach) = (struct mips_machine *)&__mips_machines_start; \
+ (mach) && \
+ (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
+ (mach)++)
+
+__init void mips_set_machine_name(const char *name)
+{
+ char *p;
+
+ if (name == NULL)
+ return;
+
+ p = kstrdup(name, GFP_KERNEL);
+ if (!p)
+ pr_err("MIPS: no memory for machine_name\n");
+
+ mips_machine_name = p;
+}
+
+char *mips_get_machine_name(void)
+{
+ return mips_machine_name;
+}
+
+__init int mips_machtype_setup(char *id)
+{
+ struct mips_machine *mach;
+
+ for_each_machine(mach) {
+ if (mach->mach_id == NULL)
+ continue;
+
+ if (strcmp(mach->mach_id, id) == 0) {
+ mips_machtype = mach->mach_type;
+ return 0;
+ }
+ }
+
+ pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
+ pr_err("%-24s %s\n", "id", "name");
+ for_each_machine(mach)
+ pr_err("%-24s %s\n", mach->mach_id, mach->mach_name);
+
+ return 1;
+}
+
+__setup("machtype=", mips_machtype_setup);
+
+__init void mips_machine_setup(void)
+{
+ struct mips_machine *mach;
+
+ for_each_machine(mach) {
+ if (mips_machtype == mach->mach_type) {
+ mips_machine = mach;
+ break;
+ }
+ }
+
+ if (!mips_machine)
+ return;
+
+ mips_set_machine_name(mips_machine->mach_name);
+ pr_info("MIPS: machine is %s\n", mips_machine_name);
+
+ if (mips_machine->mach_setup)
+ mips_machine->mach_setup();
+}
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 26109c4..4195abb 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -12,6 +12,7 @@
#include <asm/cpu-features.h>
#include <asm/mipsregs.h>
#include <asm/processor.h>
+#include <asm/mips_machine.h>
unsigned int vced_count, vcei_count;
@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
/*
* For the first processor also print the system type
*/
- if (n == 0)
+ if (n == 0) {
seq_printf(m, "system type\t\t: %s\n", get_system_type());
+ if (mips_get_machine_name())
+ seq_printf(m, "machine\t\t\t: %s\n",
+ mips_get_machine_name());
+ }
seq_printf(m, "processor\t\t: %ld\n", n);
sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index f25df73..570607b 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -98,6 +98,13 @@ SECTIONS
INIT_TEXT_SECTION(PAGE_SIZE)
INIT_DATA_SECTION(16)
+ . = ALIGN(4);
+ .mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
+ __mips_machines_start = .;
+ *(.mips.machines.init)
+ __mips_machines_end = .;
+ }
+
/* .exit.text is discarded at runtime, not link time, to deal with
* references from .rodata
*/
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel
2010-11-23 15:06 ` [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel Gabor Juhos
@ 2010-11-23 18:29 ` Arnaud Lacombe
2010-11-23 18:49 ` Luis R. Rodriguez
2010-11-23 18:51 ` Gabor Juhos
0 siblings, 2 replies; 62+ messages in thread
From: Arnaud Lacombe @ 2010-11-23 18:29 UTC (permalink / raw)
To: Gabor Juhos, Felix Fietkau
Cc: Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden
Hi,
On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
> This patch adds a generic solution to support multiple machines based on
> a given SoC within a single kernel image. It is implemented already for
> several other architectures but MIPS has no generic support for that yet.
>
Is this the way `arch/mips' wants to go to support multiple machine
within a same kernel image ? Flattened Device Tree is the other way to
achieve that. I remind the latter being proposed by Felix Fietkau on
#openwrt.
Thanks,
- Arnaud
> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
> ---
>
> Changes since RFC: ---
>
> arch/mips/Kconfig | 3 +
> arch/mips/include/asm/mips_machine.h | 54 +++++++++++++++++++++
> arch/mips/kernel/Makefile | 1 +
> arch/mips/kernel/mips_machine.c | 86 ++++++++++++++++++++++++++++++++++
> arch/mips/kernel/proc.c | 7 ++-
> arch/mips/kernel/vmlinux.lds.S | 7 +++
> 6 files changed, 157 insertions(+), 1 deletions(-)
> create mode 100644 arch/mips/include/asm/mips_machine.h
> create mode 100644 arch/mips/kernel/mips_machine.c
>
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index ec69df5..307c2e4 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -899,6 +899,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
> config SYNC_R4K
> bool
>
> +config MIPS_MACHINE
> + def_bool n
> +
> config NO_IOPORT
> def_bool n
>
> diff --git a/arch/mips/include/asm/mips_machine.h b/arch/mips/include/asm/mips_machine.h
> new file mode 100644
> index 0000000..363bb35
> --- /dev/null
> +++ b/arch/mips/include/asm/mips_machine.h
> @@ -0,0 +1,54 @@
> +/*
> + * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
> + *
> + * 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.
> + *
> + */
> +
> +#ifndef __ASM_MIPS_MACHINE_H
> +#define __ASM_MIPS_MACHINE_H
> +
> +#include <linux/init.h>
> +#include <linux/stddef.h>
> +
> +#include <asm/bootinfo.h>
> +
> +struct mips_machine {
> + unsigned long mach_type;
> + const char *mach_id;
> + const char *mach_name;
> + void (*mach_setup)(void);
> +};
> +
> +#define MIPS_MACHINE(_type, _id, _name, _setup) \
> +static const char machine_name_##_type[] __initconst \
> + __aligned(1) = _name; \
> +static const char machine_id_##_type[] __initconst \
> + __aligned(1) = _id; \
> +static struct mips_machine machine_##_type \
> + __used __section(.mips.machines.init) = \
> +{ \
> + .mach_type = _type, \
> + .mach_id = machine_id_##_type, \
> + .mach_name = machine_name_##_type, \
> + .mach_setup = _setup, \
> +};
> +
> +extern long __mips_machines_start;
> +extern long __mips_machines_end;
> +
> +#ifdef CONFIG_MIPS_MACHINE
> +int mips_machtype_setup(char *id) __init;
> +void mips_machine_setup(void) __init;
> +void mips_set_machine_name(const char *name) __init;
> +char *mips_get_machine_name(void);
> +#else
> +static inline int mips_machtype_setup(char *id) { return 1; }
> +static inline void mips_machine_setup(void) { }
> +static inline void mips_set_machine_name(const char *name) { }
> +static inline char *mips_get_machine_name(void) { return NULL; }
> +#endif /* CONFIG_MIPS_MACHINE */
> +
> +#endif /* __ASM_MIPS_MACHINE_H */
> diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
> index 22b2e0e..3977397 100644
> --- a/arch/mips/kernel/Makefile
> +++ b/arch/mips/kernel/Makefile
> @@ -95,6 +95,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o
> obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
> obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
> obj-$(CONFIG_SPINLOCK_TEST) += spinlock_test.o
> +obj-$(CONFIG_MIPS_MACHINE) += mips_machine.o
>
> obj-$(CONFIG_OF) += prom.o
>
> diff --git a/arch/mips/kernel/mips_machine.c b/arch/mips/kernel/mips_machine.c
> new file mode 100644
> index 0000000..411a058
> --- /dev/null
> +++ b/arch/mips/kernel/mips_machine.c
> @@ -0,0 +1,86 @@
> +/*
> + * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
> + *
> + * 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/mm.h>
> +#include <linux/string.h>
> +#include <linux/slab.h>
> +
> +#include <asm/mips_machine.h>
> +
> +static struct mips_machine *mips_machine __initdata;
> +static char *mips_machine_name = "Unknown";
> +
> +#define for_each_machine(mach) \
> + for ((mach) = (struct mips_machine *)&__mips_machines_start; \
> + (mach) && \
> + (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
> + (mach)++)
> +
> +__init void mips_set_machine_name(const char *name)
> +{
> + char *p;
> +
> + if (name == NULL)
> + return;
> +
> + p = kstrdup(name, GFP_KERNEL);
> + if (!p)
> + pr_err("MIPS: no memory for machine_name\n");
> +
> + mips_machine_name = p;
> +}
> +
> +char *mips_get_machine_name(void)
> +{
> + return mips_machine_name;
> +}
> +
> +__init int mips_machtype_setup(char *id)
> +{
> + struct mips_machine *mach;
> +
> + for_each_machine(mach) {
> + if (mach->mach_id == NULL)
> + continue;
> +
> + if (strcmp(mach->mach_id, id) == 0) {
> + mips_machtype = mach->mach_type;
> + return 0;
> + }
> + }
> +
> + pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
> + pr_err("%-24s %s\n", "id", "name");
> + for_each_machine(mach)
> + pr_err("%-24s %s\n", mach->mach_id, mach->mach_name);
> +
> + return 1;
> +}
> +
> +__setup("machtype=", mips_machtype_setup);
> +
> +__init void mips_machine_setup(void)
> +{
> + struct mips_machine *mach;
> +
> + for_each_machine(mach) {
> + if (mips_machtype == mach->mach_type) {
> + mips_machine = mach;
> + break;
> + }
> + }
> +
> + if (!mips_machine)
> + return;
> +
> + mips_set_machine_name(mips_machine->mach_name);
> + pr_info("MIPS: machine is %s\n", mips_machine_name);
> +
> + if (mips_machine->mach_setup)
> + mips_machine->mach_setup();
> +}
> diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
> index 26109c4..4195abb 100644
> --- a/arch/mips/kernel/proc.c
> +++ b/arch/mips/kernel/proc.c
> @@ -12,6 +12,7 @@
> #include <asm/cpu-features.h>
> #include <asm/mipsregs.h>
> #include <asm/processor.h>
> +#include <asm/mips_machine.h>
>
> unsigned int vced_count, vcei_count;
>
> @@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
> /*
> * For the first processor also print the system type
> */
> - if (n == 0)
> + if (n == 0) {
> seq_printf(m, "system type\t\t: %s\n", get_system_type());
> + if (mips_get_machine_name())
> + seq_printf(m, "machine\t\t\t: %s\n",
> + mips_get_machine_name());
> + }
>
> seq_printf(m, "processor\t\t: %ld\n", n);
> sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
> diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
> index f25df73..570607b 100644
> --- a/arch/mips/kernel/vmlinux.lds.S
> +++ b/arch/mips/kernel/vmlinux.lds.S
> @@ -98,6 +98,13 @@ SECTIONS
> INIT_TEXT_SECTION(PAGE_SIZE)
> INIT_DATA_SECTION(16)
>
> + . = ALIGN(4);
> + .mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
> + __mips_machines_start = .;
> + *(.mips.machines.init)
> + __mips_machines_end = .;
> + }
> +
> /* .exit.text is discarded at runtime, not link time, to deal with
> * references from .rodata
> */
> --
> 1.7.2.1
>
>
>
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel
2010-11-23 18:29 ` Arnaud Lacombe
@ 2010-11-23 18:49 ` Luis R. Rodriguez
2010-11-23 18:51 ` Gabor Juhos
1 sibling, 0 replies; 62+ messages in thread
From: Luis R. Rodriguez @ 2010-11-23 18:49 UTC (permalink / raw)
To: Arnaud Lacombe
Cc: Gabor Juhos, Felix Fietkau, Ralf Baechle,
linux-mips@linux-mips.org, kaloz@openwrt.org, Luis Rodriguez,
Cliff Holden
On Tue, Nov 23, 2010 at 10:29:49AM -0800, Arnaud Lacombe wrote:
> Hi,
>
> On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
> > This patch adds a generic solution to support multiple machines based on
> > a given SoC within a single kernel image. It is implemented already for
> > several other architectures but MIPS has no generic support for that yet.
> >
> Is this the way `arch/mips' wants to go to support multiple machine
> within a same kernel image ? Flattened Device Tree is the other way to
> achieve that. I remind the latter being proposed by Felix Fietkau on
> #openwrt.
We either do this now or later. If now it means more work and we'd have
to wait until the work is done. If no one is working on it right now
it seems easier to submit this as is for now and later get the port
done to the device tree model.
Luis
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel
2010-11-23 18:29 ` Arnaud Lacombe
2010-11-23 18:49 ` Luis R. Rodriguez
@ 2010-11-23 18:51 ` Gabor Juhos
2010-11-23 19:06 ` Felix Fietkau
1 sibling, 1 reply; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 18:51 UTC (permalink / raw)
To: Arnaud Lacombe
Cc: Felix Fietkau, Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez,
Cliff Holden
Hi Arnaud,
> On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
>> This patch adds a generic solution to support multiple machines based on
>> a given SoC within a single kernel image. It is implemented already for
>> several other architectures but MIPS has no generic support for that yet.
>>
> Is this the way `arch/mips' wants to go to support multiple machine
> within a same kernel image ?
I don't know yet what will be the chosen way.
> Flattened Device Tree is the other way to achieve that. I remind the latter
> being proposed by Felix Fietkau on #openwrt.
FDT makes sense when the bootloader supports that. FDT makes sense when the
bootloader supports that, but i'm not aware of any AR71xx/AR724x/AR913x based
board which has such bootloader. Additionally, the device-tree support for MIPS
has been added only recently and none of the existing MIPS boards are using that
yet AFAIK. If that will be widely used we can consider to switch to that later.
Regards,
Gabor
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel
2010-11-23 18:51 ` Gabor Juhos
@ 2010-11-23 19:06 ` Felix Fietkau
2010-11-23 19:20 ` David Daney
0 siblings, 1 reply; 62+ messages in thread
From: Felix Fietkau @ 2010-11-23 19:06 UTC (permalink / raw)
To: Gabor Juhos
Cc: Arnaud Lacombe, Ralf Baechle, linux-mips, kaloz,
Luis R. Rodriguez, Cliff Holden
On 2010-11-23 7:51 PM, Gabor Juhos wrote:
> Hi Arnaud,
>
>> On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
>>> This patch adds a generic solution to support multiple machines based on
>>> a given SoC within a single kernel image. It is implemented already for
>>> several other architectures but MIPS has no generic support for that yet.
>>>
>> Is this the way `arch/mips' wants to go to support multiple machine
>> within a same kernel image ?
>
> I don't know yet what will be the chosen way.
>
>> Flattened Device Tree is the other way to achieve that. I remind the latter
>> being proposed by Felix Fietkau on #openwrt.
>
> FDT makes sense when the bootloader supports that. FDT makes sense when the
> bootloader supports that, but i'm not aware of any AR71xx/AR724x/AR913x based
> board which has such bootloader. Additionally, the device-tree support for MIPS
> has been added only recently and none of the existing MIPS boards are using that
> yet AFAIK. If that will be widely used we can consider to switch to that later.
We don't need boot loader support, we can make a simple loader stub that
passes the FDT data to the kernel. It would certainly be better than our
current cmdline hack ;)
I think using FDT would save us a lot of maintenance work, as we
wouldn't have to change the kernel for every single new board that we
add support for.
- Felix
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel
2010-11-23 19:06 ` Felix Fietkau
@ 2010-11-23 19:20 ` David Daney
2010-11-23 22:12 ` Ralf Baechle
0 siblings, 1 reply; 62+ messages in thread
From: David Daney @ 2010-11-23 19:20 UTC (permalink / raw)
To: Felix Fietkau
Cc: Gabor Juhos, Arnaud Lacombe, Ralf Baechle, linux-mips, kaloz,
Luis R. Rodriguez, Cliff Holden
On 11/23/2010 11:06 AM, Felix Fietkau wrote:
> On 2010-11-23 7:51 PM, Gabor Juhos wrote:
>> Hi Arnaud,
>>
>>> On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos<juhosg@openwrt.org> wrote:
>>>> This patch adds a generic solution to support multiple machines based on
>>>> a given SoC within a single kernel image. It is implemented already for
>>>> several other architectures but MIPS has no generic support for that yet.
>>>>
>>> Is this the way `arch/mips' wants to go to support multiple machine
>>> within a same kernel image ?
>>
>> I don't know yet what will be the chosen way.
>>
>>> Flattened Device Tree is the other way to achieve that. I remind the latter
>>> being proposed by Felix Fietkau on #openwrt.
>>
>> FDT makes sense when the bootloader supports that. FDT makes sense when the
>> bootloader supports that, but i'm not aware of any AR71xx/AR724x/AR913x based
>> board which has such bootloader. Additionally, the device-tree support for MIPS
>> has been added only recently and none of the existing MIPS boards are using that
>> yet AFAIK. If that will be widely used we can consider to switch to that later.
> We don't need boot loader support, we can make a simple loader stub that
> passes the FDT data to the kernel. It would certainly be better than our
> current cmdline hack ;)
> I think using FDT would save us a lot of maintenance work, as we
> wouldn't have to change the kernel for every single new board that we
> add support for.
>
For what it's worth, the FDT support in the kernel is almost completely
generic. The appropriate hooks are already in the mips archetecture
support, but most of the contents of arch/mips/kernel/prom.c will likely
need to be moved to chip/board specific files.
Over the next few weeks I plan on sending out patches to the
cavium-octeon support to convert it to use the FDT. So I don't think it
is out of the question that other chips would start to use it as well.
David Daney
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel
2010-11-23 19:20 ` David Daney
@ 2010-11-23 22:12 ` Ralf Baechle
0 siblings, 0 replies; 62+ messages in thread
From: Ralf Baechle @ 2010-11-23 22:12 UTC (permalink / raw)
To: David Daney
Cc: Felix Fietkau, Gabor Juhos, Arnaud Lacombe, linux-mips, kaloz,
Luis R. Rodriguez, Cliff Holden
On Tue, Nov 23, 2010 at 11:20:01AM -0800, David Daney wrote:
> For what it's worth, the FDT support in the kernel is almost
> completely generic. The appropriate hooks are already in the mips
> archetecture support, but most of the contents of
> arch/mips/kernel/prom.c will likely need to be moved to chip/board
> specific files.
>
> Over the next few weeks I plan on sending out patches to the
> cavium-octeon support to convert it to use the FDT. So I don't
> think it is out of the question that other chips would start to use
> it as well.
I'm willing to accept this patch because DT is still being introduced into the
kernel. It's new, it's not entirely trivial and it will take some time until
everybody is up to speed and I just can't stall new submissions until that
changes. Even though this is a patch which we actually don't want ...
So queued for 2.6.38. Thanks!
Ralf
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCH 04/18] MIPS: ath79: utilize the MIPS multi-machine support
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (2 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 03/18] MIPS: add generic support for multiple machines within a single kernel Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 05/18] MIPS: ath79: add initial support for the Atheros PB44 reference board Gabor Juhos
` (14 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
Changes since RFC: ---
arch/mips/Kconfig | 1 +
arch/mips/ath79/machtypes.h | 21 +++++++++++++++++++++
arch/mips/ath79/setup.c | 15 +++++++++++++++
3 files changed, 37 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/ath79/machtypes.h
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 307c2e4..047b8f7 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -73,6 +73,7 @@ config ATH79
select CSRC_R4K
select DMA_NONCOHERENT
select IRQ_CPU
+ select MIPS_MACHINE
select SYS_HAS_CPU_MIPS32_R2
select SYS_HAS_EARLY_PRINTK
select SYS_SUPPORTS_32BIT_KERNEL
diff --git a/arch/mips/ath79/machtypes.h b/arch/mips/ath79/machtypes.h
new file mode 100644
index 0000000..fac0e26
--- /dev/null
+++ b/arch/mips/ath79/machtypes.h
@@ -0,0 +1,21 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X machine type definitions
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_MACHTYPE_H
+#define _ATH79_MACHTYPE_H
+
+#include <asm/mips_machine.h>
+
+enum ath79_mach_type {
+ ATH79_MACH_GENERIC = 0,
+};
+
+#endif /* _ATH79_MACHTYPE_H */
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index dbbf050..8600044 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -18,11 +18,13 @@
#include <asm/bootinfo.h>
#include <asm/time.h> /* for mips_hpt_frequency */
#include <asm/reboot.h> /* for _machine_{restart,halt} */
+#include <asm/mips_machine.h>
#include <asm/mach-ath79/ath79.h>
#include <asm/mach-ath79/ar71xx_regs.h>
#include "common.h"
#include "dev-common.h"
+#include "machtypes.h"
#define ATH79_SYS_TYPE_LEN 64
@@ -257,7 +259,20 @@ static int __init ath79_setup(void)
{
ath79_gpio_init();
ath79_register_uart();
+
+ mips_machine_setup();
+
return 0;
}
arch_initcall(ath79_setup);
+
+static void __init ath79_generic_init(void)
+{
+ /* Nothing to do */
+}
+
+MIPS_MACHINE(ATH79_MACH_GENERIC,
+ "Generic",
+ "Generic AR71XX/AR724X/AR913X based board",
+ ath79_generic_init);
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 05/18] MIPS: ath79: add initial support for the Atheros PB44 reference board
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (3 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 04/18] MIPS: ath79: utilize the MIPS multi-machine support Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 06/18] MIPS: ath79: add common GPIO LEDs device Gabor Juhos
` (13 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
Changes since RFC:
- don't use 'default n' for the ATH79_MACH_PB44 Kconfig option
arch/mips/ath79/Kconfig | 11 ++++++++
arch/mips/ath79/Makefile | 5 ++++
arch/mips/ath79/mach-pb44.c | 56 +++++++++++++++++++++++++++++++++++++++++++
arch/mips/ath79/machtypes.h | 1 +
4 files changed, 73 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/ath79/mach-pb44.c
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 50b9334..fabb2b0 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -1,5 +1,16 @@
if ATH79
+menu "Atheros AR71XX/AR724X/AR913X machine selection"
+
+config ATH79_MACH_PB44
+ bool "Atheros PB44 reference board"
+ select SOC_AR71XX
+ help
+ Say 'Y' here if you want your kernel to support the
+ Atheros PB44 reference board.
+
+endmenu
+
config SOC_AR71XX
def_bool n
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index facbb70..a9ba120 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -16,3 +16,8 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
# Devices
#
obj-y += dev-common.o
+
+#
+# Machines
+#
+obj-$(CONFIG_ATH79_MACH_PB44) += mach-pb44.o
diff --git a/arch/mips/ath79/mach-pb44.c b/arch/mips/ath79/mach-pb44.c
new file mode 100644
index 0000000..ffc24d7
--- /dev/null
+++ b/arch/mips/ath79/mach-pb44.c
@@ -0,0 +1,56 @@
+/*
+ * Atheros PB44 reference board support
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * 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 <linux/i2c.h>
+#include <linux/i2c-gpio.h>
+#include <linux/i2c/pcf857x.h>
+
+#include "machtypes.h"
+
+#define PB44_GPIO_I2C_SCL 0
+#define PB44_GPIO_I2C_SDA 1
+
+#define PB44_GPIO_EXP_BASE 16
+
+static struct i2c_gpio_platform_data pb44_i2c_gpio_data = {
+ .sda_pin = PB44_GPIO_I2C_SDA,
+ .scl_pin = PB44_GPIO_I2C_SCL,
+};
+
+static struct platform_device pb44_i2c_gpio_device = {
+ .name = "i2c-gpio",
+ .id = 0,
+ .dev = {
+ .platform_data = &pb44_i2c_gpio_data,
+ }
+};
+
+static struct pcf857x_platform_data pb44_pcf857x_data = {
+ .gpio_base = PB44_GPIO_EXP_BASE,
+};
+
+static struct i2c_board_info pb44_i2c_board_info[] __initdata = {
+ {
+ I2C_BOARD_INFO("pcf8575", 0x20),
+ .platform_data = &pb44_pcf857x_data,
+ },
+};
+
+static void __init pb44_init(void)
+{
+ i2c_register_board_info(0, pb44_i2c_board_info,
+ ARRAY_SIZE(pb44_i2c_board_info));
+ platform_device_register(&pb44_i2c_gpio_device);
+}
+
+MIPS_MACHINE(ATH79_MACH_PB44, "PB44", "Atheros PB44 reference board",
+ pb44_init);
diff --git a/arch/mips/ath79/machtypes.h b/arch/mips/ath79/machtypes.h
index fac0e26..a796fa3 100644
--- a/arch/mips/ath79/machtypes.h
+++ b/arch/mips/ath79/machtypes.h
@@ -16,6 +16,7 @@
enum ath79_mach_type {
ATH79_MACH_GENERIC = 0,
+ ATH79_MACH_PB44, /* Atheros PB44 reference board */
};
#endif /* _ATH79_MACHTYPE_H */
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 06/18] MIPS: ath79: add common GPIO LEDs device
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (4 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 05/18] MIPS: ath79: add initial support for the Atheros PB44 reference board Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 07/18] watchdog: add driver for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (12 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
Almost all boards have one or more LEDs connected to GPIO lines. This
patch adds common code to register a platform_device for them.
The patch also adds support for the LEDs on the PB44 board.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
Changes since RFC: ---
arch/mips/ath79/Kconfig | 4 +++
arch/mips/ath79/Makefile | 1 +
arch/mips/ath79/dev-leds-gpio.c | 56 +++++++++++++++++++++++++++++++++++++++
arch/mips/ath79/dev-leds-gpio.h | 21 ++++++++++++++
arch/mips/ath79/mach-pb44.c | 18 ++++++++++++
5 files changed, 100 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/ath79/dev-leds-gpio.c
create mode 100644 arch/mips/ath79/dev-leds-gpio.h
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index fabb2b0..5bc480e 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -5,6 +5,7 @@ menu "Atheros AR71XX/AR724X/AR913X machine selection"
config ATH79_MACH_PB44
bool "Atheros PB44 reference board"
select SOC_AR71XX
+ select ATH79_DEV_LEDS_GPIO
help
Say 'Y' here if you want your kernel to support the
Atheros PB44 reference board.
@@ -20,4 +21,7 @@ config SOC_AR724X
config SOC_AR913X
def_bool n
+config ATH79_DEV_LEDS_GPIO
+ def_bool n
+
endif
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index a9ba120..d14b597 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
# Devices
#
obj-y += dev-common.o
+obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o
#
# Machines
diff --git a/arch/mips/ath79/dev-leds-gpio.c b/arch/mips/ath79/dev-leds-gpio.c
new file mode 100644
index 0000000..cdade68
--- /dev/null
+++ b/arch/mips/ath79/dev-leds-gpio.c
@@ -0,0 +1,56 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X common GPIO LEDs support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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/slab.h>
+#include <linux/platform_device.h>
+
+#include "dev-leds-gpio.h"
+
+void __init ath79_register_leds_gpio(int id,
+ unsigned num_leds,
+ struct gpio_led *leds)
+{
+ struct platform_device *pdev;
+ struct gpio_led_platform_data pdata;
+ struct gpio_led *p;
+ int err;
+
+ p = kmalloc(num_leds * sizeof(*p), GFP_KERNEL);
+ if (!p)
+ return;
+
+ memcpy(p, leds, num_leds * sizeof(*p));
+
+ pdev = platform_device_alloc("leds-gpio", id);
+ if (!pdev)
+ goto err_free_leds;
+
+ memset(&pdata, 0, sizeof(pdata));
+ pdata.num_leds = num_leds;
+ pdata.leds = p;
+
+ err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+ if (err)
+ goto err_put_pdev;
+
+ err = platform_device_add(pdev);
+ if (err)
+ goto err_put_pdev;
+
+ return;
+
+err_put_pdev:
+ platform_device_put(pdev);
+
+err_free_leds:
+ kfree(p);
+}
diff --git a/arch/mips/ath79/dev-leds-gpio.h b/arch/mips/ath79/dev-leds-gpio.h
new file mode 100644
index 0000000..0fb0ed1
--- /dev/null
+++ b/arch/mips/ath79/dev-leds-gpio.h
@@ -0,0 +1,21 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X common GPIO LEDs support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_DEV_LEDS_GPIO_H
+#define _ATH79_DEV_LEDS_GPIO_H
+
+#include <linux/leds.h>
+
+void ath79_register_leds_gpio(int id,
+ unsigned num_leds,
+ struct gpio_led *leds) __init;
+
+#endif /* _ATH79_DEV_LEDS_GPIO_H */
diff --git a/arch/mips/ath79/mach-pb44.c b/arch/mips/ath79/mach-pb44.c
index ffc24d7..e176779 100644
--- a/arch/mips/ath79/mach-pb44.c
+++ b/arch/mips/ath79/mach-pb44.c
@@ -15,11 +15,14 @@
#include <linux/i2c/pcf857x.h>
#include "machtypes.h"
+#include "dev-leds-gpio.h"
#define PB44_GPIO_I2C_SCL 0
#define PB44_GPIO_I2C_SDA 1
#define PB44_GPIO_EXP_BASE 16
+#define PB44_GPIO_LED_JUMP1 (PB44_GPIO_EXP_BASE + 9)
+#define PB44_GPIO_LED_JUMP2 (PB44_GPIO_EXP_BASE + 10)
static struct i2c_gpio_platform_data pb44_i2c_gpio_data = {
.sda_pin = PB44_GPIO_I2C_SDA,
@@ -45,11 +48,26 @@ static struct i2c_board_info pb44_i2c_board_info[] __initdata = {
},
};
+static struct gpio_led pb44_leds_gpio[] __initdata = {
+ {
+ .name = "pb44:amber:jump1",
+ .gpio = PB44_GPIO_LED_JUMP1,
+ .active_low = 1,
+ }, {
+ .name = "pb44:green:jump2",
+ .gpio = PB44_GPIO_LED_JUMP2,
+ .active_low = 1,
+ },
+};
+
static void __init pb44_init(void)
{
i2c_register_board_info(0, pb44_i2c_board_info,
ARRAY_SIZE(pb44_i2c_board_info));
platform_device_register(&pb44_i2c_gpio_device);
+
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(pb44_leds_gpio),
+ pb44_leds_gpio);
}
MIPS_MACHINE(ATH79_MACH_PB44, "PB44", "Atheros PB44 reference board",
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 07/18] watchdog: add driver for the Atheros AR71XX/AR724X/AR913X SoCs
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (5 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 06/18] MIPS: ath79: add common GPIO LEDs device Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 08/18] MIPS: ath79: add common watchdog device Gabor Juhos
` (11 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos,
Wim Van Sebroeck, linux-watchdog
This patch adds a driver for the built-in hardware watchdog device
of the Atheros AR71XX/AR724X/AR913X SoCs.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-watchdog@vger.kernel.org
---
Changes since RFC: ---
drivers/watchdog/Kconfig | 8 +
drivers/watchdog/Makefile | 1 +
drivers/watchdog/ath79_wdt.c | 293 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 302 insertions(+), 0 deletions(-)
create mode 100644 drivers/watchdog/ath79_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 4a29104..998eed3 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -927,6 +927,14 @@ config BCM63XX_WDT
To compile this driver as a loadable module, choose M here.
The module will be called bcm63xx_wdt.
+config ATH79_WDT
+ tristate "Atheros AR71XX/AR724X/AR913X hardware watchdog"
+ depends on ATH79
+ help
+ Hardware driver for the built-in watchdog timer on the Atheros
+ AR71XX/AR724X/AR913X SoCs.
+
+
# PARISC Architecture
# POWERPC Architecture
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 4b0ef38..6d7af07 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -117,6 +117,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
+obj-$(CONFIG_ATH79_WDT) += ath79_wdt.o
obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
new file mode 100644
index 0000000..f8e027b
--- /dev/null
+++ b/drivers/watchdog/ath79_wdt.c
@@ -0,0 +1,293 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X built-in hardware watchdog timer.
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This driver was based on: drivers/watchdog/ixp4xx_wdt.c
+ * Author: Deepak Saxena <dsaxena@plexity.net>
+ * Copyright 2004 (c) MontaVista, Software, Inc.
+ *
+ * which again was based on sa1100 driver,
+ * Copyright (C) 2000 Oleg Drokin <green@crimea.edu>
+ *
+ * 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/bitops.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+#include <linux/types.h>
+#include <linux/reboot.h>
+#include <linux/watchdog.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#define DRIVER_NAME "ath79-wdt"
+#define DRIVER_DESC "Atheros AR71XX/AR724X/AR913X hardware watchdog driver"
+
+#define WDT_TIMEOUT 15 /* seconds */
+
+#define WDOG_CTRL_LAST_RESET BIT(31)
+#define WDOG_CTRL_ACTION_MASK 3
+#define WDOG_CTRL_ACTION_NONE 0 /* no action */
+#define WDOG_CTRL_ACTION_GPI 1 /* general purpose interrupt */
+#define WDOG_CTRL_ACTION_NMI 2 /* NMI */
+#define WDOG_CTRL_ACTION_FCR 3 /* full chip reset */
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
+ "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+#endif
+
+static unsigned long wdt_flags;
+
+#define WDT_FLAGS_BUSY 0
+#define WDT_FLAGS_EXPECT_CLOSE 1
+
+static int wdt_timeout = WDT_TIMEOUT;
+static int boot_status;
+static int max_timeout;
+
+static inline void ath79_wdt_keepalive(void)
+{
+ ath79_reset_wr(AR71XX_RESET_REG_WDOG, ath79_ahb_freq * wdt_timeout);
+}
+
+static inline void ath79_wdt_enable(void)
+{
+ ath79_wdt_keepalive();
+ ath79_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_FCR);
+}
+
+static inline void ath79_wdt_disable(void)
+{
+ ath79_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_NONE);
+}
+
+static int ath79_wdt_set_timeout(int val)
+{
+ if (val < 1 || val > max_timeout)
+ return -EINVAL;
+
+ wdt_timeout = val;
+ ath79_wdt_keepalive();
+
+ return 0;
+}
+
+static int ath79_wdt_open(struct inode *inode, struct file *file)
+{
+ if (test_and_set_bit(WDT_FLAGS_BUSY, &wdt_flags))
+ return -EBUSY;
+
+ clear_bit(WDT_FLAGS_EXPECT_CLOSE, &wdt_flags);
+ ath79_wdt_enable();
+
+ return nonseekable_open(inode, file);
+}
+
+static int ath79_wdt_release(struct inode *inode, struct file *file)
+{
+ if (test_bit(WDT_FLAGS_EXPECT_CLOSE, &wdt_flags))
+ ath79_wdt_disable();
+ else
+ pr_crit(DRIVER_NAME ": device closed unexpectedly, "
+ "watchdog timer will not stop!\n");
+
+ clear_bit(WDT_FLAGS_BUSY, &wdt_flags);
+ clear_bit(WDT_FLAGS_EXPECT_CLOSE, &wdt_flags);
+
+ return 0;
+}
+
+static ssize_t ath79_wdt_write(struct file *file, const char *data,
+ size_t len, loff_t *ppos)
+{
+ if (len) {
+ if (!nowayout) {
+ size_t i;
+
+ clear_bit(WDT_FLAGS_EXPECT_CLOSE, &wdt_flags);
+
+ for (i = 0; i != len; i++) {
+ char c;
+
+ if (get_user(c, data + i))
+ return -EFAULT;
+
+ if (c == 'V')
+ set_bit(WDT_FLAGS_EXPECT_CLOSE,
+ &wdt_flags);
+ }
+ }
+
+ ath79_wdt_keepalive();
+ }
+
+ return len;
+}
+
+static const struct watchdog_info ath79_wdt_info = {
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
+ WDIOF_MAGICCLOSE | WDIOF_CARDRESET,
+ .firmware_version = 0,
+ .identity = "ATH79 watchdog",
+};
+
+static long ath79_wdt_ioctl(struct file *file, unsigned int cmd,
+ unsigned long arg)
+{
+ void __user *argp = (void __user *)arg;
+ int __user *p = argp;
+ int err;
+ int t;
+
+ switch (cmd) {
+ case WDIOC_GETSUPPORT:
+ err = copy_to_user(argp, &ath79_wdt_info,
+ sizeof(ath79_wdt_info)) ? -EFAULT : 0;
+ break;
+
+ case WDIOC_GETSTATUS:
+ err = put_user(0, p);
+ break;
+
+ case WDIOC_GETBOOTSTATUS:
+ err = put_user(boot_status, p);
+ break;
+
+ case WDIOC_KEEPALIVE:
+ ath79_wdt_keepalive();
+ err = 0;
+ break;
+
+ case WDIOC_SETTIMEOUT:
+ err = get_user(t, p);
+ if (err)
+ break;
+
+ err = ath79_wdt_set_timeout(t);
+ if (err)
+ break;
+
+ /* fallthrough */
+ case WDIOC_GETTIMEOUT:
+ err = put_user(wdt_timeout, p);
+ break;
+
+ default:
+ err = -ENOTTY;
+ break;
+ }
+
+ return err;
+}
+
+static const struct file_operations ath79_wdt_fops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .write = ath79_wdt_write,
+ .unlocked_ioctl = ath79_wdt_ioctl,
+ .open = ath79_wdt_open,
+ .release = ath79_wdt_release,
+};
+
+static int ath79_wdt_notify_sys(struct notifier_block *this,
+ unsigned long code, void *unused)
+{
+ if (code == SYS_DOWN || code == SYS_HALT)
+ ath79_wdt_disable();
+
+ return NOTIFY_DONE;
+}
+
+static struct notifier_block ath79_wdt_notifier = {
+ .notifier_call = ath79_wdt_notify_sys,
+};
+
+static struct miscdevice ath79_wdt_miscdev = {
+ .minor = WATCHDOG_MINOR,
+ .name = "watchdog",
+ .fops = &ath79_wdt_fops,
+};
+
+static int __init ath79_wdt_probe(struct platform_device *pdev)
+{
+ u32 ctrl;
+ int err;
+
+ max_timeout = (0xfffffffful / ath79_ahb_freq);
+ wdt_timeout = (max_timeout < WDT_TIMEOUT) ? max_timeout : WDT_TIMEOUT;
+
+ ctrl = ath79_reset_rr(AR71XX_RESET_REG_WDOG_CTRL);
+ boot_status = (ctrl & WDOG_CTRL_LAST_RESET) ? WDIOF_CARDRESET : 0;
+
+ err = register_reboot_notifier(&ath79_wdt_notifier);
+ if (err) {
+ dev_err(&pdev->dev,
+ "unable to register reboot notifier, err=%d\n", err);
+ goto err;
+ }
+
+ err = misc_register(&ath79_wdt_miscdev);
+ if (err) {
+ dev_err(&pdev->dev,
+ "unable to register misc device, err=%d\n", err);
+ goto err_unregister;
+ }
+
+ return 0;
+
+err_unregister:
+ unregister_reboot_notifier(&ath79_wdt_notifier);
+
+err:
+ return err;
+}
+
+static int __exit ath79_wdt_remove(struct platform_device *pdev)
+{
+ misc_deregister(&ath79_wdt_miscdev);
+ return 0;
+}
+
+static struct platform_driver ath79_wdt_driver = {
+ .remove = __exit_p(ath79_wdt_remove),
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init ath79_wdt_init(void)
+{
+ return platform_driver_probe(&ath79_wdt_driver, ath79_wdt_probe);
+}
+module_init(ath79_wdt_init);
+
+static void __exit ath79_wdt_exit(void)
+{
+ platform_driver_unregister(&ath79_wdt_driver);
+}
+module_exit(ath79_wdt_exit);
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org");
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 08/18] MIPS: ath79: add common watchdog device
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (6 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 07/18] watchdog: add driver for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 09/18] input: add input driver for polled GPIO buttons Gabor Juhos
` (10 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
All supported SoCs have a built-in hardware watchdog driver. This patch
registers a platform_device for that to make it usable.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
Changes since RFC:
- remove the ATH79_DEV_WDT Kconfig option, and move the watchdog platform
code into dev-common.[ch]
arch/mips/ath79/dev-common.c | 10 ++++++++++
arch/mips/ath79/dev-common.h | 1 +
arch/mips/ath79/setup.c | 1 +
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/arch/mips/ath79/dev-common.c b/arch/mips/ath79/dev-common.c
index 897522c..74b1e3b 100644
--- a/arch/mips/ath79/dev-common.c
+++ b/arch/mips/ath79/dev-common.c
@@ -57,3 +57,13 @@ void __init ath79_register_uart(void)
ath79_uart_data[0].uartclk = ath79_ahb_freq;
platform_device_register(&ath79_uart_device);
}
+
+static struct platform_device ath79_wdt_device = {
+ .name = "ath79-wdt",
+ .id = -1,
+};
+
+void __init ath79_register_wdt(void)
+{
+ platform_device_register(&ath79_wdt_device);
+}
diff --git a/arch/mips/ath79/dev-common.h b/arch/mips/ath79/dev-common.h
index 1cec894..65bf400 100644
--- a/arch/mips/ath79/dev-common.h
+++ b/arch/mips/ath79/dev-common.h
@@ -13,5 +13,6 @@
#define _ATH79_DEV_COMMON_H
void ath79_register_uart(void) __init;
+void ath79_register_wdt(void) __init;
#endif /* _ATH79_DEV_COMMON_H */
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 8600044..5abe56c 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -259,6 +259,7 @@ static int __init ath79_setup(void)
{
ath79_gpio_init();
ath79_register_uart();
+ ath79_register_wdt();
mips_machine_setup();
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 09/18] input: add input driver for polled GPIO buttons
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (7 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 08/18] MIPS: ath79: add common watchdog device Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 19:24 ` Ben Gardiner
` (3 more replies)
2010-11-23 15:06 ` [PATCH 10/18] MIPS: ath79: add common GPIO buttons device Gabor Juhos
` (9 subsequent siblings)
18 siblings, 4 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos,
Dmitry Torokhov, Mike Frysinger, linux-input
The existing gpio-keys driver can be usable only for GPIO lines with
interrupt support. Several devices have buttons connected to a GPIO
line which is not capable to generate interrupts. This patch adds a
new input driver using the generic GPIO layer and the input-polldev
to support such buttons.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: linux-input@vger.kernel.org
---
Changes since RFC: ---
drivers/input/misc/Kconfig | 16 +++
drivers/input/misc/Makefile | 1 +
drivers/input/misc/gpio_buttons.c | 232 +++++++++++++++++++++++++++++++++++++
include/linux/gpio_buttons.h | 33 +++++
4 files changed, 282 insertions(+), 0 deletions(-)
create mode 100644 drivers/input/misc/gpio_buttons.c
create mode 100644 include/linux/gpio_buttons.h
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index b99b8cb..3439b79 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -448,4 +448,20 @@ config INPUT_ADXL34X_SPI
To compile this driver as a module, choose M here: the
module will be called adxl34x-spi.
+config INPUT_GPIO_BUTTONS
+ tristate "Polled GPIO buttons interface"
+ depends on GENERIC_GPIO
+ select INPUT_POLLDEV
+ help
+ This driver implements support for buttons connected
+ to GPIO pins of various CPUs (and some other chips).
+
+ Say Y here if your device has buttons connected
+ directly to such GPIO pins. Your board-specific
+ setup logic must also provide a platform device,
+ with configuration data saying which GPIOs are used.
+
+ To compile this driver as a module, choose M here: the
+ module will be called gpio-buttons.
+
endif
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 1fe1f6c..3791050 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -42,4 +42,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR) += winbond-cir.o
obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
+obj-$(CONFIG_INPUT_GPIO_BUTTONS) += gpio_buttons.o
diff --git a/drivers/input/misc/gpio_buttons.c b/drivers/input/misc/gpio_buttons.c
new file mode 100644
index 0000000..51288a3
--- /dev/null
+++ b/drivers/input/misc/gpio_buttons.c
@@ -0,0 +1,232 @@
+/*
+ * Driver for buttons on GPIO lines not capable of generating interrupts
+ *
+ * Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2010 Nuno Goncalves <nunojpg@gmail.com>
+ *
+ * This file was based on: /drivers/input/misc/cobalt_btns.c
+ * Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ * also was based on: /drivers/input/keyboard/gpio_keys.c
+ * Copyright 2005 Phil Blundell
+ *
+ * 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/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/input-polldev.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/gpio_buttons.h>
+
+#define DRV_NAME "gpio-buttons"
+
+struct gpio_button_data {
+ int last_state;
+ int count;
+ int can_sleep;
+};
+
+struct gpio_buttons_dev {
+ struct input_polled_dev *poll_dev;
+ struct gpio_buttons_platform_data *pdata;
+ struct gpio_button_data *data;
+};
+
+static void gpio_buttons_check_state(struct input_dev *input,
+ struct gpio_button *button,
+ struct gpio_button_data *bdata)
+{
+ int state;
+
+ if (bdata->can_sleep)
+ state = !!gpio_get_value_cansleep(button->gpio);
+ else
+ state = !!gpio_get_value(button->gpio);
+
+ if (state != bdata->last_state) {
+ unsigned int type = button->type ?: EV_KEY;
+
+ input_event(input, type, button->code,
+ !!(state ^ button->active_low));
+ input_sync(input);
+ bdata->count = 0;
+ bdata->last_state = state;
+ }
+}
+
+static void gpio_buttons_poll(struct input_polled_dev *dev)
+{
+ struct gpio_buttons_dev *bdev = dev->private;
+ struct gpio_buttons_platform_data *pdata = bdev->pdata;
+ struct input_dev *input = dev->input;
+ int i;
+
+ for (i = 0; i < bdev->pdata->nbuttons; i++) {
+ struct gpio_button *button = &pdata->buttons[i];
+ struct gpio_button_data *bdata = &bdev->data[i];
+
+ if (bdata->count < button->threshold)
+ bdata->count++;
+ else
+ gpio_buttons_check_state(input, button, bdata);
+
+ }
+}
+
+static int __devinit gpio_buttons_probe(struct platform_device *pdev)
+{
+ struct gpio_buttons_platform_data *pdata = pdev->dev.platform_data;
+ struct device *dev = &pdev->dev;
+ struct gpio_buttons_dev *bdev;
+ struct input_polled_dev *poll_dev;
+ struct input_dev *input;
+ int error;
+ int i;
+
+ if (!pdata)
+ return -ENXIO;
+
+ bdev = kzalloc(sizeof(struct gpio_buttons_dev) +
+ pdata->nbuttons * sizeof(struct gpio_button_data),
+ GFP_KERNEL);
+ if (!bdev) {
+ dev_err(dev, "no memory for private data\n");
+ return -ENOMEM;
+ }
+
+ bdev->data = (struct gpio_button_data *) &bdev[1];
+
+ poll_dev = input_allocate_polled_device();
+ if (!poll_dev) {
+ dev_err(dev, "no memory for polled device\n");
+ error = -ENOMEM;
+ goto err_free_bdev;
+ }
+
+ poll_dev->private = bdev;
+ poll_dev->poll = gpio_buttons_poll;
+ poll_dev->poll_interval = pdata->poll_interval;
+
+ input = poll_dev->input;
+
+ input->evbit[0] = BIT(EV_KEY);
+ input->name = pdev->name;
+ input->phys = "gpio-buttons/input0";
+ input->dev.parent = &pdev->dev;
+
+ input->id.bustype = BUS_HOST;
+ input->id.vendor = 0x0001;
+ input->id.product = 0x0001;
+ input->id.version = 0x0100;
+
+ for (i = 0; i < pdata->nbuttons; i++) {
+ struct gpio_button *button = &pdata->buttons[i];
+ unsigned int gpio = button->gpio;
+ unsigned int type = button->type ?: EV_KEY;
+
+ error = gpio_request(gpio,
+ button->desc ? button->desc : DRV_NAME);
+ if (error) {
+ dev_err(dev, "unable to claim gpio %u, err=%d\n",
+ gpio, error);
+ goto err_free_gpio;
+ }
+
+ error = gpio_direction_input(gpio);
+ if (error) {
+ dev_err(dev,
+ "unable to set direction on gpio %u, err=%d\n",
+ gpio, error);
+ goto err_free_gpio;
+ }
+
+ bdev->data[i].can_sleep = gpio_cansleep(gpio);
+ bdev->data[i].last_state = -1;
+
+ input_set_capability(input, type, button->code);
+ }
+
+ bdev->poll_dev = poll_dev;
+ bdev->pdata = pdata;
+ platform_set_drvdata(pdev, bdev);
+
+ error = input_register_polled_device(poll_dev);
+ if (error) {
+ dev_err(dev, "unable to register polled device, err=%d\n",
+ error);
+ goto err_free_gpio;
+ }
+
+ /* report initial state of the buttons */
+ for (i = 0; i < pdata->nbuttons; i++)
+ gpio_buttons_check_state(input, &pdata->buttons[i],
+ &bdev->data[i]);
+
+ return 0;
+
+err_free_gpio:
+ for (i = i - 1; i >= 0; i--)
+ gpio_free(pdata->buttons[i].gpio);
+
+ input_free_polled_device(poll_dev);
+
+err_free_bdev:
+ kfree(bdev);
+
+ platform_set_drvdata(pdev, NULL);
+ return error;
+}
+
+static int __devexit gpio_buttons_remove(struct platform_device *pdev)
+{
+ struct gpio_buttons_dev *bdev = platform_get_drvdata(pdev);
+ struct gpio_buttons_platform_data *pdata = bdev->pdata;
+ int i;
+
+ input_unregister_polled_device(bdev->poll_dev);
+
+ for (i = 0; i < pdata->nbuttons; i++)
+ gpio_free(pdata->buttons[i].gpio);
+
+ input_free_polled_device(bdev->poll_dev);
+
+ kfree(bdev);
+ platform_set_drvdata(pdev, NULL);
+
+ return 0;
+}
+
+static struct platform_driver gpio_buttons_driver = {
+ .probe = gpio_buttons_probe,
+ .remove = __devexit_p(gpio_buttons_remove),
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init gpio_buttons_init(void)
+{
+ return platform_driver_register(&gpio_buttons_driver);
+}
+
+static void __exit gpio_buttons_exit(void)
+{
+ platform_driver_unregister(&gpio_buttons_driver);
+}
+
+module_init(gpio_buttons_init);
+module_exit(gpio_buttons_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_DESCRIPTION("Polled GPIO Buttons driver");
diff --git a/include/linux/gpio_buttons.h b/include/linux/gpio_buttons.h
new file mode 100644
index 0000000..f85b993
--- /dev/null
+++ b/include/linux/gpio_buttons.h
@@ -0,0 +1,33 @@
+/*
+ * Definitions for the GPIO buttons interface driver
+ *
+ * Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This file was based on: /include/linux/gpio_keys.h
+ * The original gpio_keys.h seems not to have a license.
+ *
+ * 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.
+ *
+ */
+
+#ifndef _GPIO_BUTTONS_H_
+#define _GPIO_BUTTONS_H_
+
+struct gpio_button {
+ int gpio; /* GPIO line number */
+ int active_low;
+ char *desc; /* button description */
+ int type; /* input event type (EV_KEY, EV_SW) */
+ int code; /* input event code (KEY_*, SW_*) */
+ int threshold; /* count threshold */
+};
+
+struct gpio_buttons_platform_data {
+ struct gpio_button *buttons;
+ int nbuttons; /* number of buttons */
+ int poll_interval; /* polling interval */
+};
+
+#endif /* _GPIO_BUTTONS_H_ */
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [PATCH 09/18] input: add input driver for polled GPIO buttons
2010-11-23 15:06 ` [PATCH 09/18] input: add input driver for polled GPIO buttons Gabor Juhos
@ 2010-11-23 19:24 ` Ben Gardiner
2010-11-24 17:24 ` Ben Gardiner
` (2 subsequent siblings)
3 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-23 19:24 UTC (permalink / raw)
To: Gabor Juhos
Cc: Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden,
Dmitry Torokhov, Mike Frysinger, linux-input
Hi Gabor,
On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
> The existing gpio-keys driver can be usable only for GPIO lines with
> interrupt support. Several devices have buttons connected to a GPIO
> line which is not capable to generate interrupts. This patch adds a
> new input driver using the generic GPIO layer and the input-polldev
> to support such buttons.
>
> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: linux-input@vger.kernel.org
I'm excited to see this patch posted. As I understand it, this
"separate polling gpio button driver" approach is preferred to the
"polling extensions in gpio-keys approach". I'm sorry I missed the RFC
[1] : I posted a revised version of Alex Clouter's and Paul Mundt's
polling gpio-keys support [2]. But now I can try integrating this
driver. :)
I will be posting a version of the patch shortly that is still using
the polling-gpio-keys support -- because there are discussions in the
machine-specific parts. Then I will try to integrate this driver into
the series.
Best Regards,
Ben Gardiner
[1] http://article.gmane.org/gmane.linux.kernel.input/16468
[2] http://article.gmane.org/gmane.linux.kernel.input/16587
---
Nanometrics Inc.
http://www.nanometrics.ca
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 09/18] input: add input driver for polled GPIO buttons
2010-11-23 15:06 ` [PATCH 09/18] input: add input driver for polled GPIO buttons Gabor Juhos
@ 2010-11-24 17:24 ` Ben Gardiner
2010-11-24 17:24 ` Ben Gardiner
` (2 subsequent siblings)
3 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 17:24 UTC (permalink / raw)
To: Gabor Juhos
Cc: Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden,
Dmitry Torokhov, Mike Frysinger, linux-input
Hello Gabor,
On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
> The existing gpio-keys driver can be usable only for GPIO lines with
> interrupt support. Several devices have buttons connected to a GPIO
> line which is not capable to generate interrupts. This patch adds a
> new input driver using the generic GPIO layer and the input-polldev
> to support such buttons.
>
> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: linux-input@vger.kernel.org
> ---
I've tested this driver with the da850-evm pushbuttons and switches
connected to i2c gpio expanders. It works well. The changes to the
patch series were straightforward: .config, "gpio-keys" ->
"gpio-buttons", struct gpio_key -> struct gpio_button etc.
I do have some comments about this patch. But the new driver is
functional as-is.
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
> drivers/input/misc/Kconfig | 16 +++
> drivers/input/misc/Makefile | 1 +
> drivers/input/misc/gpio_buttons.c | 232 +++++++++++++++++++++++++++++++++++++
Since the new gpio_buttons.c driver presents the same input event
device as the gpio_keys.c driver, I think it should also be a
drivers/input/keys device.
> [...]
> diff --git a/drivers/input/misc/gpio_buttons.c b/drivers/input/misc/gpio_buttons.c
When I was converting the da850-evm platform code to use the new
driver I felt that the changes did not indicate a switch to a polled
driver as seems to be the intent with the introduction of a separate
driver. All that was different in the platform code was 'button' where
there use to be 'key' and button does not itself convey the knowledge
that it is a polled input device.
I know names of drivers can be contentions but I will propose
regardless that this driver be called gpio-polled-keys /
gpio_polled_keys.c
> new file mode 100644
> index 0000000..51288a3
> --- /dev/null
> +++ b/drivers/input/misc/gpio_buttons.c
> [...]
> +static void gpio_buttons_poll(struct input_polled_dev *dev)
> +{
> + struct gpio_buttons_dev *bdev = dev->private;
> + struct gpio_buttons_platform_data *pdata = bdev->pdata;
> + struct input_dev *input = dev->input;
> + int i;
> +
> + for (i = 0; i < bdev->pdata->nbuttons; i++) {
> + struct gpio_button *button = &pdata->buttons[i];
> + struct gpio_button_data *bdata = &bdev->data[i];
> +
> + if (bdata->count < button->threshold)
> + bdata->count++;
> + else
> + gpio_buttons_check_state(input, button, bdata);
I think that a count-theshold can still be performed here, but using
the debounce_interval and polling_interval field specified in the
gpio_button and gpio_buttons_platform_data structures, respectively,
to calculate a threshold value.
In this way the gpio_button and gpio_keys_button structs are made more
similar -- differing only in the presence of .wakeup in
gpio_keys_button but not in gpio_button. Which may make it possible to
re-use the gpio_keys_button structure.
> [...]
> diff --git a/include/linux/gpio_buttons.h b/include/linux/gpio_buttons.h
> new file mode 100644
> index 0000000..f85b993
> --- /dev/null
> +++ b/include/linux/gpio_buttons.h
> @@ -0,0 +1,33 @@
> +/*
> + * Definitions for the GPIO buttons interface driver
> + *
> + * Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
> + *
> + * This file was based on: /include/linux/gpio_keys.h
> + * The original gpio_keys.h seems not to have a license.
> + *
> + * 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.
> + *
> + */
> +
> +#ifndef _GPIO_BUTTONS_H_
> +#define _GPIO_BUTTONS_H_
> +
> +struct gpio_button {
> + int gpio; /* GPIO line number */
> + int active_low;
> + char *desc; /* button description */
> + int type; /* input event type (EV_KEY, EV_SW) */
> + int code; /* input event code (KEY_*, SW_*) */
> + int threshold; /* count threshold */
Could we instead use the existing struct gpio_keys_button; we could
transform debounce_interval into a threshold as described above and
add an error when a gpio_button_probe() sees a gpio_key with .wakeup
== TRUE? It seems that this structure duplicates alot of the
gpio_keys_button structure.
> [...]
> +struct gpio_buttons_platform_data {
> + struct gpio_button *buttons;
> + int nbuttons; /* number of buttons */
> + int poll_interval; /* polling interval */
> +};
I think the units of poll_interval should be included in the comment.
i.e. /* polling interval in msecs */
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 09/18] input: add input driver for polled GPIO buttons
@ 2010-11-24 17:24 ` Ben Gardiner
0 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 17:24 UTC (permalink / raw)
To: Gabor Juhos
Cc: Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden,
Dmitry Torokhov, Mike Frysinger, linux-input
Hello Gabor,
On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
> The existing gpio-keys driver can be usable only for GPIO lines with
> interrupt support. Several devices have buttons connected to a GPIO
> line which is not capable to generate interrupts. This patch adds a
> new input driver using the generic GPIO layer and the input-polldev
> to support such buttons.
>
> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: linux-input@vger.kernel.org
> ---
I've tested this driver with the da850-evm pushbuttons and switches
connected to i2c gpio expanders. It works well. The changes to the
patch series were straightforward: .config, "gpio-keys" ->
"gpio-buttons", struct gpio_key -> struct gpio_button etc.
I do have some comments about this patch. But the new driver is
functional as-is.
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
> drivers/input/misc/Kconfig | 16 +++
> drivers/input/misc/Makefile | 1 +
> drivers/input/misc/gpio_buttons.c | 232 +++++++++++++++++++++++++++++++++++++
Since the new gpio_buttons.c driver presents the same input event
device as the gpio_keys.c driver, I think it should also be a
drivers/input/keys device.
> [...]
> diff --git a/drivers/input/misc/gpio_buttons.c b/drivers/input/misc/gpio_buttons.c
When I was converting the da850-evm platform code to use the new
driver I felt that the changes did not indicate a switch to a polled
driver as seems to be the intent with the introduction of a separate
driver. All that was different in the platform code was 'button' where
there use to be 'key' and button does not itself convey the knowledge
that it is a polled input device.
I know names of drivers can be contentions but I will propose
regardless that this driver be called gpio-polled-keys /
gpio_polled_keys.c
> new file mode 100644
> index 0000000..51288a3
> --- /dev/null
> +++ b/drivers/input/misc/gpio_buttons.c
> [...]
> +static void gpio_buttons_poll(struct input_polled_dev *dev)
> +{
> + struct gpio_buttons_dev *bdev = dev->private;
> + struct gpio_buttons_platform_data *pdata = bdev->pdata;
> + struct input_dev *input = dev->input;
> + int i;
> +
> + for (i = 0; i < bdev->pdata->nbuttons; i++) {
> + struct gpio_button *button = &pdata->buttons[i];
> + struct gpio_button_data *bdata = &bdev->data[i];
> +
> + if (bdata->count < button->threshold)
> + bdata->count++;
> + else
> + gpio_buttons_check_state(input, button, bdata);
I think that a count-theshold can still be performed here, but using
the debounce_interval and polling_interval field specified in the
gpio_button and gpio_buttons_platform_data structures, respectively,
to calculate a threshold value.
In this way the gpio_button and gpio_keys_button structs are made more
similar -- differing only in the presence of .wakeup in
gpio_keys_button but not in gpio_button. Which may make it possible to
re-use the gpio_keys_button structure.
> [...]
> diff --git a/include/linux/gpio_buttons.h b/include/linux/gpio_buttons.h
> new file mode 100644
> index 0000000..f85b993
> --- /dev/null
> +++ b/include/linux/gpio_buttons.h
> @@ -0,0 +1,33 @@
> +/*
> + * Definitions for the GPIO buttons interface driver
> + *
> + * Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
> + *
> + * This file was based on: /include/linux/gpio_keys.h
> + * The original gpio_keys.h seems not to have a license.
> + *
> + * 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.
> + *
> + */
> +
> +#ifndef _GPIO_BUTTONS_H_
> +#define _GPIO_BUTTONS_H_
> +
> +struct gpio_button {
> + int gpio; /* GPIO line number */
> + int active_low;
> + char *desc; /* button description */
> + int type; /* input event type (EV_KEY, EV_SW) */
> + int code; /* input event code (KEY_*, SW_*) */
> + int threshold; /* count threshold */
Could we instead use the existing struct gpio_keys_button; we could
transform debounce_interval into a threshold as described above and
add an error when a gpio_button_probe() sees a gpio_key with .wakeup
== TRUE? It seems that this structure duplicates alot of the
gpio_keys_button structure.
> [...]
> +struct gpio_buttons_platform_data {
> + struct gpio_button *buttons;
> + int nbuttons; /* number of buttons */
> + int poll_interval; /* polling interval */
> +};
I think the units of poll_interval should be included in the comment.
i.e. /* polling interval in msecs */
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 09/18] input: add input driver for polled GPIO buttons
2010-11-24 17:24 ` Ben Gardiner
(?)
@ 2010-11-24 18:54 ` Gabor Juhos
2010-11-24 20:28 ` Ben Gardiner
-1 siblings, 1 reply; 62+ messages in thread
From: Gabor Juhos @ 2010-11-24 18:54 UTC (permalink / raw)
To: Ben Gardiner
Cc: Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden,
Dmitry Torokhov, Mike Frysinger, linux-input
Hi Ben,
> <...>
> I've tested this driver with the da850-evm pushbuttons and switches
> connected to i2c gpio expanders. It works well. The changes to the
> patch series were straightforward: .config, "gpio-keys" ->
> "gpio-buttons", struct gpio_key -> struct gpio_button etc.
>
> I do have some comments about this patch. But the new driver is
> functional as-is.
>
> Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
Thanks!
>><...>
>
> Since the new gpio_buttons.c driver presents the same input event
> device as the gpio_keys.c driver, I think it should also be a
> drivers/input/keys device.
Makes sense.
>
>> [...]
>> diff --git a/drivers/input/misc/gpio_buttons.c b/drivers/input/misc/gpio_buttons.c
>
> When I was converting the da850-evm platform code to use the new
> driver I felt that the changes did not indicate a switch to a polled
> driver as seems to be the intent with the introduction of a separate
> driver. All that was different in the platform code was 'button' where
> there use to be 'key' and button does not itself convey the knowledge
> that it is a polled input device.
>
> I know names of drivers can be contentions but I will propose
> regardless that this driver be called gpio-polled-keys /
> gpio_polled_keys.c
I agree, this would be more informative.
>> <...>
>> + for (i = 0; i < bdev->pdata->nbuttons; i++) {
>> + struct gpio_button *button = &pdata->buttons[i];
>> + struct gpio_button_data *bdata = &bdev->data[i];
>> +
>> + if (bdata->count < button->threshold)
>> + bdata->count++;
>> + else
>> + gpio_buttons_check_state(input, button, bdata);
>
> I think that a count-theshold can still be performed here, but using
> the debounce_interval and polling_interval field specified in the
> gpio_button and gpio_buttons_platform_data structures, respectively,
> to calculate a threshold value.
Good idea. We don't even have to compute a threshold value, we can use the
debounce_interval and poll_interval fields directly. I mean something similar to
this:
<...>
if (bdata->interval < button->debounce_interval)
bdata->interval += pdata->poll_interval;
else
gpio_buttons_check_state(input, button, bdata);
<...>
> In this way the gpio_button and gpio_keys_button structs are made more
> similar -- differing only in the presence of .wakeup in
> gpio_keys_button but not in gpio_button. Which may make it possible to
> re-use the gpio_keys_button structure.
>
>> <...>
>> +struct gpio_button {
>> + int gpio; /* GPIO line number */
>> + int active_low;
>> + char *desc; /* button description */
>> + int type; /* input event type (EV_KEY, EV_SW) */
>> + int code; /* input event code (KEY_*, SW_*) */
>> + int threshold; /* count threshold */
>
> Could we instead use the existing struct gpio_keys_button; we could
> transform debounce_interval into a threshold as described above
Sure, we can use that...
> and add an error when a gpio_button_probe() sees a gpio_key with .wakeup ==
> TRUE?
I don't think we should check that, we can simply ignore this field. Maybe we
should add a comment to the .wakeup field to state that the polled driver does
not use that.
> It seems that this structure duplicates alot of the gpio_keys_button
> structure.
Yes, it is almost the same.
>> [...]
>> +struct gpio_buttons_platform_data {
>> + struct gpio_button *buttons;
>> + int nbuttons; /* number of buttons */
>> + int poll_interval; /* polling interval */
>> +};
>
> I think the units of poll_interval should be included in the comment.
> i.e. /* polling interval in msecs */
Yes, you are right. Additionally, we should move this structure into
gpio_keys.h, so we can get rid of the gpio_buttons.h file.
Thank you for the valuable comments. I will create a new patch.
Regards,
Gabor
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 09/18] input: add input driver for polled GPIO buttons
2010-11-24 18:54 ` Gabor Juhos
@ 2010-11-24 20:28 ` Ben Gardiner
0 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 20:28 UTC (permalink / raw)
To: Gabor Juhos
Cc: Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden,
Dmitry Torokhov, Mike Frysinger, linux-input
Hi Gabor,
On Wed, Nov 24, 2010 at 1:54 PM, Gabor Juhos <juhosg@openwrt.org> wrote:
> Hi Ben,
>> [...]
>> Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
>
> Thanks!
You are most welcome.
>[...]
>
> Thank you for the valuable comments. I will create a new patch.
Actually, I've done a little hacking on the patch here while
integrating with the da850-evm changes. I will post the series here,
feel free to pick an choose the changes as you see fit -- hopefully it
can save you some time.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCH WIP 0/6] suggested changes to gpio_buttons driver
2010-11-23 15:06 ` [PATCH 09/18] input: add input driver for polled GPIO buttons Gabor Juhos
2010-11-23 19:24 ` Ben Gardiner
2010-11-24 17:24 ` Ben Gardiner
@ 2010-11-24 21:01 ` Ben Gardiner
2010-11-24 21:01 ` [PATCH WIP 1/6] fixup gpio_buttons: use the same debounce_interval member found in gpio_key to obtain a threshold count based on polling interval Ben Gardiner
` (6 more replies)
2010-11-28 8:31 ` [PATCH 09/18] input: add input driver for polled GPIO buttons Dmitry Torokhov
3 siblings, 7 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 21:01 UTC (permalink / raw)
To: Gabor Juhos; +Cc: linux-input
These are just some suggested changes from the review in patch-form. I will
do my best to make time for reviewing and testing any future versions of the
patch that you submit but I will regrettably be moving to other projects
for awhile. Until then I will not be able to spend much time on integration.
With these patches applied I was able to build the da850-evm buttons and keys
support with minimal changes.As I said, these are just suggested changes,
please feel free to squash, edit or drop them as you see fit. My motivation
here is that if you pickup the driver name and config symbol names as-is then
I will have no remaining integration to perform in the da850-evm series. I
hope you don't mind that I have to patch and run here.
I look forward to your next version of the patch.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
Ben Gardiner (6):
fixup gpio_buttons: use the same debounce_interval member found in
gpio_key to obtain a threshold count based on polling interval
fixup gpio_buttons: use existing gpio_keys_button structure instead
of introducing new gpio_button structure
fixup gpio_buttons: detect and error-out if a button is requested for
wakeup
fixup gpio_buttons: show units of poll_interval platform data member
fixup gpio_buttons: move gpio_buttons.c to drivers/input/keyboard
from drivers/input/misc
fixup gpio_buttons : rename gpio-buttons / gpio_buttons to
gpio-keys-polled / gpio_keys_polled
drivers/input/keyboard/Kconfig | 16 ++++
drivers/input/keyboard/Makefile | 2 +
.../gpio_buttons.c => keyboard/gpio_keys_polled.c} | 86 +++++++++++---------
drivers/input/misc/Kconfig | 16 ----
drivers/input/misc/Makefile | 1 -
.../linux/{gpio_buttons.h => gpio_keys_polled.h} | 15 +---
6 files changed, 69 insertions(+), 67 deletions(-)
rename drivers/input/{misc/gpio_buttons.c => keyboard/gpio_keys_polled.c} (64%)
rename include/linux/{gpio_buttons.h => gpio_keys_polled.h} (60%)
^ permalink raw reply [flat|nested] 62+ messages in thread* [PATCH WIP 1/6] fixup gpio_buttons: use the same debounce_interval member found in gpio_key to obtain a threshold count based on polling interval
2010-11-24 21:01 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Ben Gardiner
@ 2010-11-24 21:01 ` Ben Gardiner
2010-11-24 21:01 ` [PATCH WIP 2/6] fixup gpio_buttons: use existing gpio_keys_button structure instead of introducing new gpio_button structure Ben Gardiner
` (5 subsequent siblings)
6 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 21:01 UTC (permalink / raw)
To: Gabor Juhos; +Cc: linux-input
my reasoning was that if the debounce interval was set then the platform
_wants_ to supress spurious events so it was better to roundup and swallow
real events than round down and not supress.
I'm fine also with using the poll_interval and debuonce_interval directly as
you suggested.
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
drivers/input/misc/gpio_buttons.c | 7 +++++--
include/linux/gpio_buttons.h | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/input/misc/gpio_buttons.c b/drivers/input/misc/gpio_buttons.c
index 51288a3..f42906c 100644
--- a/drivers/input/misc/gpio_buttons.c
+++ b/drivers/input/misc/gpio_buttons.c
@@ -68,13 +68,16 @@ static void gpio_buttons_poll(struct input_polled_dev *dev)
struct gpio_buttons_dev *bdev = dev->private;
struct gpio_buttons_platform_data *pdata = bdev->pdata;
struct input_dev *input = dev->input;
- int i;
+ int i, threshold;
for (i = 0; i < bdev->pdata->nbuttons; i++) {
struct gpio_button *button = &pdata->buttons[i];
struct gpio_button_data *bdata = &bdev->data[i];
- if (bdata->count < button->threshold)
+ threshold = round_up(button->debounce_interval,
+ pdata->poll_interval) /
+ pdata->poll_interval;
+ if (bdata->count < threshold)
bdata->count++;
else
gpio_buttons_check_state(input, button, bdata);
diff --git a/include/linux/gpio_buttons.h b/include/linux/gpio_buttons.h
index f85b993..c016f07 100644
--- a/include/linux/gpio_buttons.h
+++ b/include/linux/gpio_buttons.h
@@ -21,7 +21,7 @@ struct gpio_button {
char *desc; /* button description */
int type; /* input event type (EV_KEY, EV_SW) */
int code; /* input event code (KEY_*, SW_*) */
- int threshold; /* count threshold */
+ int debounce_interval; /* debounce ticks interval in msecs */
};
struct gpio_buttons_platform_data {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH WIP 2/6] fixup gpio_buttons: use existing gpio_keys_button structure instead of introducing new gpio_button structure
2010-11-24 21:01 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Ben Gardiner
2010-11-24 21:01 ` [PATCH WIP 1/6] fixup gpio_buttons: use the same debounce_interval member found in gpio_key to obtain a threshold count based on polling interval Ben Gardiner
@ 2010-11-24 21:01 ` Ben Gardiner
2010-11-24 21:01 ` [PATCH WIP 3/6] fixup gpio_buttons: detect and error-out if a button is requested for wakeup Ben Gardiner
` (4 subsequent siblings)
6 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 21:01 UTC (permalink / raw)
To: Gabor Juhos; +Cc: linux-input
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
drivers/input/misc/gpio_buttons.c | 6 +++---
include/linux/gpio_buttons.h | 11 ++---------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/input/misc/gpio_buttons.c b/drivers/input/misc/gpio_buttons.c
index f42906c..c34e978 100644
--- a/drivers/input/misc/gpio_buttons.c
+++ b/drivers/input/misc/gpio_buttons.c
@@ -42,7 +42,7 @@ struct gpio_buttons_dev {
};
static void gpio_buttons_check_state(struct input_dev *input,
- struct gpio_button *button,
+ struct gpio_keys_button *button,
struct gpio_button_data *bdata)
{
int state;
@@ -71,7 +71,7 @@ static void gpio_buttons_poll(struct input_polled_dev *dev)
int i, threshold;
for (i = 0; i < bdev->pdata->nbuttons; i++) {
- struct gpio_button *button = &pdata->buttons[i];
+ struct gpio_keys_button *button = &pdata->buttons[i];
struct gpio_button_data *bdata = &bdev->data[i];
threshold = round_up(button->debounce_interval,
@@ -132,7 +132,7 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
input->id.version = 0x0100;
for (i = 0; i < pdata->nbuttons; i++) {
- struct gpio_button *button = &pdata->buttons[i];
+ struct gpio_keys_button *button = &pdata->buttons[i];
unsigned int gpio = button->gpio;
unsigned int type = button->type ?: EV_KEY;
diff --git a/include/linux/gpio_buttons.h b/include/linux/gpio_buttons.h
index c016f07..4d43de9 100644
--- a/include/linux/gpio_buttons.h
+++ b/include/linux/gpio_buttons.h
@@ -15,17 +15,10 @@
#ifndef _GPIO_BUTTONS_H_
#define _GPIO_BUTTONS_H_
-struct gpio_button {
- int gpio; /* GPIO line number */
- int active_low;
- char *desc; /* button description */
- int type; /* input event type (EV_KEY, EV_SW) */
- int code; /* input event code (KEY_*, SW_*) */
- int debounce_interval; /* debounce ticks interval in msecs */
-};
+#include <linux/gpio_keys.h>
struct gpio_buttons_platform_data {
- struct gpio_button *buttons;
+ struct gpio_keys_button *buttons;
int nbuttons; /* number of buttons */
int poll_interval; /* polling interval */
};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH WIP 3/6] fixup gpio_buttons: detect and error-out if a button is requested for wakeup
2010-11-24 21:01 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Ben Gardiner
2010-11-24 21:01 ` [PATCH WIP 1/6] fixup gpio_buttons: use the same debounce_interval member found in gpio_key to obtain a threshold count based on polling interval Ben Gardiner
2010-11-24 21:01 ` [PATCH WIP 2/6] fixup gpio_buttons: use existing gpio_keys_button structure instead of introducing new gpio_button structure Ben Gardiner
@ 2010-11-24 21:01 ` Ben Gardiner
2010-11-24 21:01 ` [PATCH WIP 4/6] fixup gpio_buttons: show units of poll_interval platform data member Ben Gardiner
` (3 subsequent siblings)
6 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 21:01 UTC (permalink / raw)
To: Gabor Juhos; +Cc: linux-input
I'm fine also with ignoring the value of wakeup as you suggested.
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
drivers/input/misc/gpio_buttons.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/input/misc/gpio_buttons.c b/drivers/input/misc/gpio_buttons.c
index c34e978..0859b4d 100644
--- a/drivers/input/misc/gpio_buttons.c
+++ b/drivers/input/misc/gpio_buttons.c
@@ -136,6 +136,11 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
unsigned int gpio = button->gpio;
unsigned int type = button->type ?: EV_KEY;
+ if (button->wakeup) {
+ dev_err(dev, DRV_NAME " does not support wakeup\n");
+ goto err_free_gpio;
+ }
+
error = gpio_request(gpio,
button->desc ? button->desc : DRV_NAME);
if (error) {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH WIP 4/6] fixup gpio_buttons: show units of poll_interval platform data member
2010-11-24 21:01 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Ben Gardiner
` (2 preceding siblings ...)
2010-11-24 21:01 ` [PATCH WIP 3/6] fixup gpio_buttons: detect and error-out if a button is requested for wakeup Ben Gardiner
@ 2010-11-24 21:01 ` Ben Gardiner
2010-11-24 21:01 ` [PATCH WIP 5/6] fixup gpio_buttons: move gpio_buttons.c to drivers/input/keyboard from drivers/input/misc Ben Gardiner
` (2 subsequent siblings)
6 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 21:01 UTC (permalink / raw)
To: Gabor Juhos; +Cc: linux-input
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
include/linux/gpio_buttons.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/gpio_buttons.h b/include/linux/gpio_buttons.h
index 4d43de9..f7f1467 100644
--- a/include/linux/gpio_buttons.h
+++ b/include/linux/gpio_buttons.h
@@ -20,7 +20,7 @@
struct gpio_buttons_platform_data {
struct gpio_keys_button *buttons;
int nbuttons; /* number of buttons */
- int poll_interval; /* polling interval */
+ int poll_interval; /* polling interval in msecs*/
};
#endif /* _GPIO_BUTTONS_H_ */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH WIP 5/6] fixup gpio_buttons: move gpio_buttons.c to drivers/input/keyboard from drivers/input/misc
2010-11-24 21:01 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Ben Gardiner
` (3 preceding siblings ...)
2010-11-24 21:01 ` [PATCH WIP 4/6] fixup gpio_buttons: show units of poll_interval platform data member Ben Gardiner
@ 2010-11-24 21:01 ` Ben Gardiner
2010-11-24 21:01 ` [PATCH WIP 6/6] fixup gpio_buttons : rename gpio-buttons / gpio_buttons to gpio-keys-polled / gpio_keys_polled Ben Gardiner
2010-11-30 7:56 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Dmitry Torokhov
6 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 21:01 UTC (permalink / raw)
To: Gabor Juhos; +Cc: linux-input
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
drivers/input/keyboard/Kconfig | 16 ++++++++++++++++
drivers/input/keyboard/Makefile | 2 ++
drivers/input/{misc => keyboard}/gpio_buttons.c | 0
drivers/input/misc/Kconfig | 16 ----------------
drivers/input/misc/Makefile | 1 -
5 files changed, 18 insertions(+), 17 deletions(-)
rename drivers/input/{misc => keyboard}/gpio_buttons.c (100%)
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index b8c51b9..4ab13fc 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -485,4 +485,20 @@ config KEYBOARD_W90P910
To compile this driver as a module, choose M here: the
module will be called w90p910_keypad.
+config INPUT_GPIO_BUTTONS
+ tristate "Polled GPIO buttons interface"
+ depends on GENERIC_GPIO
+ select INPUT_POLLDEV
+ help
+ This driver implements support for buttons connected
+ to GPIO pins of various CPUs (and some other chips).
+
+ Say Y here if your device has buttons connected
+ directly to such GPIO pins. Your board-specific
+ setup logic must also provide a platform device,
+ with configuration data saying which GPIOs are used.
+
+ To compile this driver as a module, choose M here: the
+ module will be called gpio-buttons.
+
endif
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index a34452e..2a52e0c 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -44,3 +44,5 @@ obj-$(CONFIG_KEYBOARD_TNETV107X) += tnetv107x-keypad.o
obj-$(CONFIG_KEYBOARD_TWL4030) += twl4030_keypad.o
obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o
obj-$(CONFIG_KEYBOARD_W90P910) += w90p910_keypad.o
+obj-$(CONFIG_INPUT_GPIO_BUTTONS) += gpio_buttons.o
+
diff --git a/drivers/input/misc/gpio_buttons.c b/drivers/input/keyboard/gpio_buttons.c
similarity index 100%
rename from drivers/input/misc/gpio_buttons.c
rename to drivers/input/keyboard/gpio_buttons.c
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index ef46534..a3adef6 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -457,20 +457,4 @@ config INPUT_ADXL34X_SPI
To compile this driver as a module, choose M here: the
module will be called adxl34x-spi.
-config INPUT_GPIO_BUTTONS
- tristate "Polled GPIO buttons interface"
- depends on GENERIC_GPIO
- select INPUT_POLLDEV
- help
- This driver implements support for buttons connected
- to GPIO pins of various CPUs (and some other chips).
-
- Say Y here if your device has buttons connected
- directly to such GPIO pins. Your board-specific
- setup logic must also provide a platform device,
- with configuration data saying which GPIOs are used.
-
- To compile this driver as a module, choose M here: the
- module will be called gpio-buttons.
-
endif
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 1f9f7bd..b041f5f 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -43,5 +43,4 @@ obj-$(CONFIG_INPUT_WINBOND_CIR) += winbond-cir.o
obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
-obj-$(CONFIG_INPUT_GPIO_BUTTONS) += gpio_buttons.o
--
1.7.0.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH WIP 6/6] fixup gpio_buttons : rename gpio-buttons / gpio_buttons to gpio-keys-polled / gpio_keys_polled
2010-11-24 21:01 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Ben Gardiner
` (4 preceding siblings ...)
2010-11-24 21:01 ` [PATCH WIP 5/6] fixup gpio_buttons: move gpio_buttons.c to drivers/input/keyboard from drivers/input/misc Ben Gardiner
@ 2010-11-24 21:01 ` Ben Gardiner
2010-11-30 7:56 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Dmitry Torokhov
6 siblings, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-24 21:01 UTC (permalink / raw)
To: Gabor Juhos; +Cc: linux-input
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
drivers/input/keyboard/Kconfig | 4 +-
drivers/input/keyboard/Makefile | 2 +-
.../{gpio_buttons.c => gpio_keys_polled.c} | 68 ++++++++++----------
.../linux/{gpio_buttons.h => gpio_keys_polled.h} | 2 +-
4 files changed, 38 insertions(+), 38 deletions(-)
rename drivers/input/keyboard/{gpio_buttons.c => gpio_keys_polled.c} (71%)
rename include/linux/{gpio_buttons.h => gpio_keys_polled.h} (94%)
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 4ab13fc..9648ff4 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -485,8 +485,8 @@ config KEYBOARD_W90P910
To compile this driver as a module, choose M here: the
module will be called w90p910_keypad.
-config INPUT_GPIO_BUTTONS
- tristate "Polled GPIO buttons interface"
+config KEYBOARD_GPIO_POLLED
+ tristate "Polled GPIO buttons"
depends on GENERIC_GPIO
select INPUT_POLLDEV
help
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 2a52e0c..e6da817 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -44,5 +44,5 @@ obj-$(CONFIG_KEYBOARD_TNETV107X) += tnetv107x-keypad.o
obj-$(CONFIG_KEYBOARD_TWL4030) += twl4030_keypad.o
obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o
obj-$(CONFIG_KEYBOARD_W90P910) += w90p910_keypad.o
-obj-$(CONFIG_INPUT_GPIO_BUTTONS) += gpio_buttons.o
+obj-$(CONFIG_KEYBOARD_GPIO_POLLED) += gpio_keys_polled.o
diff --git a/drivers/input/keyboard/gpio_buttons.c b/drivers/input/keyboard/gpio_keys_polled.c
similarity index 71%
rename from drivers/input/keyboard/gpio_buttons.c
rename to drivers/input/keyboard/gpio_keys_polled.c
index 0859b4d..390ed93 100644
--- a/drivers/input/keyboard/gpio_buttons.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -25,25 +25,25 @@
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
-#include <linux/gpio_buttons.h>
+#include <linux/gpio_keys_polled.h>
-#define DRV_NAME "gpio-buttons"
+#define DRV_NAME "gpio-keys-polled"
-struct gpio_button_data {
+struct gpio_keys_button_data {
int last_state;
int count;
int can_sleep;
};
-struct gpio_buttons_dev {
+struct gpio_keys_polled_dev {
struct input_polled_dev *poll_dev;
- struct gpio_buttons_platform_data *pdata;
- struct gpio_button_data *data;
+ struct gpio_keys_polled_platform_data *pdata;
+ struct gpio_keys_button_data *data;
};
-static void gpio_buttons_check_state(struct input_dev *input,
+static void gpio_keys_polled_check_state(struct input_dev *input,
struct gpio_keys_button *button,
- struct gpio_button_data *bdata)
+ struct gpio_keys_button_data *bdata)
{
int state;
@@ -63,16 +63,16 @@ static void gpio_buttons_check_state(struct input_dev *input,
}
}
-static void gpio_buttons_poll(struct input_polled_dev *dev)
+static void gpio_keys_polled_poll(struct input_polled_dev *dev)
{
- struct gpio_buttons_dev *bdev = dev->private;
- struct gpio_buttons_platform_data *pdata = bdev->pdata;
+ struct gpio_keys_polled_dev *bdev = dev->private;
+ struct gpio_keys_polled_platform_data *pdata = bdev->pdata;
struct input_dev *input = dev->input;
int i, threshold;
for (i = 0; i < bdev->pdata->nbuttons; i++) {
struct gpio_keys_button *button = &pdata->buttons[i];
- struct gpio_button_data *bdata = &bdev->data[i];
+ struct gpio_keys_button_data *bdata = &bdev->data[i];
threshold = round_up(button->debounce_interval,
pdata->poll_interval) /
@@ -80,16 +80,16 @@ static void gpio_buttons_poll(struct input_polled_dev *dev)
if (bdata->count < threshold)
bdata->count++;
else
- gpio_buttons_check_state(input, button, bdata);
+ gpio_keys_polled_check_state(input, button, bdata);
}
}
-static int __devinit gpio_buttons_probe(struct platform_device *pdev)
+static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
{
- struct gpio_buttons_platform_data *pdata = pdev->dev.platform_data;
+ struct gpio_keys_polled_platform_data *pdata = pdev->dev.platform_data;
struct device *dev = &pdev->dev;
- struct gpio_buttons_dev *bdev;
+ struct gpio_keys_polled_dev *bdev;
struct input_polled_dev *poll_dev;
struct input_dev *input;
int error;
@@ -98,15 +98,15 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
if (!pdata)
return -ENXIO;
- bdev = kzalloc(sizeof(struct gpio_buttons_dev) +
- pdata->nbuttons * sizeof(struct gpio_button_data),
+ bdev = kzalloc(sizeof(struct gpio_keys_polled_dev) +
+ pdata->nbuttons * sizeof(struct gpio_keys_button_data),
GFP_KERNEL);
if (!bdev) {
dev_err(dev, "no memory for private data\n");
return -ENOMEM;
}
- bdev->data = (struct gpio_button_data *) &bdev[1];
+ bdev->data = (struct gpio_keys_button_data *) &bdev[1];
poll_dev = input_allocate_polled_device();
if (!poll_dev) {
@@ -116,14 +116,14 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
}
poll_dev->private = bdev;
- poll_dev->poll = gpio_buttons_poll;
+ poll_dev->poll = gpio_keys_polled_poll;
poll_dev->poll_interval = pdata->poll_interval;
input = poll_dev->input;
input->evbit[0] = BIT(EV_KEY);
input->name = pdev->name;
- input->phys = "gpio-buttons/input0";
+ input->phys = DRV_NAME"/input0";
input->dev.parent = &pdev->dev;
input->id.bustype = BUS_HOST;
@@ -176,7 +176,7 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
/* report initial state of the buttons */
for (i = 0; i < pdata->nbuttons; i++)
- gpio_buttons_check_state(input, &pdata->buttons[i],
+ gpio_keys_polled_check_state(input, &pdata->buttons[i],
&bdev->data[i]);
return 0;
@@ -194,10 +194,10 @@ err_free_bdev:
return error;
}
-static int __devexit gpio_buttons_remove(struct platform_device *pdev)
+static int __devexit gpio_keys_polled_remove(struct platform_device *pdev)
{
- struct gpio_buttons_dev *bdev = platform_get_drvdata(pdev);
- struct gpio_buttons_platform_data *pdata = bdev->pdata;
+ struct gpio_keys_polled_dev *bdev = platform_get_drvdata(pdev);
+ struct gpio_keys_polled_platform_data *pdata = bdev->pdata;
int i;
input_unregister_polled_device(bdev->poll_dev);
@@ -213,27 +213,27 @@ static int __devexit gpio_buttons_remove(struct platform_device *pdev)
return 0;
}
-static struct platform_driver gpio_buttons_driver = {
- .probe = gpio_buttons_probe,
- .remove = __devexit_p(gpio_buttons_remove),
+static struct platform_driver gpio_keys_polled_driver = {
+ .probe = gpio_keys_polled_probe,
+ .remove = __devexit_p(gpio_keys_polled_remove),
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
},
};
-static int __init gpio_buttons_init(void)
+static int __init gpio_keys_polled_init(void)
{
- return platform_driver_register(&gpio_buttons_driver);
+ return platform_driver_register(&gpio_keys_polled_driver);
}
-static void __exit gpio_buttons_exit(void)
+static void __exit gpio_keys_polled_exit(void)
{
- platform_driver_unregister(&gpio_buttons_driver);
+ platform_driver_unregister(&gpio_keys_polled_driver);
}
-module_init(gpio_buttons_init);
-module_exit(gpio_buttons_exit);
+module_init(gpio_keys_polled_init);
+module_exit(gpio_keys_polled_exit);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
diff --git a/include/linux/gpio_buttons.h b/include/linux/gpio_keys_polled.h
similarity index 94%
rename from include/linux/gpio_buttons.h
rename to include/linux/gpio_keys_polled.h
index f7f1467..bf7f94a 100644
--- a/include/linux/gpio_buttons.h
+++ b/include/linux/gpio_keys_polled.h
@@ -17,7 +17,7 @@
#include <linux/gpio_keys.h>
-struct gpio_buttons_platform_data {
+struct gpio_keys_polled_platform_data {
struct gpio_keys_button *buttons;
int nbuttons; /* number of buttons */
int poll_interval; /* polling interval in msecs*/
--
1.7.0.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [PATCH WIP 0/6] suggested changes to gpio_buttons driver
2010-11-24 21:01 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Ben Gardiner
` (5 preceding siblings ...)
2010-11-24 21:01 ` [PATCH WIP 6/6] fixup gpio_buttons : rename gpio-buttons / gpio_buttons to gpio-keys-polled / gpio_keys_polled Ben Gardiner
@ 2010-11-30 7:56 ` Dmitry Torokhov
2010-11-30 10:30 ` Gabor Juhos
6 siblings, 1 reply; 62+ messages in thread
From: Dmitry Torokhov @ 2010-11-30 7:56 UTC (permalink / raw)
To: Ben Gardiner; +Cc: Gabor Juhos, linux-input
Hi Gabor, Ben,
On Wed, Nov 24, 2010 at 04:01:34PM -0500, Ben Gardiner wrote:
> These are just some suggested changes from the review in patch-form. I will
> do my best to make time for reviewing and testing any future versions of the
> patch that you submit but I will regrettably be moving to other projects
> for awhile. Until then I will not be able to spend much time on integration.
>
> With these patches applied I was able to build the da850-evm buttons and keys
> support with minimal changes.As I said, these are just suggested changes,
> please feel free to squash, edit or drop them as you see fit. My motivation
> here is that if you pickup the driver name and config symbol names as-is then
> I will have no remaining integration to perform in the da850-evm series. I
> hope you don't mind that I have to patch and run here.
>
> I look forward to your next version of the patch.
I do like the original patch and even more so Ben changes. Could you
tell me if the following still works for you (goes on top of Ben's)
and if it does I'll fold everything together and queue for 2.6.38.
Thanks!
--
Dmitry
Input: gpio-buttons - misc changes
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/input/keyboard/gpio_keys_polled.c | 38 ++++++++++++++++++++++-------
include/linux/gpio_keys.h | 2 ++
include/linux/gpio_keys_polled.h | 26 --------------------
3 files changed, 31 insertions(+), 35 deletions(-)
delete mode 100644 include/linux/gpio_keys_polled.h
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 390ed93..6ed6910 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -25,7 +25,7 @@
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
-#include <linux/gpio_keys_polled.h>
+#include <linux/gpio_keys.h>
#define DRV_NAME "gpio-keys-polled"
@@ -37,8 +37,9 @@ struct gpio_keys_button_data {
struct gpio_keys_polled_dev {
struct input_polled_dev *poll_dev;
- struct gpio_keys_polled_platform_data *pdata;
- struct gpio_keys_button_data *data;
+ struct device *dev;
+ struct gpio_keys_platform_data *pdata;
+ struct gpio_keys_button_data data[0];
};
static void gpio_keys_polled_check_state(struct input_dev *input,
@@ -66,7 +67,7 @@ static void gpio_keys_polled_check_state(struct input_dev *input,
static void gpio_keys_polled_poll(struct input_polled_dev *dev)
{
struct gpio_keys_polled_dev *bdev = dev->private;
- struct gpio_keys_polled_platform_data *pdata = bdev->pdata;
+ struct gpio_keys_platform_data *pdata = bdev->pdata;
struct input_dev *input = dev->input;
int i, threshold;
@@ -85,9 +86,27 @@ static void gpio_keys_polled_poll(struct input_polled_dev *dev)
}
}
+static void gpio_keys_polled_open(struct input_polled_dev *dev)
+{
+ struct gpio_keys_polled_dev *bdev = dev->private;
+ struct gpio_keys_platform_data *pdata = bdev->pdata;
+
+ if (pdata->enable)
+ pdata->enable(bdev->dev);
+}
+
+static void gpio_keys_polled_close(struct input_polled_dev *dev)
+{
+ struct gpio_keys_polled_dev *bdev = dev->private;
+ struct gpio_keys_platform_data *pdata = bdev->pdata;
+
+ if (pdata->disable)
+ pdata->disable(bdev->dev);
+}
+
static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
{
- struct gpio_keys_polled_platform_data *pdata = pdev->dev.platform_data;
+ struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
struct device *dev = &pdev->dev;
struct gpio_keys_polled_dev *bdev;
struct input_polled_dev *poll_dev;
@@ -106,8 +125,6 @@ static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
return -ENOMEM;
}
- bdev->data = (struct gpio_keys_button_data *) &bdev[1];
-
poll_dev = input_allocate_polled_device();
if (!poll_dev) {
dev_err(dev, "no memory for polled device\n");
@@ -118,6 +135,8 @@ static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
poll_dev->private = bdev;
poll_dev->poll = gpio_keys_polled_poll;
poll_dev->poll_interval = pdata->poll_interval;
+ poll_dev->open = gpio_keys_polled_open;
+ poll_dev->close = gpio_keys_polled_close;
input = poll_dev->input;
@@ -164,6 +183,7 @@ static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
}
bdev->poll_dev = poll_dev;
+ bdev->dev = dev;
bdev->pdata = pdata;
platform_set_drvdata(pdev, bdev);
@@ -182,7 +202,7 @@ static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
return 0;
err_free_gpio:
- for (i = i - 1; i >= 0; i--)
+ while (--i >= 0)
gpio_free(pdata->buttons[i].gpio);
input_free_polled_device(poll_dev);
@@ -197,7 +217,7 @@ err_free_bdev:
static int __devexit gpio_keys_polled_remove(struct platform_device *pdev)
{
struct gpio_keys_polled_dev *bdev = platform_get_drvdata(pdev);
- struct gpio_keys_polled_platform_data *pdata = bdev->pdata;
+ struct gpio_keys_platform_data *pdata = bdev->pdata;
int i;
input_unregister_polled_device(bdev->poll_dev);
diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
index ce73a30..dd1a56f 100644
--- a/include/linux/gpio_keys.h
+++ b/include/linux/gpio_keys.h
@@ -16,6 +16,8 @@ struct gpio_keys_button {
struct gpio_keys_platform_data {
struct gpio_keys_button *buttons;
int nbuttons;
+ unsigned int poll_interval; /* polling interval in msecs -
+ for polling driver only */
unsigned int rep:1; /* enable input subsystem auto repeat */
int (*enable)(struct device *dev);
void (*disable)(struct device *dev);
diff --git a/include/linux/gpio_keys_polled.h b/include/linux/gpio_keys_polled.h
deleted file mode 100644
index bf7f94a..0000000
--- a/include/linux/gpio_keys_polled.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Definitions for the GPIO buttons interface driver
- *
- * Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- * This file was based on: /include/linux/gpio_keys.h
- * The original gpio_keys.h seems not to have a license.
- *
- * 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.
- *
- */
-
-#ifndef _GPIO_BUTTONS_H_
-#define _GPIO_BUTTONS_H_
-
-#include <linux/gpio_keys.h>
-
-struct gpio_keys_polled_platform_data {
- struct gpio_keys_button *buttons;
- int nbuttons; /* number of buttons */
- int poll_interval; /* polling interval in msecs*/
-};
-
-#endif /* _GPIO_BUTTONS_H_ */
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [PATCH WIP 0/6] suggested changes to gpio_buttons driver
2010-11-30 7:56 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Dmitry Torokhov
@ 2010-11-30 10:30 ` Gabor Juhos
2010-11-30 14:29 ` Ben Gardiner
0 siblings, 1 reply; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 10:30 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: Ben Gardiner, linux-input, Ralf Baechle
Hi Dmitry,
> On Wed, Nov 24, 2010 at 04:01:34PM -0500, Ben Gardiner wrote:
>> These are just some suggested changes from the review in patch-form. I will
>> do my best to make time for reviewing and testing any future versions of the
>> patch that you submit but I will regrettably be moving to other projects
>> for awhile. Until then I will not be able to spend much time on integration.
>>
>> With these patches applied I was able to build the da850-evm buttons and keys
>> support with minimal changes.As I said, these are just suggested changes,
>> please feel free to squash, edit or drop them as you see fit. My motivation
>> here is that if you pickup the driver name and config symbol names as-is then
>> I will have no remaining integration to perform in the da850-evm series. I
>> hope you don't mind that I have to patch and run here.
>>
>> I look forward to your next version of the patch.
>
> I do like the original patch and even more so Ben changes. Could you
> tell me if the following still works for you (goes on top of Ben's)
> and if it does I'll fold everything together and queue for 2.6.38.
It works for me, however I have additional fixes on top of Ben's changes. I will
post an updated version soon.
The original driver was a part of a patch-set which adds support for a new MIPS
platform. There are a couple of patches in that series which requires this one.
It would be nice if the driver would be able to go through the MIPS tree to
avoid cross-tree dependencies.
Regards,
Gabor
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [PATCH WIP 0/6] suggested changes to gpio_buttons driver
2010-11-30 10:30 ` Gabor Juhos
@ 2010-11-30 14:29 ` Ben Gardiner
2010-11-30 18:26 ` Gabor Juhos
0 siblings, 1 reply; 62+ messages in thread
From: Ben Gardiner @ 2010-11-30 14:29 UTC (permalink / raw)
To: Gabor Juhos
Cc: Dmitry Torokhov, linux-input, Ralf Baechle, Kevin Hilman,
Nori, Sekhar
Hi Dmitry, Gabor,
On Tue, Nov 30, 2010 at 2:56 AM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
>> [...]
> I do like the original patch and even more so Ben changes. Could you
> tell me if the following still works for you (goes on top of Ben's)
> and if it does I'll fold everything together and queue for 2.6.38.
Thank you for considering the proposed changes and also for you r kind
words: it is encouraging to hear as a newcomer to kernel development.\
> [...]
> From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> ---
>
> drivers/input/keyboard/gpio_keys_polled.c | 38 ++++++++++++++++++++++-------
> include/linux/gpio_keys.h | 2 ++
> include/linux/gpio_keys_polled.h | 26 --------------------
> 3 files changed, 31 insertions(+), 35 deletions(-)
> delete mode 100644 include/linux/gpio_keys_polled.h
I have tested your patch with the "da850-evm: add gpio-{keys,leds} for
UI and BB expanders" on top of Gabor's "[PATCH 09/18] input: add input
driver for polled GPIO buttons" patch and my "[PATCH WIP 0/6]
suggested changes to gpio_buttons driver" series. Only minimal changes
were needed in the later patches of the da850-evm series.
They can be summarized (as you probably expected) by:
s/gpio_keys_polled\.h/gpio_keys.\h/g and
s/gpio_keys_polled_platform_data/gpio_keys_platform_data/g.
With those changes I observed the expected input events with evtest.
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
On Tue, Nov 30, 2010 at 5:30 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
>> [...]
> It works for me, however I have additional fixes on top of Ben's changes. I will
> post an updated version soon.
This "polled gpio keys" driver was your invention. FWIW, I think your
upcoming updated version should be given consideration before
proceeding with the collection of patches discussed above.
> The original driver was a part of a patch-set which adds support for a new MIPS
> platform. There are a couple of patches in that series which requires this one.
> It would be nice if the driver would be able to go through the MIPS tree to
> avoid cross-tree dependencies.
Since the da850-evm series which depends on this patch is proposed for
the linux-davinci tree I think that to avoid cross-tree dependencies
they would all need to be taken in one tree. That is, unless there is
zero chance of the da850-evm series being taken-up for 2.6.38 along
with this driver. I have added Kevin Hilman, the linux-davinci
maintainer, and Sekhar Nori, the da850-evm maintainer, to the CC of
this email so that they can participate in the discussion of when and
how the patches should be merged.
Kevin, Sekhar, do you think that "da850-evm: add gpio-{keys,leds} for
UI and BB expanders" could be queued for 2.6.38?
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH WIP 0/6] suggested changes to gpio_buttons driver
2010-11-30 14:29 ` Ben Gardiner
@ 2010-11-30 18:26 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 0/8] input: gpio_keys_polled fixes Gabor Juhos
` (8 more replies)
0 siblings, 9 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:26 UTC (permalink / raw)
To: Ben Gardiner
Cc: Dmitry Torokhov, linux-input, Ralf Baechle, Kevin Hilman,
Nori, Sekhar
Hi Ben, Dmitry,
>> <...>
>> It works for me, however I have additional fixes on top of Ben's changes. I will
>> post an updated version soon.
>
> This "polled gpio keys" driver was your invention. FWIW, I think your
> upcoming updated version should be given consideration before
> proceeding with the collection of patches discussed above.
>
>> The original driver was a part of a patch-set which adds support for a new MIPS
>> platform. There are a couple of patches in that series which requires this one.
>> It would be nice if the driver would be able to go through the MIPS tree to
>> avoid cross-tree dependencies.
>
> Since the da850-evm series which depends on this patch is proposed for
> the linux-davinci tree I think that to avoid cross-tree dependencies
> they would all need to be taken in one tree. That is, unless there is
> zero chance of the da850-evm series being taken-up for 2.6.38 along
> with this driver. I have added Kevin Hilman, the linux-davinci
> maintainer, and Sekhar Nori, the da850-evm maintainer, to the CC of
> this email so that they can participate in the discussion of when and
> how the patches should be merged.
>
> Kevin, Sekhar, do you think that "da850-evm: add gpio-{keys,leds} for
> UI and BB expanders" could be queued for 2.6.38?
Well, I had to rethink that a bit. In my original patch-set I have several
patches which must be acked by other subsystem maintainers.
Given the possibility that my patch-set will not be merged for 2.6.38 I will
drop the driver from that set so the driver can go through any tree.
Additionally I will post my changes in a follow up e-mail. Those changes goes on
top of Dmitry's changes, so the whole stuff can be folded into the original patch.
Regards,
Gabor
^ permalink raw reply [flat|nested] 62+ messages in thread* [PATCH 0/8] input: gpio_keys_polled fixes
2010-11-30 18:26 ` Gabor Juhos
@ 2010-11-30 18:44 ` Gabor Juhos
2010-11-30 22:16 ` Ben Gardiner
2010-11-30 18:44 ` [PATCH 1/8] input: gpio_keys_polled: add MODULE_ALIAS Gabor Juhos
` (7 subsequent siblings)
8 siblings, 1 reply; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:44 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
This set contains my latest fixes on top of Dmitry's changes.
Gabor Juhos (8):
input: gpio_keys_polled: add MODULE_ALIAS
input: gpio_keys_polled: return -EINVAL if wakeup specified
input: gpio_keys_polled: avoid possible division by zero
input: gpio_keys_polled: use DIV_ROUND_UP to compute the threshold value
input: gpio_keys_polled: precompute threshold value in the probe routine
input: gpio_keys_polled: use tabs instead of spaces for indentation
input: gpio_keys_polled: remove a local variable
input: gpio_keys_polled: fix Kconfig help text
drivers/input/keyboard/Kconfig | 4 +-
drivers/input/keyboard/gpio_keys_polled.c | 30 +++++++++++++++-------------
2 files changed, 18 insertions(+), 16 deletions(-)
--
1.7.2.1
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 0/8] input: gpio_keys_polled fixes
2010-11-30 18:44 ` [PATCH 0/8] input: gpio_keys_polled fixes Gabor Juhos
@ 2010-11-30 22:16 ` Ben Gardiner
2010-12-05 9:11 ` Gabor Juhos
2010-12-09 0:06 ` Dmitry Torokhov
0 siblings, 2 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-11-30 22:16 UTC (permalink / raw)
To: Gabor Juhos
Cc: Dmitry Torokhov, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
Hi Gabor,
On Tue, Nov 30, 2010 at 1:44 PM, Gabor Juhos <juhosg@openwrt.org> wrote:
> This set contains my latest fixes on top of Dmitry's changes.
>
> Gabor Juhos (8):
> input: gpio_keys_polled: add MODULE_ALIAS
> input: gpio_keys_polled: return -EINVAL if wakeup specified
> input: gpio_keys_polled: avoid possible division by zero
Good idea to return -EINVAL in those cases.
> input: gpio_keys_polled: use DIV_ROUND_UP to compute the threshold value
That's what I was looking for, thank you for fixing that up.
> input: gpio_keys_polled: precompute threshold value in the probe routine
Even better.
> input: gpio_keys_polled: use tabs instead of spaces for indentation
> input: gpio_keys_polled: remove a local variable
> input: gpio_keys_polled: fix Kconfig help text
I missed that remaining gpio-buttons reference, thanks for catching that.
> drivers/input/keyboard/Kconfig | 4 +-
> drivers/input/keyboard/gpio_keys_polled.c | 30 +++++++++++++++-------------
> 2 files changed, 18 insertions(+), 16 deletions(-)
I have tested this series with the "da850-evm: add gpio-{keys,leds}
for UI and BB expanders" on top of your "[PATCH 09/18] input: add
input driver for polled GPIO buttons" patch, my "[PATCH WIP 0/6]
suggested changes to gpio_buttons driver" series and Dmitry's "Input:
gpio-buttons - misc changes" patch.
Only minimal changes were needed in the later patches of the da850-evm
series. They can be summarized by:
s/gpio_keys_polled\.h/gpio_keys.\h/g and
s/gpio_keys_polled_platform_data/gpio_keys_platform_data/g.
With those changes I observed the expected input events with evtest.
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 0/8] input: gpio_keys_polled fixes
2010-11-30 22:16 ` Ben Gardiner
@ 2010-12-05 9:11 ` Gabor Juhos
2010-12-09 0:06 ` Dmitry Torokhov
1 sibling, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-12-05 9:11 UTC (permalink / raw)
To: Ben Gardiner
Cc: Dmitry Torokhov, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
Hi Ben,
> <...>
> I have tested this series with the "da850-evm: add gpio-{keys,leds}
> for UI and BB expanders" on top of your "[PATCH 09/18] input: add
> input driver for polled GPIO buttons" patch, my "[PATCH WIP 0/6]
> suggested changes to gpio_buttons driver" series and Dmitry's "Input:
> gpio-buttons - misc changes" patch.
>
> Only minimal changes were needed in the later patches of the da850-evm
> series. They can be summarized by:
> s/gpio_keys_polled\.h/gpio_keys.\h/g and
> s/gpio_keys_polled_platform_data/gpio_keys_platform_data/g.
>
> With those changes I observed the expected input events with evtest.
Superb.
> Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
Thank you for the continuous testing.
Regards,
Gabor
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 0/8] input: gpio_keys_polled fixes
2010-11-30 22:16 ` Ben Gardiner
2010-12-05 9:11 ` Gabor Juhos
@ 2010-12-09 0:06 ` Dmitry Torokhov
2010-12-09 8:07 ` Gabor Juhos
2010-12-09 21:36 ` Ben Gardiner
1 sibling, 2 replies; 62+ messages in thread
From: Dmitry Torokhov @ 2010-12-09 0:06 UTC (permalink / raw)
To: Ben Gardiner
Cc: Gabor Juhos, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
On Tue, Nov 30, 2010 at 05:16:15PM -0500, Ben Gardiner wrote:
> Hi Gabor,
>
> On Tue, Nov 30, 2010 at 1:44 PM, Gabor Juhos <juhosg@openwrt.org> wrote:
> > This set contains my latest fixes on top of Dmitry's changes.
> >
> > Gabor Juhos (8):
> > input: gpio_keys_polled: add MODULE_ALIAS
>
> > input: gpio_keys_polled: return -EINVAL if wakeup specified
> > input: gpio_keys_polled: avoid possible division by zero
> Good idea to return -EINVAL in those cases.
>
> > input: gpio_keys_polled: use DIV_ROUND_UP to compute the threshold value
> That's what I was looking for, thank you for fixing that up.
>
> > input: gpio_keys_polled: precompute threshold value in the probe routine
> Even better.
>
> > input: gpio_keys_polled: use tabs instead of spaces for indentation
> > input: gpio_keys_polled: remove a local variable
> > input: gpio_keys_polled: fix Kconfig help text
> I missed that remaining gpio-buttons reference, thanks for catching that.
>
> > drivers/input/keyboard/Kconfig | 4 +-
> > drivers/input/keyboard/gpio_keys_polled.c | 30 +++++++++++++++-------------
> > 2 files changed, 18 insertions(+), 16 deletions(-)
>
> I have tested this series with the "da850-evm: add gpio-{keys,leds}
> for UI and BB expanders" on top of your "[PATCH 09/18] input: add
> input driver for polled GPIO buttons" patch, my "[PATCH WIP 0/6]
> suggested changes to gpio_buttons driver" series and Dmitry's "Input:
> gpio-buttons - misc changes" patch.
Ok, so driver is in mainline now and you should have no problems with
merging your platform code in .38 merge window.
Thanks.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 0/8] input: gpio_keys_polled fixes
2010-12-09 0:06 ` Dmitry Torokhov
@ 2010-12-09 8:07 ` Gabor Juhos
2010-12-09 21:36 ` Ben Gardiner
1 sibling, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-12-09 8:07 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
Hi Dmitry,
> <...>
> Ok, so driver is in mainline now and you should have no problems with
> merging your platform code in .38 merge window.
Thank you!
-Gabor
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [PATCH 0/8] input: gpio_keys_polled fixes
2010-12-09 0:06 ` Dmitry Torokhov
2010-12-09 8:07 ` Gabor Juhos
@ 2010-12-09 21:36 ` Ben Gardiner
1 sibling, 0 replies; 62+ messages in thread
From: Ben Gardiner @ 2010-12-09 21:36 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Gabor Juhos, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
Hi Dmitry,
On Wed, Dec 8, 2010 at 7:06 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> Ok, so driver is in mainline now [...]
I see it in v2.6.37-rc5 (at 0e7d0c860a0dee49dacb7bbb248d1eba637075ad
). With all the changes proposed folded-in and even a little Kconfig
help text fixup. It is (still) working as expected.
Thank you very much for picking up the driver changes...
> [...] and you should have no problems with
> merging your platform code in .38 merge window.
and thank you for the vote of confidence. I will post an updated
version shortly.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCH 1/8] input: gpio_keys_polled: add MODULE_ALIAS
2010-11-30 18:26 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 0/8] input: gpio_keys_polled fixes Gabor Juhos
@ 2010-11-30 18:44 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 2/8] input: gpio_keys_polled: return -EINVAL if wakeup specified Gabor Juhos
` (6 subsequent siblings)
8 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:44 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
drivers/input/keyboard/gpio_keys_polled.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 6ed6910..1bd335b 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -258,3 +258,4 @@ module_exit(gpio_keys_polled_exit);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
MODULE_DESCRIPTION("Polled GPIO Buttons driver");
+MODULE_ALIAS("platform:" DRV_NAME)
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 2/8] input: gpio_keys_polled: return -EINVAL if wakeup specified
2010-11-30 18:26 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 0/8] input: gpio_keys_polled fixes Gabor Juhos
2010-11-30 18:44 ` [PATCH 1/8] input: gpio_keys_polled: add MODULE_ALIAS Gabor Juhos
@ 2010-11-30 18:44 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 3/8] input: gpio_keys_polled: avoid possible division by zero Gabor Juhos
` (5 subsequent siblings)
8 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:44 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
drivers/input/keyboard/gpio_keys_polled.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 1bd335b..5275c9e 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -157,6 +157,7 @@ static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
if (button->wakeup) {
dev_err(dev, DRV_NAME " does not support wakeup\n");
+ error = -EINVAL;
goto err_free_gpio;
}
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 3/8] input: gpio_keys_polled: avoid possible division by zero
2010-11-30 18:26 ` Gabor Juhos
` (2 preceding siblings ...)
2010-11-30 18:44 ` [PATCH 2/8] input: gpio_keys_polled: return -EINVAL if wakeup specified Gabor Juhos
@ 2010-11-30 18:44 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 4/8] input: gpio_keys_polled: use DIV_ROUND_UP to compute the threshold value Gabor Juhos
` (4 subsequent siblings)
8 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:44 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
The poll_interval field is used as a divider in the computation of
the threshold value. Check the passed value in the probe routine,
and return -EINVAL if it has not been set in the platform data.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
drivers/input/keyboard/gpio_keys_polled.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 5275c9e..9636c2f 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -114,8 +114,8 @@ static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
int error;
int i;
- if (!pdata)
- return -ENXIO;
+ if (!pdata || !pdata->poll_interval)
+ return -EINVAL;
bdev = kzalloc(sizeof(struct gpio_keys_polled_dev) +
pdata->nbuttons * sizeof(struct gpio_keys_button_data),
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 4/8] input: gpio_keys_polled: use DIV_ROUND_UP to compute the threshold value
2010-11-30 18:26 ` Gabor Juhos
` (3 preceding siblings ...)
2010-11-30 18:44 ` [PATCH 3/8] input: gpio_keys_polled: avoid possible division by zero Gabor Juhos
@ 2010-11-30 18:44 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 5/8] input: gpio_keys_polled: precompute threshold value in the probe routine Gabor Juhos
` (3 subsequent siblings)
8 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:44 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
drivers/input/keyboard/gpio_keys_polled.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 9636c2f..c9e0d1c 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -75,9 +75,8 @@ static void gpio_keys_polled_poll(struct input_polled_dev *dev)
struct gpio_keys_button *button = &pdata->buttons[i];
struct gpio_keys_button_data *bdata = &bdev->data[i];
- threshold = round_up(button->debounce_interval,
- pdata->poll_interval) /
- pdata->poll_interval;
+ threshold = DIV_ROUND_UP(button->debounce_interval,
+ pdata->poll_interval);
if (bdata->count < threshold)
bdata->count++;
else
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 5/8] input: gpio_keys_polled: precompute threshold value in the probe routine
2010-11-30 18:26 ` Gabor Juhos
` (4 preceding siblings ...)
2010-11-30 18:44 ` [PATCH 4/8] input: gpio_keys_polled: use DIV_ROUND_UP to compute the threshold value Gabor Juhos
@ 2010-11-30 18:44 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 6/8] input: gpio_keys_polled: use tabs instead of spaces for indentation Gabor Juhos
` (2 subsequent siblings)
8 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:44 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
The threshold value will be a constant, so precompute that at probe time
to save a few cycles in the polling thread. Also introduce a new bdata
local variable in the probe routine to improve readability.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
drivers/input/keyboard/gpio_keys_polled.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index c9e0d1c..5af0be9 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -32,6 +32,7 @@
struct gpio_keys_button_data {
int last_state;
int count;
+ int threshold;
int can_sleep;
};
@@ -69,15 +70,13 @@ static void gpio_keys_polled_poll(struct input_polled_dev *dev)
struct gpio_keys_polled_dev *bdev = dev->private;
struct gpio_keys_platform_data *pdata = bdev->pdata;
struct input_dev *input = dev->input;
- int i, threshold;
+ int i;
for (i = 0; i < bdev->pdata->nbuttons; i++) {
struct gpio_keys_button *button = &pdata->buttons[i];
struct gpio_keys_button_data *bdata = &bdev->data[i];
- threshold = DIV_ROUND_UP(button->debounce_interval,
- pdata->poll_interval);
- if (bdata->count < threshold)
+ if (bdata->count < bdata->threshold)
bdata->count++;
else
gpio_keys_polled_check_state(input, button, bdata);
@@ -151,6 +150,7 @@ static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
for (i = 0; i < pdata->nbuttons; i++) {
struct gpio_keys_button *button = &pdata->buttons[i];
+ struct gpio_keys_button_data *bdata = &bdev->data[i];
unsigned int gpio = button->gpio;
unsigned int type = button->type ?: EV_KEY;
@@ -176,8 +176,10 @@ static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
goto err_free_gpio;
}
- bdev->data[i].can_sleep = gpio_cansleep(gpio);
- bdev->data[i].last_state = -1;
+ bdata->can_sleep = gpio_cansleep(gpio);
+ bdata->last_state = -1;
+ bdata->threshold = DIV_ROUND_UP(button->debounce_interval,
+ pdata->poll_interval);
input_set_capability(input, type, button->code);
}
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 6/8] input: gpio_keys_polled: use tabs instead of spaces for indentation
2010-11-30 18:26 ` Gabor Juhos
` (5 preceding siblings ...)
2010-11-30 18:44 ` [PATCH 5/8] input: gpio_keys_polled: precompute threshold value in the probe routine Gabor Juhos
@ 2010-11-30 18:44 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 7/8] input: gpio_keys_polled: remove a local variable Gabor Juhos
2010-11-30 18:44 ` [PATCH 8/8] input: gpio_keys_polled: fix Kconfig help text Gabor Juhos
8 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:44 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
drivers/input/keyboard/gpio_keys_polled.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 5af0be9..7b6a333 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -44,8 +44,8 @@ struct gpio_keys_polled_dev {
};
static void gpio_keys_polled_check_state(struct input_dev *input,
- struct gpio_keys_button *button,
- struct gpio_keys_button_data *bdata)
+ struct gpio_keys_button *button,
+ struct gpio_keys_button_data *bdata)
{
int state;
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 7/8] input: gpio_keys_polled: remove a local variable
2010-11-30 18:26 ` Gabor Juhos
` (6 preceding siblings ...)
2010-11-30 18:44 ` [PATCH 6/8] input: gpio_keys_polled: use tabs instead of spaces for indentation Gabor Juhos
@ 2010-11-30 18:44 ` Gabor Juhos
2010-11-30 18:44 ` [PATCH 8/8] input: gpio_keys_polled: fix Kconfig help text Gabor Juhos
8 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:44 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
The 'button' variable is used only once in the gpio_keys_polled_poll
routine. Remove that and use the '&pdata->buttons[i]' value directly
instead.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
drivers/input/keyboard/gpio_keys_polled.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 7b6a333..61e1a92 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -73,14 +73,13 @@ static void gpio_keys_polled_poll(struct input_polled_dev *dev)
int i;
for (i = 0; i < bdev->pdata->nbuttons; i++) {
- struct gpio_keys_button *button = &pdata->buttons[i];
struct gpio_keys_button_data *bdata = &bdev->data[i];
if (bdata->count < bdata->threshold)
bdata->count++;
else
- gpio_keys_polled_check_state(input, button, bdata);
-
+ gpio_keys_polled_check_state(input, &pdata->buttons[i],
+ bdata);
}
}
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 8/8] input: gpio_keys_polled: fix Kconfig help text
2010-11-30 18:26 ` Gabor Juhos
` (7 preceding siblings ...)
2010-11-30 18:44 ` [PATCH 7/8] input: gpio_keys_polled: remove a local variable Gabor Juhos
@ 2010-11-30 18:44 ` Gabor Juhos
2010-12-01 22:53 ` Ferenc Wagner
2010-12-05 9:34 ` [PATCH v2 " Gabor Juhos
8 siblings, 2 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-30 18:44 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
drivers/input/keyboard/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 9648ff4..897b758 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -491,7 +491,7 @@ config KEYBOARD_GPIO_POLLED
select INPUT_POLLDEV
help
This driver implements support for buttons connected
- to GPIO pins of various CPUs (and some other chips).
+ to GPIO pins which is not capable to generate interrupts.
Say Y here if your device has buttons connected
directly to such GPIO pins. Your board-specific
@@ -499,6 +499,6 @@ config KEYBOARD_GPIO_POLLED
with configuration data saying which GPIOs are used.
To compile this driver as a module, choose M here: the
- module will be called gpio-buttons.
+ module will be called gpio_keys_polled.
endif
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [PATCH 8/8] input: gpio_keys_polled: fix Kconfig help text
2010-11-30 18:44 ` [PATCH 8/8] input: gpio_keys_polled: fix Kconfig help text Gabor Juhos
@ 2010-12-01 22:53 ` Ferenc Wagner
2010-12-05 9:11 ` Gabor Juhos
2010-12-05 9:34 ` [PATCH v2 " Gabor Juhos
1 sibling, 1 reply; 62+ messages in thread
From: Ferenc Wagner @ 2010-12-01 22:53 UTC (permalink / raw)
To: Gabor Juhos
Cc: Dmitry Torokhov, Ben Gardiner, linux-input, Ralf Baechle,
Kevin Hilman, nsekhar
Gabor Juhos <juhosg@openwrt.org> writes:
> --- a/drivers/input/keyboard/Kconfig
> +++ b/drivers/input/keyboard/Kconfig
> @@ -491,7 +491,7 @@ config KEYBOARD_GPIO_POLLED
> - to GPIO pins of various CPUs (and some other chips).
> + to GPIO pins which is not capable to generate interrupts.
I suggest s/is/are/ or perhaps even s/which is //.
--
Great stuff, thanks!
Feri.
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [PATCH 8/8] input: gpio_keys_polled: fix Kconfig help text
2010-12-01 22:53 ` Ferenc Wagner
@ 2010-12-05 9:11 ` Gabor Juhos
0 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-12-05 9:11 UTC (permalink / raw)
To: Ferenc Wagner
Cc: Dmitry Torokhov, Ben Gardiner, linux-input, Ralf Baechle,
Kevin Hilman, nsekhar
2010.12.01. 23:53 keltezéssel, Ferenc Wagner írta:
> Gabor Juhos <juhosg@openwrt.org> writes:
>
>> --- a/drivers/input/keyboard/Kconfig
>> +++ b/drivers/input/keyboard/Kconfig
>> @@ -491,7 +491,7 @@ config KEYBOARD_GPIO_POLLED
>> - to GPIO pins of various CPUs (and some other chips).
>> + to GPIO pins which is not capable to generate interrupts.
>
> I suggest s/is/are/ or perhaps even s/which is //.
Ok, i will send an updated patch.
Thanks,
Gabor
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCH v2 8/8] input: gpio_keys_polled: fix Kconfig help text
2010-11-30 18:44 ` [PATCH 8/8] input: gpio_keys_polled: fix Kconfig help text Gabor Juhos
2010-12-01 22:53 ` Ferenc Wagner
@ 2010-12-05 9:34 ` Gabor Juhos
1 sibling, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-12-05 9:34 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Ben Gardiner, linux-input, Ralf Baechle, Kevin Hilman, nsekhar,
Gabor Juhos
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
Changes since v1:
- remove 'which is ' from the help text
drivers/input/keyboard/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 9648ff4..897b758 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -491,7 +491,7 @@ config KEYBOARD_GPIO_POLLED
select INPUT_POLLDEV
help
This driver implements support for buttons connected
- to GPIO pins of various CPUs (and some other chips).
+ to GPIO pins not capable to generate interrupts.
Say Y here if your device has buttons connected
directly to such GPIO pins. Your board-specific
@@ -499,6 +499,6 @@ config KEYBOARD_GPIO_POLLED
with configuration data saying which GPIOs are used.
To compile this driver as a module, choose M here: the
- module will be called gpio-buttons.
+ module will be called gpio_keys_polled.
endif
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread
* Re: [PATCH 09/18] input: add input driver for polled GPIO buttons
2010-11-23 15:06 ` [PATCH 09/18] input: add input driver for polled GPIO buttons Gabor Juhos
` (2 preceding siblings ...)
2010-11-24 21:01 ` [PATCH WIP 0/6] suggested changes to gpio_buttons driver Ben Gardiner
@ 2010-11-28 8:31 ` Dmitry Torokhov
3 siblings, 0 replies; 62+ messages in thread
From: Dmitry Torokhov @ 2010-11-28 8:31 UTC (permalink / raw)
To: Gabor Juhos
Cc: Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden,
Mike Frysinger, linux-input
On Tue, Nov 23, 2010 at 04:06:31PM +0100, Gabor Juhos wrote:
> + *
> + * This file was based on: /include/linux/gpio_keys.h
> + * The original gpio_keys.h seems not to have a license.
> + *
This is incorrect statement. Unless otherwise specified Linux kernel
sources are licensed under GPL v2.
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCH 10/18] MIPS: ath79: add common GPIO buttons device
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (8 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 09/18] input: add input driver for polled GPIO buttons Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` Gabor Juhos
` (8 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
Almost all boards have one or more push buttons connected to GPIO lines.
This patch adds common code to register a platform_device for them.
The patch also adds support for the buttons on the PB44 board.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
Changes since RFC: ---
arch/mips/ath79/Kconfig | 4 ++
arch/mips/ath79/Makefile | 1 +
arch/mips/ath79/dev-gpio-buttons.c | 58 ++++++++++++++++++++++++++++++++++++
arch/mips/ath79/dev-gpio-buttons.h | 23 ++++++++++++++
arch/mips/ath79/mach-pb44.c | 26 ++++++++++++++++
5 files changed, 112 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/ath79/dev-gpio-buttons.c
create mode 100644 arch/mips/ath79/dev-gpio-buttons.h
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 5bc480e..185a8d6 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -5,6 +5,7 @@ menu "Atheros AR71XX/AR724X/AR913X machine selection"
config ATH79_MACH_PB44
bool "Atheros PB44 reference board"
select SOC_AR71XX
+ select ATH79_DEV_GPIO_BUTTONS
select ATH79_DEV_LEDS_GPIO
help
Say 'Y' here if you want your kernel to support the
@@ -21,6 +22,9 @@ config SOC_AR724X
config SOC_AR913X
def_bool n
+config ATH79_DEV_GPIO_BUTTONS
+ def_bool n
+
config ATH79_DEV_LEDS_GPIO
def_bool n
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index d14b597..0ceb45e 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
# Devices
#
obj-y += dev-common.o
+obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o
obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o
#
diff --git a/arch/mips/ath79/dev-gpio-buttons.c b/arch/mips/ath79/dev-gpio-buttons.c
new file mode 100644
index 0000000..3bc4a18
--- /dev/null
+++ b/arch/mips/ath79/dev-gpio-buttons.c
@@ -0,0 +1,58 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X GPIO button support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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/slab.h"
+#include <linux/platform_device.h>
+
+#include "dev-gpio-buttons.h"
+
+void __init ath79_register_gpio_buttons(int id,
+ unsigned poll_interval,
+ unsigned nbuttons,
+ struct gpio_button *buttons)
+{
+ struct platform_device *pdev;
+ struct gpio_buttons_platform_data pdata;
+ struct gpio_button *p;
+ int err;
+
+ p = kmalloc(nbuttons * sizeof(*p), GFP_KERNEL);
+ if (!p)
+ return;
+
+ memcpy(p, buttons, nbuttons * sizeof(*p));
+
+ pdev = platform_device_alloc("gpio-buttons", id);
+ if (!pdev)
+ goto err_free_buttons;
+
+ memset(&pdata, 0, sizeof(pdata));
+ pdata.poll_interval = poll_interval;
+ pdata.nbuttons = nbuttons;
+ pdata.buttons = p;
+
+ err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+ if (err)
+ goto err_put_pdev;
+
+ err = platform_device_add(pdev);
+ if (err)
+ goto err_put_pdev;
+
+ return;
+
+err_put_pdev:
+ platform_device_put(pdev);
+
+err_free_buttons:
+ kfree(p);
+}
diff --git a/arch/mips/ath79/dev-gpio-buttons.h b/arch/mips/ath79/dev-gpio-buttons.h
new file mode 100644
index 0000000..57bf1d6f
--- /dev/null
+++ b/arch/mips/ath79/dev-gpio-buttons.h
@@ -0,0 +1,23 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X GPIO button support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_DEV_GPIO_BUTTONS_H
+#define _ATH79_DEV_GPIO_BUTTONS_H
+
+#include <linux/input.h>
+#include <linux/gpio_buttons.h>
+
+void ath79_register_gpio_buttons(int id,
+ unsigned poll_interval,
+ unsigned nbuttons,
+ struct gpio_button *buttons) __init;
+
+#endif /* _ATH79_DEV_GPIO_BUTTONS_H */
diff --git a/arch/mips/ath79/mach-pb44.c b/arch/mips/ath79/mach-pb44.c
index e176779..5e7b544 100644
--- a/arch/mips/ath79/mach-pb44.c
+++ b/arch/mips/ath79/mach-pb44.c
@@ -15,15 +15,20 @@
#include <linux/i2c/pcf857x.h>
#include "machtypes.h"
+#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#define PB44_GPIO_I2C_SCL 0
#define PB44_GPIO_I2C_SDA 1
#define PB44_GPIO_EXP_BASE 16
+#define PB44_GPIO_SW_RESET (PB44_GPIO_EXP_BASE + 6)
+#define PB44_GPIO_SW_JUMP (PB44_GPIO_EXP_BASE + 8)
#define PB44_GPIO_LED_JUMP1 (PB44_GPIO_EXP_BASE + 9)
#define PB44_GPIO_LED_JUMP2 (PB44_GPIO_EXP_BASE + 10)
+#define PB44_BUTTONS_POLL_INTERVAL 20
+
static struct i2c_gpio_platform_data pb44_i2c_gpio_data = {
.sda_pin = PB44_GPIO_I2C_SDA,
.scl_pin = PB44_GPIO_I2C_SCL,
@@ -60,6 +65,24 @@ static struct gpio_led pb44_leds_gpio[] __initdata = {
},
};
+static struct gpio_button pb44_gpio_buttons[] __initdata = {
+ {
+ .desc = "soft_reset",
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ .gpio = PB44_GPIO_SW_RESET,
+ .active_low = 1,
+ } , {
+ .desc = "jumpstart",
+ .type = EV_KEY,
+ .code = KEY_WPS_BUTTON,
+ .threshold = 3,
+ .gpio = PB44_GPIO_SW_JUMP,
+ .active_low = 1,
+ }
+};
+
static void __init pb44_init(void)
{
i2c_register_board_info(0, pb44_i2c_board_info,
@@ -68,6 +91,9 @@ static void __init pb44_init(void)
ath79_register_leds_gpio(-1, ARRAY_SIZE(pb44_leds_gpio),
pb44_leds_gpio);
+ ath79_register_gpio_buttons(-1, PB44_BUTTONS_POLL_INTERVAL,
+ ARRAY_SIZE(pb44_gpio_buttons),
+ pb44_gpio_buttons);
}
MIPS_MACHINE(ATH79_MACH_PB44, "PB44", "Atheros PB44 reference board",
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 11/18] spi: add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs
@ 2010-11-23 15:06 ` Gabor Juhos
0 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos,
Grant Likely, David Brownell, spi-devel-general
The Atheros AR71XX/AR724X/AR913X SoCs have a built-in SPI controller. This
patch implements a driver for that.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: spi-devel-general@lists.sourceforge.net
---
Changes since RFC:
- remove DRV_DESC definition and use its previous value directly in the
MODULE_DESCRIPTION() macro,
- use io{read,write}32 accesors instead of __raw_{read,write}l,
- use __dev{init,exit,exit_p} annotations where in the appropriate places,
- initialize 'master->bus_num' field to -1 if no platform data specified,
so that a bus number can be dynamically assigned,
- rename ath79_spi_drv to ath79_spi_driver to avoid section mismatch
warnings
.../include/asm/mach-ath79/ath79_spi_platform.h | 19 ++
drivers/spi/Kconfig | 8 +
drivers/spi/Makefile | 1 +
drivers/spi/ath79_spi.c | 290 ++++++++++++++++++++
4 files changed, 318 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
create mode 100644 drivers/spi/ath79_spi.c
diff --git a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
new file mode 100644
index 0000000..aa71216
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
@@ -0,0 +1,19 @@
+/*
+ * Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_SPI_PLATFORM_H
+#define _ATH79_SPI_PLATFORM_H
+
+struct ath79_spi_platform_data {
+ unsigned bus_num;
+ unsigned num_chipselect;
+};
+
+#endif /* _ATH79_SPI_PLATFORM_H */
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 78f9fd0..f2093e1 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -53,6 +53,14 @@ if SPI_MASTER
comment "SPI Master Controller Drivers"
+config SPI_ATH79
+ tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"
+ depends on ATH79 && GENERIC_GPIO
+ select SPI_BITBANG
+ help
+ This enables support for the SPI controller present on the
+ Atheros AR71XX/AR724X/AR913X SoCs.
+
config SPI_ATMEL
tristate "Atmel SPI Controller"
depends on (ARCH_AT91 || AVR32)
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 8bc1a5a..875bc3d 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_SPI_MASTER) += spi.o
# SPI master controller drivers (bus)
obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
+obj-$(CONFIG_SPI_ATH79) += ath79_spi.o
obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
obj-$(CONFIG_SPI_AU1550) += au1550_spi.o
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
new file mode 100644
index 0000000..96f169a
--- /dev/null
+++ b/drivers/spi/ath79_spi.c
@@ -0,0 +1,290 @@
+/*
+ * SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This driver has been based on the spi-gpio.c:
+ * Copyright (C) 2006,2008 David Brownell
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+#include <linux/bitops.h>
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79_spi_platform.h>
+
+#define DRV_NAME "ath79-spi"
+
+struct ath79_spi {
+ struct spi_bitbang bitbang;
+ u32 ioc_base;
+ u32 reg_ctrl;
+
+ void __iomem *base;
+
+ struct platform_device *pdev;
+};
+
+static inline u32 ath79_spi_rr(struct ath79_spi *sp, unsigned reg)
+{
+ return ioread32(sp->base + reg);
+}
+
+static inline void ath79_spi_wr(struct ath79_spi *sp, unsigned reg, u32 val)
+{
+ iowrite32(val, sp->base + reg);
+}
+
+static inline struct ath79_spi *spidev_to_sp(struct spi_device *spi)
+{
+ return spi_master_get_devdata(spi->master);
+}
+
+static void ath79_spi_chipselect(struct spi_device *spi, int is_active)
+{
+ struct ath79_spi *sp = spidev_to_sp(spi);
+ int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active;
+
+ if (is_active) {
+ /* set initial clock polarity */
+ if (spi->mode & SPI_CPOL)
+ sp->ioc_base |= AR71XX_SPI_IOC_CLK;
+ else
+ sp->ioc_base &= ~AR71XX_SPI_IOC_CLK;
+
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+ }
+
+ if (spi->chip_select) {
+ unsigned long gpio = (unsigned long) spi->controller_data;
+
+ /* SPI is normally active-low */
+ gpio_set_value(gpio, cs_high);
+ } else {
+ if (cs_high)
+ sp->ioc_base |= AR71XX_SPI_IOC_CS0;
+ else
+ sp->ioc_base &= ~AR71XX_SPI_IOC_CS0;
+
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+ }
+
+}
+
+static int ath79_spi_setup_cs(struct spi_device *spi)
+{
+ struct ath79_spi *sp = spidev_to_sp(spi);
+
+ /* enable GPIO mode */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
+
+ /* save CTRL register */
+ sp->reg_ctrl = ath79_spi_rr(sp, AR71XX_SPI_REG_CTRL);
+ sp->ioc_base = ath79_spi_rr(sp, AR71XX_SPI_REG_IOC);
+
+ /* TODO: setup speed? */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
+
+ if (spi->chip_select) {
+ unsigned long gpio = (unsigned long) spi->controller_data;
+ int status = 0;
+
+ status = gpio_request(gpio, dev_name(&spi->dev));
+ if (status)
+ return status;
+
+ status = gpio_direction_output(gpio, spi->mode & SPI_CS_HIGH);
+ if (status) {
+ gpio_free(gpio);
+ return status;
+ }
+ } else {
+ if (spi->mode & SPI_CS_HIGH)
+ sp->ioc_base |= AR71XX_SPI_IOC_CS0;
+ else
+ sp->ioc_base &= ~AR71XX_SPI_IOC_CS0;
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+ }
+
+ return 0;
+}
+
+static void ath79_spi_cleanup_cs(struct spi_device *spi)
+{
+ struct ath79_spi *sp = spidev_to_sp(spi);
+
+ if (spi->chip_select) {
+ unsigned long gpio = (unsigned long) spi->controller_data;
+ gpio_free(gpio);
+ }
+
+ /* restore CTRL register */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, sp->reg_ctrl);
+ /* disable GPIO mode */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_FS, 0);
+}
+
+static int ath79_spi_setup(struct spi_device *spi)
+{
+ int status = 0;
+
+ if (spi->bits_per_word > 32)
+ return -EINVAL;
+
+ if (!spi->controller_state) {
+ status = ath79_spi_setup_cs(spi);
+ if (status)
+ return status;
+ }
+
+ status = spi_bitbang_setup(spi);
+ if (status && !spi->controller_state)
+ ath79_spi_cleanup_cs(spi);
+
+ return status;
+}
+
+static void ath79_spi_cleanup(struct spi_device *spi)
+{
+ ath79_spi_cleanup_cs(spi);
+ spi_bitbang_cleanup(spi);
+}
+
+static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned nsecs,
+ u32 word, u8 bits)
+{
+ struct ath79_spi *sp = spidev_to_sp(spi);
+ u32 ioc = sp->ioc_base;
+
+ /* clock starts at inactive polarity */
+ for (word <<= (32 - bits); likely(bits); bits--) {
+ u32 out;
+
+ if (word & (1 << 31))
+ out = ioc | AR71XX_SPI_IOC_DO;
+ else
+ out = ioc & ~AR71XX_SPI_IOC_DO;
+
+ /* setup MSB (to slave) on trailing edge */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out);
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out | AR71XX_SPI_IOC_CLK);
+
+ word <<= 1;
+ }
+
+ return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS);
+}
+
+static __devinit int ath79_spi_probe(struct platform_device *pdev)
+{
+ struct spi_master *master;
+ struct ath79_spi *sp;
+ struct ath79_spi_platform_data *pdata;
+ struct resource *r;
+ int ret;
+
+ master = spi_alloc_master(&pdev->dev, sizeof(*sp));
+ if (master == NULL) {
+ dev_err(&pdev->dev, "failed to allocate spi master\n");
+ return -ENOMEM;
+ }
+
+ sp = spi_master_get_devdata(master);
+ platform_set_drvdata(pdev, sp);
+
+ pdata = pdev->dev.platform_data;
+
+ master->setup = ath79_spi_setup;
+ master->cleanup = ath79_spi_cleanup;
+ if (pdata) {
+ master->bus_num = pdata->bus_num;
+ master->num_chipselect = pdata->num_chipselect;
+ } else {
+ master->bus_num = -1;
+ master->num_chipselect = 1;
+ }
+
+ sp->bitbang.master = spi_master_get(master);
+ sp->bitbang.chipselect = ath79_spi_chipselect;
+ sp->bitbang.txrx_word[SPI_MODE_0] = ath79_spi_txrx_mode0;
+ sp->bitbang.setup_transfer = spi_bitbang_setup_transfer;
+ sp->bitbang.flags = SPI_CS_HIGH;
+
+ r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (r == NULL) {
+ ret = -ENOENT;
+ goto err_put_master;
+ }
+
+ sp->base = ioremap(r->start, r->end - r->start + 1);
+ if (!sp->base) {
+ ret = -ENXIO;
+ goto err_put_master;
+ }
+
+ ret = spi_bitbang_start(&sp->bitbang);
+ if (ret)
+ goto err_unmap;
+
+ return 0;
+
+err_unmap:
+ iounmap(sp->base);
+err_put_master:
+ platform_set_drvdata(pdev, NULL);
+ spi_master_put(sp->bitbang.master);
+
+ return ret;
+}
+
+static __devexit int ath79_spi_remove(struct platform_device *pdev)
+{
+ struct ath79_spi *sp = platform_get_drvdata(pdev);
+
+ spi_bitbang_stop(&sp->bitbang);
+ iounmap(sp->base);
+ platform_set_drvdata(pdev, NULL);
+ spi_master_put(sp->bitbang.master);
+
+ return 0;
+}
+
+static struct platform_driver ath79_spi_driver = {
+ .probe = ath79_spi_probe,
+ .remove = __devexit_p(ath79_spi_remove),
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ },
+};
+
+static __init int ath79_spi_init(void)
+{
+ return platform_driver_register(&ath79_spi_driver);
+}
+module_init(ath79_spi_init);
+
+static __exit void ath79_spi_exit(void)
+{
+ platform_driver_unregister(&ath79_spi_driver);
+}
+module_exit(ath79_spi_exit);
+
+MODULE_DESCRIPTION("SPI controller driver for Atheros AR71XX/AR724X/AR91X");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 11/18] spi: add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs
@ 2010-11-23 15:06 ` Gabor Juhos
0 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA, David Brownell,
Luis R. Rodriguez, Cliff Holden, Gabor Juhos,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
kaloz-p3rKhJxN3npAfugRpC6u6w
The Atheros AR71XX/AR724X/AR913X SoCs have a built-in SPI controller. This
patch implements a driver for that.
Signed-off-by: Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Cc: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
---
Changes since RFC:
- remove DRV_DESC definition and use its previous value directly in the
MODULE_DESCRIPTION() macro,
- use io{read,write}32 accesors instead of __raw_{read,write}l,
- use __dev{init,exit,exit_p} annotations where in the appropriate places,
- initialize 'master->bus_num' field to -1 if no platform data specified,
so that a bus number can be dynamically assigned,
- rename ath79_spi_drv to ath79_spi_driver to avoid section mismatch
warnings
.../include/asm/mach-ath79/ath79_spi_platform.h | 19 ++
drivers/spi/Kconfig | 8 +
drivers/spi/Makefile | 1 +
drivers/spi/ath79_spi.c | 290 ++++++++++++++++++++
4 files changed, 318 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
create mode 100644 drivers/spi/ath79_spi.c
diff --git a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
new file mode 100644
index 0000000..aa71216
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
@@ -0,0 +1,19 @@
+/*
+ * Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_SPI_PLATFORM_H
+#define _ATH79_SPI_PLATFORM_H
+
+struct ath79_spi_platform_data {
+ unsigned bus_num;
+ unsigned num_chipselect;
+};
+
+#endif /* _ATH79_SPI_PLATFORM_H */
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 78f9fd0..f2093e1 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -53,6 +53,14 @@ if SPI_MASTER
comment "SPI Master Controller Drivers"
+config SPI_ATH79
+ tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"
+ depends on ATH79 && GENERIC_GPIO
+ select SPI_BITBANG
+ help
+ This enables support for the SPI controller present on the
+ Atheros AR71XX/AR724X/AR913X SoCs.
+
config SPI_ATMEL
tristate "Atmel SPI Controller"
depends on (ARCH_AT91 || AVR32)
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 8bc1a5a..875bc3d 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_SPI_MASTER) += spi.o
# SPI master controller drivers (bus)
obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
+obj-$(CONFIG_SPI_ATH79) += ath79_spi.o
obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
obj-$(CONFIG_SPI_AU1550) += au1550_spi.o
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
new file mode 100644
index 0000000..96f169a
--- /dev/null
+++ b/drivers/spi/ath79_spi.c
@@ -0,0 +1,290 @@
+/*
+ * SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
+ *
+ * This driver has been based on the spi-gpio.c:
+ * Copyright (C) 2006,2008 David Brownell
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+#include <linux/bitops.h>
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79_spi_platform.h>
+
+#define DRV_NAME "ath79-spi"
+
+struct ath79_spi {
+ struct spi_bitbang bitbang;
+ u32 ioc_base;
+ u32 reg_ctrl;
+
+ void __iomem *base;
+
+ struct platform_device *pdev;
+};
+
+static inline u32 ath79_spi_rr(struct ath79_spi *sp, unsigned reg)
+{
+ return ioread32(sp->base + reg);
+}
+
+static inline void ath79_spi_wr(struct ath79_spi *sp, unsigned reg, u32 val)
+{
+ iowrite32(val, sp->base + reg);
+}
+
+static inline struct ath79_spi *spidev_to_sp(struct spi_device *spi)
+{
+ return spi_master_get_devdata(spi->master);
+}
+
+static void ath79_spi_chipselect(struct spi_device *spi, int is_active)
+{
+ struct ath79_spi *sp = spidev_to_sp(spi);
+ int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active;
+
+ if (is_active) {
+ /* set initial clock polarity */
+ if (spi->mode & SPI_CPOL)
+ sp->ioc_base |= AR71XX_SPI_IOC_CLK;
+ else
+ sp->ioc_base &= ~AR71XX_SPI_IOC_CLK;
+
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+ }
+
+ if (spi->chip_select) {
+ unsigned long gpio = (unsigned long) spi->controller_data;
+
+ /* SPI is normally active-low */
+ gpio_set_value(gpio, cs_high);
+ } else {
+ if (cs_high)
+ sp->ioc_base |= AR71XX_SPI_IOC_CS0;
+ else
+ sp->ioc_base &= ~AR71XX_SPI_IOC_CS0;
+
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+ }
+
+}
+
+static int ath79_spi_setup_cs(struct spi_device *spi)
+{
+ struct ath79_spi *sp = spidev_to_sp(spi);
+
+ /* enable GPIO mode */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
+
+ /* save CTRL register */
+ sp->reg_ctrl = ath79_spi_rr(sp, AR71XX_SPI_REG_CTRL);
+ sp->ioc_base = ath79_spi_rr(sp, AR71XX_SPI_REG_IOC);
+
+ /* TODO: setup speed? */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
+
+ if (spi->chip_select) {
+ unsigned long gpio = (unsigned long) spi->controller_data;
+ int status = 0;
+
+ status = gpio_request(gpio, dev_name(&spi->dev));
+ if (status)
+ return status;
+
+ status = gpio_direction_output(gpio, spi->mode & SPI_CS_HIGH);
+ if (status) {
+ gpio_free(gpio);
+ return status;
+ }
+ } else {
+ if (spi->mode & SPI_CS_HIGH)
+ sp->ioc_base |= AR71XX_SPI_IOC_CS0;
+ else
+ sp->ioc_base &= ~AR71XX_SPI_IOC_CS0;
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+ }
+
+ return 0;
+}
+
+static void ath79_spi_cleanup_cs(struct spi_device *spi)
+{
+ struct ath79_spi *sp = spidev_to_sp(spi);
+
+ if (spi->chip_select) {
+ unsigned long gpio = (unsigned long) spi->controller_data;
+ gpio_free(gpio);
+ }
+
+ /* restore CTRL register */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, sp->reg_ctrl);
+ /* disable GPIO mode */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_FS, 0);
+}
+
+static int ath79_spi_setup(struct spi_device *spi)
+{
+ int status = 0;
+
+ if (spi->bits_per_word > 32)
+ return -EINVAL;
+
+ if (!spi->controller_state) {
+ status = ath79_spi_setup_cs(spi);
+ if (status)
+ return status;
+ }
+
+ status = spi_bitbang_setup(spi);
+ if (status && !spi->controller_state)
+ ath79_spi_cleanup_cs(spi);
+
+ return status;
+}
+
+static void ath79_spi_cleanup(struct spi_device *spi)
+{
+ ath79_spi_cleanup_cs(spi);
+ spi_bitbang_cleanup(spi);
+}
+
+static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned nsecs,
+ u32 word, u8 bits)
+{
+ struct ath79_spi *sp = spidev_to_sp(spi);
+ u32 ioc = sp->ioc_base;
+
+ /* clock starts at inactive polarity */
+ for (word <<= (32 - bits); likely(bits); bits--) {
+ u32 out;
+
+ if (word & (1 << 31))
+ out = ioc | AR71XX_SPI_IOC_DO;
+ else
+ out = ioc & ~AR71XX_SPI_IOC_DO;
+
+ /* setup MSB (to slave) on trailing edge */
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out);
+ ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out | AR71XX_SPI_IOC_CLK);
+
+ word <<= 1;
+ }
+
+ return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS);
+}
+
+static __devinit int ath79_spi_probe(struct platform_device *pdev)
+{
+ struct spi_master *master;
+ struct ath79_spi *sp;
+ struct ath79_spi_platform_data *pdata;
+ struct resource *r;
+ int ret;
+
+ master = spi_alloc_master(&pdev->dev, sizeof(*sp));
+ if (master == NULL) {
+ dev_err(&pdev->dev, "failed to allocate spi master\n");
+ return -ENOMEM;
+ }
+
+ sp = spi_master_get_devdata(master);
+ platform_set_drvdata(pdev, sp);
+
+ pdata = pdev->dev.platform_data;
+
+ master->setup = ath79_spi_setup;
+ master->cleanup = ath79_spi_cleanup;
+ if (pdata) {
+ master->bus_num = pdata->bus_num;
+ master->num_chipselect = pdata->num_chipselect;
+ } else {
+ master->bus_num = -1;
+ master->num_chipselect = 1;
+ }
+
+ sp->bitbang.master = spi_master_get(master);
+ sp->bitbang.chipselect = ath79_spi_chipselect;
+ sp->bitbang.txrx_word[SPI_MODE_0] = ath79_spi_txrx_mode0;
+ sp->bitbang.setup_transfer = spi_bitbang_setup_transfer;
+ sp->bitbang.flags = SPI_CS_HIGH;
+
+ r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (r == NULL) {
+ ret = -ENOENT;
+ goto err_put_master;
+ }
+
+ sp->base = ioremap(r->start, r->end - r->start + 1);
+ if (!sp->base) {
+ ret = -ENXIO;
+ goto err_put_master;
+ }
+
+ ret = spi_bitbang_start(&sp->bitbang);
+ if (ret)
+ goto err_unmap;
+
+ return 0;
+
+err_unmap:
+ iounmap(sp->base);
+err_put_master:
+ platform_set_drvdata(pdev, NULL);
+ spi_master_put(sp->bitbang.master);
+
+ return ret;
+}
+
+static __devexit int ath79_spi_remove(struct platform_device *pdev)
+{
+ struct ath79_spi *sp = platform_get_drvdata(pdev);
+
+ spi_bitbang_stop(&sp->bitbang);
+ iounmap(sp->base);
+ platform_set_drvdata(pdev, NULL);
+ spi_master_put(sp->bitbang.master);
+
+ return 0;
+}
+
+static struct platform_driver ath79_spi_driver = {
+ .probe = ath79_spi_probe,
+ .remove = __devexit_p(ath79_spi_remove),
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ },
+};
+
+static __init int ath79_spi_init(void)
+{
+ return platform_driver_register(&ath79_spi_driver);
+}
+module_init(ath79_spi_init);
+
+static __exit void ath79_spi_exit(void)
+{
+ platform_driver_unregister(&ath79_spi_driver);
+}
+module_exit(ath79_spi_exit);
+
+MODULE_DESCRIPTION("SPI controller driver for Atheros AR71XX/AR724X/AR91X");
+MODULE_AUTHOR("Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
--
1.7.2.1
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCH 12/18] MIPS: ath79: add common SPI controller device
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (10 preceding siblings ...)
2010-11-23 15:06 ` Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 13/18] USB: ehci: add workaround for Synopsys HC bug Gabor Juhos
` (6 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
Several boards are using the built-in SPI controller of the
AR71XX/AR724X/AR913X SoCs. This patch adds common platform_device
and helper code to register it. Additionally, the patch registers
the SPI bus on the PB44 board.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
Changes since RFC: ---
arch/mips/ath79/Kconfig | 4 ++
arch/mips/ath79/Makefile | 1 +
arch/mips/ath79/dev-spi.c | 38 ++++++++++++++++++++++++
arch/mips/ath79/dev-spi.h | 22 ++++++++++++++
arch/mips/ath79/mach-pb44.c | 17 ++++++++++
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 2 +
6 files changed, 84 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/ath79/dev-spi.c
create mode 100644 arch/mips/ath79/dev-spi.h
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 185a8d6..cd6c738 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -7,6 +7,7 @@ config ATH79_MACH_PB44
select SOC_AR71XX
select ATH79_DEV_GPIO_BUTTONS
select ATH79_DEV_LEDS_GPIO
+ select ATH79_DEV_SPI
help
Say 'Y' here if you want your kernel to support the
Atheros PB44 reference board.
@@ -28,4 +29,7 @@ config ATH79_DEV_GPIO_BUTTONS
config ATH79_DEV_LEDS_GPIO
def_bool n
+config ATH79_DEV_SPI
+ def_bool n
+
endif
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index 0ceb45e..a8de078 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-y += dev-common.o
obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o
obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o
+obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o
#
# Machines
diff --git a/arch/mips/ath79/dev-spi.c b/arch/mips/ath79/dev-spi.c
new file mode 100644
index 0000000..aa30163
--- /dev/null
+++ b/arch/mips/ath79/dev-spi.c
@@ -0,0 +1,38 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X SPI controller device
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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 <asm/mach-ath79/ar71xx_regs.h>
+#include "dev-spi.h"
+
+static struct resource ath79_spi_resources[] = {
+ {
+ .start = AR71XX_SPI_BASE,
+ .end = AR71XX_SPI_BASE + AR71XX_SPI_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device ath79_spi_device = {
+ .name = "ath79-spi",
+ .id = -1,
+ .resource = ath79_spi_resources,
+ .num_resources = ARRAY_SIZE(ath79_spi_resources),
+};
+
+void __init ath79_register_spi(struct ath79_spi_platform_data *pdata,
+ struct spi_board_info const *info,
+ unsigned n)
+{
+ spi_register_board_info(info, n);
+ ath79_spi_device.dev.platform_data = pdata;
+ platform_device_register(&ath79_spi_device);
+}
diff --git a/arch/mips/ath79/dev-spi.h b/arch/mips/ath79/dev-spi.h
new file mode 100644
index 0000000..9a98333
--- /dev/null
+++ b/arch/mips/ath79/dev-spi.h
@@ -0,0 +1,22 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X SPI controller device
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_DEV_SPI_H
+#define _ATH79_DEV_SPI_H
+
+#include <linux/spi/spi.h>
+#include <asm/mach-ath79/ath79_spi_platform.h>
+
+void __init ath79_register_spi(struct ath79_spi_platform_data *pdata,
+ struct spi_board_info const *info,
+ unsigned n);
+
+#endif /* _ATH79_DEV_SPI_H */
diff --git a/arch/mips/ath79/mach-pb44.c b/arch/mips/ath79/mach-pb44.c
index 5e7b544..257815e 100644
--- a/arch/mips/ath79/mach-pb44.c
+++ b/arch/mips/ath79/mach-pb44.c
@@ -17,6 +17,7 @@
#include "machtypes.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
+#include "dev-spi.h"
#define PB44_GPIO_I2C_SCL 0
#define PB44_GPIO_I2C_SDA 1
@@ -83,6 +84,20 @@ static struct gpio_button pb44_gpio_buttons[] __initdata = {
}
};
+static struct spi_board_info pb44_spi_info[] = {
+ {
+ .bus_num = 0,
+ .chip_select = 0,
+ .max_speed_hz = 25000000,
+ .modalias = "m25p64",
+ },
+};
+
+static struct ath79_spi_platform_data pb44_spi_data = {
+ .bus_num = 0,
+ .num_chipselect = 1,
+};
+
static void __init pb44_init(void)
{
i2c_register_board_info(0, pb44_i2c_board_info,
@@ -94,6 +109,8 @@ static void __init pb44_init(void)
ath79_register_gpio_buttons(-1, PB44_BUTTONS_POLL_INTERVAL,
ARRAY_SIZE(pb44_gpio_buttons),
pb44_gpio_buttons);
+ ath79_register_spi(&pb44_spi_data, pb44_spi_info,
+ ARRAY_SIZE(pb44_spi_info));
}
MIPS_MACHINE(ATH79_MACH_PB44, "PB44", "Atheros PB44 reference board",
diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index 7f2933d..4f2b621 100644
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -20,6 +20,8 @@
#include <linux/bitops.h>
#define AR71XX_APB_BASE 0x18000000
+#define AR71XX_SPI_BASE 0x1f000000
+#define AR71XX_SPI_SIZE 0x01000000
#define AR71XX_DDR_CTRL_BASE (AR71XX_APB_BASE + 0x00000000)
#define AR71XX_DDR_CTRL_SIZE 0x100
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 13/18] USB: ehci: add workaround for Synopsys HC bug
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (11 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 12/18] MIPS: ath79: add common SPI controller device Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 14/18] USB: ehci: add bus glue for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (5 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos,
David Brownell, Greg Kroah-Hartman, linux-usb
A Synopsys USB core used in various SoCs has a bug which might cause
that the host controller not issuing ping.
When software uses the Doorbell mechanism to remove queue heads, the
host controller still has references to the removed queue head even
after indicating an Interrupt on Async Advance. This happens if the last
executed queue head's Next Link queue head is removed.
Consequences of the defect:
The Host controller fetches the removed queue head, using memory that
would otherwise be deallocated.This results in incorrect transactions on
both the USB and system memory. This may result in undefined behavior.
Workarounds:
1) If no queue head is active (no Status field's Active bit is set)
after removing the queue heads, the software can write one of the valid
queue head addresses to the ASYNCLISTADDR register and deallocate the
removed queue head's memory after 2 microframes.
If one or more of the queue heads is active (the Active bit is set in
the Status field) after removing the queue heads, the software can delay
memory deallocation after time X, where X is the time required for the
Host Controller to go through all the queue heads once. X varies with
the number of queue heads and the time required to process periodic
transactions: if more periodic transactions must be performed, the Host
Controller has less time to process asynchronous transaction processing.
2) Do not use the Doorbell mechanism to remove the queue heads. Disable
the Asynchronous Schedule Enable bit instead.
The bug has been discussed on the linux-usb-devel mailing-list
four years ago, the original thread can be found here:
http://www.mail-archive.com/linux-usb-devel@lists.sourceforge.net/msg45345.html
This patch implements the first workaround as suggested by David Brownell.
The built-in USB host controller of the Atheros AR7130/AR7141/AR7161 SoCs
requires this to work properly.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-usb@vger.kernel.org
---
Changes since RFC: ---
drivers/usb/host/ehci-q.c | 3 +++
drivers/usb/host/ehci.h | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 233c288..343b8de 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -1193,6 +1193,9 @@ static void end_unlink_async (struct ehci_hcd *ehci)
ehci->reclaim = NULL;
start_unlink_async (ehci, next);
}
+
+ if (ehci->has_synopsys_hc_bug)
+ writel((u32)ehci->async->qh_dma, &ehci->regs->async_next);
}
/* makes sure the async qh will become idle */
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index bde823f..7c0151a 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -131,6 +131,7 @@ struct ehci_hcd { /* one per controller */
unsigned need_io_watchdog:1;
unsigned broken_periodic:1;
unsigned fs_i_thresh:1; /* Intel iso scheduling */
+ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
/* required for usb32 quirk */
#define OHCI_CTRL_HCFS (3 << 6)
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 14/18] USB: ehci: add bus glue for the Atheros AR71XX/AR724X/AR913X SoCs
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (12 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 13/18] USB: ehci: add workaround for Synopsys HC bug Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 15/18] USB: ohci: add bus glue for the Atheros AR71XX/AR7240 SoCs Gabor Juhos
` (4 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos,
David Brownell, Greg Kroah-Hartman, linux-usb
The Atheros AR71XX/AR724X/AR913X SoCs have a built-in EHCI controller.
This patch adds the necessary glue code to make the generic EHCI driver
usable for them.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-usb@vger.kernel.org
---
Changes since RFC:
- don't use 'default y if SOC_*', select USB_ARCH_HAS_EHCI option in the
platform specific Kconfig file instead
- add missing 'ath79_ehci_platform.h' file
arch/mips/ath79/Kconfig | 3 +
.../include/asm/mach-ath79/ath79_ehci_platform.h | 18 ++
drivers/usb/host/Kconfig | 8 +
drivers/usb/host/ehci-ath79.c | 176 ++++++++++++++++++++
drivers/usb/host/ehci-hcd.c | 5 +
5 files changed, 210 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/include/asm/mach-ath79/ath79_ehci_platform.h
create mode 100644 drivers/usb/host/ehci-ath79.c
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index cd6c738..647f535 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -15,12 +15,15 @@ config ATH79_MACH_PB44
endmenu
config SOC_AR71XX
+ select USB_ARCH_HAS_EHCI
def_bool n
config SOC_AR724X
+ select USB_ARCH_HAS_EHCI
def_bool n
config SOC_AR913X
+ select USB_ARCH_HAS_EHCI
def_bool n
config ATH79_DEV_GPIO_BUTTONS
diff --git a/arch/mips/include/asm/mach-ath79/ath79_ehci_platform.h b/arch/mips/include/asm/mach-ath79/ath79_ehci_platform.h
new file mode 100644
index 0000000..6ee075f
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/ath79_ehci_platform.h
@@ -0,0 +1,18 @@
+/*
+ * Platform data definition for Atheros AR71XX/AR913X EHCI controller
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_EHCI_PLATFORM_H
+#define _ATH79_EHCI_PLATFORM_H
+
+struct ath79_ehci_platform_data {
+ u8 is_ar913x;
+};
+
+#endif /* _ATH79_EHCI_PLATFORM_H */
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 6f4f8e6..3a2667a 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -147,6 +147,14 @@ config USB_W90X900_EHCI
---help---
Enables support for the W90X900 USB controller
+config USB_EHCI_ATH79
+ bool "EHCI support for AR71XX/AR724X/AR913X SoCs"
+ depends on USB_EHCI_HCD && ATH79
+ select USB_EHCI_ROOT_HUB_TT
+ ---help---
+ Enables support for the built-in EHCI controller present
+ on the Atheros AR71XX/AR724X/AR913X SoCs.
+
config USB_OXU210HP_HCD
tristate "OXU210HP HCD support"
depends on USB
diff --git a/drivers/usb/host/ehci-ath79.c b/drivers/usb/host/ehci-ath79.c
new file mode 100644
index 0000000..43a728f
--- /dev/null
+++ b/drivers/usb/host/ehci-ath79.c
@@ -0,0 +1,176 @@
+/*
+ * Bus Glue for Atheros AR71XX/AR913X built-in EHCI controller.
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ * Copyright (C) 2007 Atheros Communications, Inc.
+ *
+ * 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 <asm/mach-ath79/ath79_ehci_platform.h>
+
+static int ehci_ath79_init(struct usb_hcd *hcd)
+{
+ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+ struct ath79_ehci_platform_data *pdata;
+ int ret;
+
+ pdata = hcd->self.controller->platform_data;
+
+ if (pdata->is_ar913x) {
+ hcd->has_tt = 1;
+
+ ehci->caps = hcd->regs + 0x100;
+ ehci->regs = hcd->regs + 0x100 +
+ HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
+ } else {
+ ehci->has_synopsys_hc_bug = 1;
+
+ ehci->caps = hcd->regs;
+ ehci->regs = hcd->regs +
+ HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
+ }
+
+ ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+ ehci->sbrn = 0x20;
+
+ ehci_reset(ehci);
+
+ ret = ehci_init(hcd);
+ if (ret)
+ return ret;
+
+ ehci_port_power(ehci, 0);
+
+ return 0;
+}
+
+static const struct hc_driver ehci_ath79_hc_driver = {
+ .description = hcd_name,
+ .product_desc = "Atheros built-in EHCI controller",
+ .hcd_priv_size = sizeof(struct ehci_hcd),
+ .irq = ehci_irq,
+ .flags = HCD_MEMORY | HCD_USB2,
+
+ .reset = ehci_ath79_init,
+ .start = ehci_run,
+ .stop = ehci_stop,
+ .shutdown = ehci_shutdown,
+
+ .urb_enqueue = ehci_urb_enqueue,
+ .urb_dequeue = ehci_urb_dequeue,
+ .endpoint_disable = ehci_endpoint_disable,
+ .endpoint_reset = ehci_endpoint_reset,
+
+ .get_frame_number = ehci_get_frame,
+
+ .hub_status_data = ehci_hub_status_data,
+ .hub_control = ehci_hub_control,
+#ifdef CONFIG_PM
+ .hub_suspend = ehci_hub_suspend,
+ .hub_resume = ehci_hub_resume,
+#endif
+ .relinquish_port = ehci_relinquish_port,
+ .port_handed_over = ehci_port_handed_over,
+
+ .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
+};
+
+static int ehci_ath79_probe(struct platform_device *pdev)
+{
+ struct ath79_ehci_platform_data *pdata;
+ struct usb_hcd *hcd;
+ struct resource *res;
+ int irq;
+ int ret;
+
+ if (usb_disabled())
+ return -ENODEV;
+
+ pdata = pdev->dev.platform_data;
+ if (!pdata) {
+ dev_dbg(&pdev->dev, "no platform data specified for %s\n",
+ dev_name(&pdev->dev));
+ return -EINVAL;
+ }
+
+ res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+ if (!res) {
+ dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
+ dev_name(&pdev->dev));
+ return -ENODEV;
+ }
+ irq = res->start;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_dbg(&pdev->dev, "no base address specified for %s\n",
+ dev_name(&pdev->dev));
+ return -ENODEV;
+ }
+
+ hcd = usb_create_hcd(&ehci_ath79_hc_driver, &pdev->dev,
+ dev_name(&pdev->dev));
+ if (!hcd)
+ return -ENOMEM;
+
+ hcd->rsrc_start = res->start;
+ hcd->rsrc_len = res->end - res->start + 1;
+
+ if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
+ dev_dbg(&pdev->dev, "controller already in use\n");
+ ret = -EBUSY;
+ goto err_put_hcd;
+ }
+
+ hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+ if (!hcd->regs) {
+ dev_dbg(&pdev->dev, "error mapping memory\n");
+ ret = -EFAULT;
+ goto err_release_region;
+ }
+
+ ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+ if (ret)
+ goto err_iounmap;
+
+ return 0;
+
+err_iounmap:
+ iounmap(hcd->regs);
+
+err_release_region:
+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err_put_hcd:
+ usb_put_hcd(hcd);
+ return ret;
+}
+
+static int ehci_ath79_remove(struct platform_device *pdev)
+{
+ struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+ usb_remove_hcd(hcd);
+ iounmap(hcd->regs);
+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+ usb_put_hcd(hcd);
+
+ return 0;
+}
+
+static struct platform_driver ehci_ath79_driver = {
+ .probe = ehci_ath79_probe,
+ .remove = ehci_ath79_remove,
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "ath79-ehci",
+ }
+};
+
+MODULE_ALIAS("platform:ath79-ehci");
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 502a7e6..82f74aa 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1216,6 +1216,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_octeon_driver
#endif
+#ifdef CONFIG_USB_EHCI_ATH79
+#include "ehci-ath79.c"
+#define PLATFORM_DRIVER ehci_ath79_driver
+#endif
+
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
!defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
!defined(XILINX_OF_PLATFORM_DRIVER)
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 15/18] USB: ohci: add bus glue for the Atheros AR71XX/AR7240 SoCs
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (13 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 14/18] USB: ehci: add bus glue for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 16/18] MIPS: ath79: add common USB Host Controller device Gabor Juhos
` (3 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos,
David Brownell, Greg Kroah-Hartman, linux-usb
The Atheros AR71XX/AR7240 SoCs have a built-in OHCI controller.
This patch adds the necessary glue code to make the generic OHCI
driver usable for them.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-usb@vger.kernel.org
---
Changes since RFC:
- don't use 'defauly y if SOC_*', select the USB_ARCH_HAS_OHCI option
in the platform specific Kconfig file instead
- remove ath79_ehci_platform.h, it belongs to the EHCI patch
arch/mips/ath79/Kconfig | 2 +
drivers/usb/host/Kconfig | 8 ++
drivers/usb/host/ohci-ath79.c | 162 +++++++++++++++++++++++++++++++++++++++++
drivers/usb/host/ohci-hcd.c | 5 +
4 files changed, 177 insertions(+), 0 deletions(-)
create mode 100644 drivers/usb/host/ohci-ath79.c
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 647f535..d4456ce 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -16,10 +16,12 @@ endmenu
config SOC_AR71XX
select USB_ARCH_HAS_EHCI
+ select USB_ARCH_HAS_OHCI
def_bool n
config SOC_AR724X
select USB_ARCH_HAS_EHCI
+ select USB_ARCH_HAS_OHCI
def_bool n
config SOC_AR913X
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 3a2667a..39ed353 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -240,6 +240,14 @@ config USB_OHCI_HCD_OMAP3
Enables support for the on-chip OHCI controller on
OMAP3 and later chips.
+config USB_OHCI_ATH79
+ bool "USB OHCI support for the Atheros AR71XX/AR724X SoCs"
+ depends on USB_OHCI_HCD && (SOC_AR71XX || SOC_AR724X)
+ default y
+ help
+ Enables support for the uilt-in OHCI controller present on the
+ Atheros AR71XX/AR724X SoCs.
+
config USB_OHCI_HCD_PPC_SOC
bool "OHCI support for on-chip PPC USB controller"
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
diff --git a/drivers/usb/host/ohci-ath79.c b/drivers/usb/host/ohci-ath79.c
new file mode 100644
index 0000000..6e864bf
--- /dev/null
+++ b/drivers/usb/host/ohci-ath79.c
@@ -0,0 +1,162 @@
+/*
+ * OHCI HCD (Host Controller Driver) for USB.
+ *
+ * Bus Glue for Atheros AR71XX/AR724X built-in OHCI controller.
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ * Copyright (C) 2007 Atheros Communications, Inc.
+ *
+ * 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>
+
+static int usb_hcd_ath79_probe(const struct hc_driver *driver,
+ struct platform_device *pdev)
+{
+ struct usb_hcd *hcd;
+ struct resource *res;
+ int irq;
+ int ret;
+
+ res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+ if (!res) {
+ dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
+ dev_name(&pdev->dev));
+ return -ENODEV;
+ }
+ irq = res->start;
+
+ hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
+ if (!hcd)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_dbg(&pdev->dev, "no base address specified for %s\n",
+ dev_name(&pdev->dev));
+ ret = -ENODEV;
+ goto err_put_hcd;
+ }
+ hcd->rsrc_start = res->start;
+ hcd->rsrc_len = res->end - res->start + 1;
+
+ if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
+ dev_dbg(&pdev->dev, "controller already in use\n");
+ ret = -EBUSY;
+ goto err_put_hcd;
+ }
+
+ hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+ if (!hcd->regs) {
+ dev_dbg(&pdev->dev, "error mapping memory\n");
+ ret = -EFAULT;
+ goto err_release_region;
+ }
+
+ ohci_hcd_init(hcd_to_ohci(hcd));
+
+ ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
+ if (ret)
+ goto err_stop_hcd;
+
+ return 0;
+
+err_stop_hcd:
+ iounmap(hcd->regs);
+err_release_region:
+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err_put_hcd:
+ usb_put_hcd(hcd);
+ return ret;
+}
+
+void usb_hcd_ath79_remove(struct usb_hcd *hcd, struct platform_device *pdev)
+{
+ usb_remove_hcd(hcd);
+ iounmap(hcd->regs);
+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+ usb_put_hcd(hcd);
+}
+
+static int __devinit ohci_ath79_start(struct usb_hcd *hcd)
+{
+ struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+ int ret;
+
+ ret = ohci_init(ohci);
+ if (ret < 0)
+ return ret;
+
+ ret = ohci_run(ohci);
+ if (ret < 0)
+ goto err;
+
+ return 0;
+
+err:
+ ohci_stop(hcd);
+ return ret;
+}
+
+static const struct hc_driver ohci_ath79_hc_driver = {
+ .description = hcd_name,
+ .product_desc = "Atheros built-in OHCI controller",
+ .hcd_priv_size = sizeof(struct ohci_hcd),
+
+ .irq = ohci_irq,
+ .flags = HCD_USB11 | HCD_MEMORY,
+
+ .start = ohci_ath79_start,
+ .stop = ohci_stop,
+ .shutdown = ohci_shutdown,
+
+ .urb_enqueue = ohci_urb_enqueue,
+ .urb_dequeue = ohci_urb_dequeue,
+ .endpoint_disable = ohci_endpoint_disable,
+
+ /*
+ * scheduling support
+ */
+ .get_frame_number = ohci_get_frame,
+
+ /*
+ * root hub support
+ */
+ .hub_status_data = ohci_hub_status_data,
+ .hub_control = ohci_hub_control,
+ .start_port_reset = ohci_start_port_reset,
+};
+
+static int ohci_hcd_ath79_drv_probe(struct platform_device *pdev)
+{
+ if (usb_disabled())
+ return -ENODEV;
+
+ return usb_hcd_ath79_probe(&ohci_ath79_hc_driver, pdev);
+}
+
+static int ohci_hcd_ath79_drv_remove(struct platform_device *pdev)
+{
+ struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+ usb_hcd_ath79_remove(hcd, pdev);
+ return 0;
+}
+
+static struct platform_driver ohci_hcd_ath79_driver = {
+ .probe = ohci_hcd_ath79_drv_probe,
+ .remove = ohci_hcd_ath79_drv_remove,
+ .shutdown = usb_hcd_platform_shutdown,
+ .driver = {
+ .name = "ath79-ohci",
+ .owner = THIS_MODULE,
+ },
+};
+
+MODULE_ALIAS("platform:ath79-ohci");
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 5179acb..6daeb68 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1111,6 +1111,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ohci_octeon_driver
#endif
+#ifdef CONFIG_USB_OHCI_ATH79
+#include "ohci-ath79.c"
+#define PLATFORM_DRIVER ohci_hcd_ath79_driver
+#endif
+
#if !defined(PCI_DRIVER) && \
!defined(PLATFORM_DRIVER) && \
!defined(OMAP1_PLATFORM_DRIVER) && \
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 16/18] MIPS: ath79: add common USB Host Controller device
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (14 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 15/18] USB: ohci: add bus glue for the Atheros AR71XX/AR7240 SoCs Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 17/18] MIPS: ath79: add initial support for the Atheros AP81 reference board Gabor Juhos
` (2 subsequent siblings)
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
Add common platform_device and helper code to make the registration of
the built-in USB controllers easier on the board which are using them.
Also register the USB controller on the PB44 board.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
Changes since RFC: ---
arch/mips/ath79/Kconfig | 4 +
arch/mips/ath79/Makefile | 1 +
arch/mips/ath79/dev-usb.c | 192 ++++++++++++++++++++++++
arch/mips/ath79/dev-usb.h | 17 ++
arch/mips/ath79/mach-pb44.c | 2 +
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 15 ++
6 files changed, 231 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/ath79/dev-usb.c
create mode 100644 arch/mips/ath79/dev-usb.h
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index d4456ce..5d67942 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -8,6 +8,7 @@ config ATH79_MACH_PB44
select ATH79_DEV_GPIO_BUTTONS
select ATH79_DEV_LEDS_GPIO
select ATH79_DEV_SPI
+ select ATH79_DEV_USB
help
Say 'Y' here if you want your kernel to support the
Atheros PB44 reference board.
@@ -37,4 +38,7 @@ config ATH79_DEV_LEDS_GPIO
config ATH79_DEV_SPI
def_bool n
+config ATH79_DEV_USB
+ def_bool n
+
endif
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index a8de078..494d106 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -19,6 +19,7 @@ obj-y += dev-common.o
obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o
obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o
obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o
+obj-$(CONFIG_ATH79_DEV_USB) += dev-usb.o
#
# Machines
diff --git a/arch/mips/ath79/dev-usb.c b/arch/mips/ath79/dev-usb.c
new file mode 100644
index 0000000..78b049a
--- /dev/null
+++ b/arch/mips/ath79/dev-usb.c
@@ -0,0 +1,192 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X USB Host Controller support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79_ehci_platform.h>
+#include "common.h"
+#include "dev-usb.h"
+
+static void __iomem *ath79_usb_ctrl_base;
+
+static struct resource ar71xx_ohci_resources[] = {
+ [0] = {
+ .start = AR71XX_OHCI_BASE,
+ .end = AR71XX_OHCI_BASE + AR71XX_OHCI_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = ATH79_MISC_IRQ_OHCI,
+ .end = ATH79_MISC_IRQ_OHCI,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct resource ar724x_usb_resources[] = {
+ [0] = {
+ .start = AR7240_OHCI_BASE,
+ .end = AR7240_OHCI_BASE + AR7240_OHCI_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = ATH79_CPU_IRQ_USB,
+ .end = ATH79_CPU_IRQ_USB,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static u64 ath79_ohci_dmamask = DMA_BIT_MASK(32);
+static struct platform_device ath79_ohci_device = {
+ .name = "ath79-ohci",
+ .id = -1,
+ .resource = ar71xx_ohci_resources,
+ .num_resources = ARRAY_SIZE(ar71xx_ohci_resources),
+ .dev = {
+ .dma_mask = &ath79_ohci_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+};
+
+static struct resource ar71xx_ehci_resources[] = {
+ [0] = {
+ .start = AR71XX_EHCI_BASE,
+ .end = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = ATH79_CPU_IRQ_USB,
+ .end = ATH79_CPU_IRQ_USB,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static u64 ath79_ehci_dmamask = DMA_BIT_MASK(32);
+static struct ath79_ehci_platform_data ath79_ehci_data;
+
+static struct platform_device ath79_ehci_device = {
+ .name = "ath79-ehci",
+ .id = -1,
+ .resource = ar71xx_ehci_resources,
+ .num_resources = ARRAY_SIZE(ar71xx_ehci_resources),
+ .dev = {
+ .dma_mask = &ath79_ehci_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ .platform_data = &ath79_ehci_data,
+ },
+};
+
+#define AR71XX_USB_RESET_MASK (AR71XX_RESET_USB_HOST | \
+ AR71XX_RESET_USB_PHY | \
+ AR71XX_RESET_USB_OHCI_DLL)
+
+static void __init ar71xx_usb_setup(void)
+{
+ ath79_device_stop(AR71XX_USB_RESET_MASK);
+ mdelay(1000);
+ ath79_device_start(AR71XX_USB_RESET_MASK);
+
+ /* Turning on the Buff and Desc swap bits */
+ __raw_writel(0xf0000, ath79_usb_ctrl_base + AR71XX_USB_CTRL_REG_CONFIG);
+
+ /* WAR for HW bug. Here it adjusts the duration between two SOFS */
+ __raw_writel(0x20c00, ath79_usb_ctrl_base + AR71XX_USB_CTRL_REG_FLADJ);
+
+ mdelay(900);
+
+ platform_device_register(&ath79_ohci_device);
+ platform_device_register(&ath79_ehci_device);
+}
+
+#define AR724X_USB_RESET_MASK (AR71XX_RESET_USB_HOST | AR724X_RESET_OHCI_DLL)
+
+static void __init ar7240_usb_setup(void)
+{
+ ath79_device_stop(AR724X_USB_RESET_MASK);
+ mdelay(1000);
+ ath79_device_start(AR724X_USB_RESET_MASK);
+
+ /* WAR for HW bug. Here it adjusts the duration between two SOFS */
+ __raw_writel(0x3, ath79_usb_ctrl_base + AR71XX_USB_CTRL_REG_FLADJ);
+
+ ath79_ohci_device.resource = ar724x_usb_resources;
+ ath79_ohci_device.num_resources = ARRAY_SIZE(ar724x_usb_resources);
+ platform_device_register(&ath79_ohci_device);
+}
+
+static void __init ar724x_usb_setup(void)
+{
+ ath79_device_stop(AR724X_USB_RESET_MASK);
+ mdelay(1000);
+ ath79_device_start(AR724X_USB_RESET_MASK);
+
+ /* WAR for HW bug. Here it adjusts the duration between two SOFS */
+ __raw_writel(0x3, ath79_usb_ctrl_base + AR71XX_USB_CTRL_REG_FLADJ);
+
+ ath79_ehci_data.is_ar913x = 1;
+ ath79_ehci_device.resource = ar724x_usb_resources;
+ ath79_ehci_device.num_resources = ARRAY_SIZE(ar724x_usb_resources);
+ platform_device_register(&ath79_ehci_device);
+}
+
+static void __init ar913x_usb_setup(void)
+{
+ ath79_device_stop(AR71XX_RESET_USBSUS_OVERRIDE);
+ mdelay(10);
+
+ ath79_device_start(AR71XX_RESET_USB_HOST);
+ mdelay(10);
+
+ ath79_device_start(AR71XX_RESET_USB_PHY);
+ mdelay(10);
+
+ ath79_ehci_data.is_ar913x = 1;
+ platform_device_register(&ath79_ehci_device);
+}
+
+void __init ath79_register_usb(void)
+{
+ ath79_usb_ctrl_base = ioremap(AR71XX_USB_CTRL_BASE,
+ AR71XX_USB_CTRL_SIZE);
+
+ switch (ath79_soc) {
+ case ATH79_SOC_AR7130:
+ case ATH79_SOC_AR7141:
+ case ATH79_SOC_AR7161:
+ ar71xx_usb_setup();
+ break;
+
+ case ATH79_SOC_AR7240:
+ ar7240_usb_setup();
+ break;
+
+ case ATH79_SOC_AR7241:
+ case ATH79_SOC_AR7242:
+ ar724x_usb_setup();
+ break;
+
+ case ATH79_SOC_AR9130:
+ case ATH79_SOC_AR9132:
+ ar913x_usb_setup();
+ break;
+
+ default:
+ BUG();
+ }
+}
diff --git a/arch/mips/ath79/dev-usb.h b/arch/mips/ath79/dev-usb.h
new file mode 100644
index 0000000..dbe6d3d
--- /dev/null
+++ b/arch/mips/ath79/dev-usb.h
@@ -0,0 +1,17 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X USB Host Controller support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_DEV_USB_H
+#define _ATH79_DEV_USB_H
+
+void ath79_register_usb(void) __init;
+
+#endif /* _ATH79_DEV_USB_H */
diff --git a/arch/mips/ath79/mach-pb44.c b/arch/mips/ath79/mach-pb44.c
index 257815e..3e0bb05 100644
--- a/arch/mips/ath79/mach-pb44.c
+++ b/arch/mips/ath79/mach-pb44.c
@@ -18,6 +18,7 @@
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-spi.h"
+#include "dev-usb.h"
#define PB44_GPIO_I2C_SCL 0
#define PB44_GPIO_I2C_SDA 1
@@ -111,6 +112,7 @@ static void __init pb44_init(void)
pb44_gpio_buttons);
ath79_register_spi(&pb44_spi_data, pb44_spi_info,
ARRAY_SIZE(pb44_spi_info));
+ ath79_register_usb();
}
MIPS_MACHINE(ATH79_MACH_PB44, "PB44", "Atheros PB44 reference board",
diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index 4f2b621..95be423 100644
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -20,6 +20,10 @@
#include <linux/bitops.h>
#define AR71XX_APB_BASE 0x18000000
+#define AR71XX_EHCI_BASE 0x1b000000
+#define AR71XX_EHCI_SIZE 0x1000
+#define AR71XX_OHCI_BASE 0x1c000000
+#define AR71XX_OHCI_SIZE 0x1000
#define AR71XX_SPI_BASE 0x1f000000
#define AR71XX_SPI_SIZE 0x01000000
@@ -27,6 +31,8 @@
#define AR71XX_DDR_CTRL_SIZE 0x100
#define AR71XX_UART_BASE (AR71XX_APB_BASE + 0x00020000)
#define AR71XX_UART_SIZE 0x100
+#define AR71XX_USB_CTRL_BASE (AR71XX_APB_BASE + 0x00030000)
+#define AR71XX_USB_CTRL_SIZE 0x100
#define AR71XX_GPIO_BASE (AR71XX_APB_BASE + 0x00040000)
#define AR71XX_GPIO_SIZE 0x100
#define AR71XX_PLL_BASE (AR71XX_APB_BASE + 0x00050000)
@@ -34,6 +40,9 @@
#define AR71XX_RESET_BASE (AR71XX_APB_BASE + 0x00060000)
#define AR71XX_RESET_SIZE 0x100
+#define AR7240_OHCI_BASE 0x1b000000
+#define AR7240_OHCI_SIZE 0x1000
+
/*
* DDR_CTRL block
*/
@@ -102,6 +111,12 @@
#define AR913X_AHB_DIV_MASK 0x1
/*
+ * USB_CONFIG block
+ */
+#define AR71XX_USB_CTRL_REG_FLADJ 0x00
+#define AR71XX_USB_CTRL_REG_CONFIG 0x04
+
+/*
* RESET block
*/
#define AR71XX_RESET_REG_TIMER 0x00
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 17/18] MIPS: ath79: add initial support for the Atheros AP81 reference board
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (15 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 16/18] MIPS: ath79: add common USB Host Controller device Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 15:06 ` [PATCH 18/18] MIPS: ath79: add common WMAC device for AR913X based boards Gabor Juhos
2010-11-23 18:16 ` [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Arnaud Lacombe
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
Changes since RFC:
- don't use 'default n' for the ATH79_MACH_AP81 Kconfig option
arch/mips/ath79/Kconfig | 11 +++++
arch/mips/ath79/Makefile | 1 +
arch/mips/ath79/mach-ap81.c | 93 +++++++++++++++++++++++++++++++++++++++++++
arch/mips/ath79/machtypes.h | 1 +
4 files changed, 106 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/ath79/mach-ap81.c
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 5d67942..1912d54 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -2,6 +2,17 @@ if ATH79
menu "Atheros AR71XX/AR724X/AR913X machine selection"
+config ATH79_MACH_AP81
+ bool "Atheros AP81 reference board"
+ select SOC_AR913X
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
+ select ATH79_DEV_SPI
+ select ATH79_DEV_USB
+ help
+ Say 'Y' here if you want your kernel to support the
+ Atheros AP81 reference board.
+
config ATH79_MACH_PB44
bool "Atheros PB44 reference board"
select SOC_AR71XX
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index 494d106..1b111d8 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -24,4 +24,5 @@ obj-$(CONFIG_ATH79_DEV_USB) += dev-usb.o
#
# Machines
#
+obj-$(CONFIG_ATH79_MACH_AP81) += mach-ap81.o
obj-$(CONFIG_ATH79_MACH_PB44) += mach-pb44.o
diff --git a/arch/mips/ath79/mach-ap81.c b/arch/mips/ath79/mach-ap81.c
new file mode 100644
index 0000000..9cfaff3
--- /dev/null
+++ b/arch/mips/ath79/mach-ap81.c
@@ -0,0 +1,93 @@
+/*
+ * Atheros AP81 board support
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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 "machtypes.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+
+#define AP81_GPIO_LED_STATUS 1
+#define AP81_GPIO_LED_AOSS 3
+#define AP81_GPIO_LED_WLAN 6
+#define AP81_GPIO_LED_POWER 14
+
+#define AP81_GPIO_BTN_SW4 12
+#define AP81_GPIO_BTN_SW1 21
+
+#define AP81_BUTTONS_POLL_INTERVAL 20
+
+static struct gpio_led ap81_leds_gpio[] __initdata = {
+ {
+ .name = "ap81:green:status",
+ .gpio = AP81_GPIO_LED_STATUS,
+ .active_low = 1,
+ }, {
+ .name = "ap81:amber:aoss",
+ .gpio = AP81_GPIO_LED_AOSS,
+ .active_low = 1,
+ }, {
+ .name = "ap81:green:wlan",
+ .gpio = AP81_GPIO_LED_WLAN,
+ .active_low = 1,
+ }, {
+ .name = "ap81:green:power",
+ .gpio = AP81_GPIO_LED_POWER,
+ .active_low = 1,
+ }
+};
+
+static struct gpio_button ap81_gpio_buttons[] __initdata = {
+ {
+ .desc = "sw1",
+ .type = EV_KEY,
+ .code = BTN_0,
+ .threshold = 3,
+ .gpio = AP81_GPIO_BTN_SW1,
+ .active_low = 1,
+ } , {
+ .desc = "sw4",
+ .type = EV_KEY,
+ .code = BTN_1,
+ .threshold = 3,
+ .gpio = AP81_GPIO_BTN_SW4,
+ .active_low = 1,
+ }
+};
+
+static struct spi_board_info ap81_spi_info[] = {
+ {
+ .bus_num = 0,
+ .chip_select = 0,
+ .max_speed_hz = 25000000,
+ .modalias = "m25p64",
+ }
+};
+
+static struct ath79_spi_platform_data ap81_spi_data = {
+ .bus_num = 0,
+ .num_chipselect = 1,
+};
+
+static void __init ap81_setup(void)
+{
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(ap81_leds_gpio),
+ ap81_leds_gpio);
+ ath79_register_gpio_buttons(-1, AP81_BUTTONS_POLL_INTERVAL,
+ ARRAY_SIZE(ap81_gpio_buttons),
+ ap81_gpio_buttons);
+ ath79_register_spi(&ap81_spi_data, ap81_spi_info,
+ ARRAY_SIZE(ap81_spi_info));
+ ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_AP81, "AP81", "Atheros AP81 reference board",
+ ap81_setup);
diff --git a/arch/mips/ath79/machtypes.h b/arch/mips/ath79/machtypes.h
index a796fa3..3940fe4 100644
--- a/arch/mips/ath79/machtypes.h
+++ b/arch/mips/ath79/machtypes.h
@@ -16,6 +16,7 @@
enum ath79_mach_type {
ATH79_MACH_GENERIC = 0,
+ ATH79_MACH_AP81, /* Atheros AP81 reference board */
ATH79_MACH_PB44, /* Atheros PB44 reference board */
};
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCH 18/18] MIPS: ath79: add common WMAC device for AR913X based boards
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (16 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 17/18] MIPS: ath79: add initial support for the Atheros AP81 reference board Gabor Juhos
@ 2010-11-23 15:06 ` Gabor Juhos
2010-11-23 18:16 ` [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Arnaud Lacombe
18 siblings, 0 replies; 62+ messages in thread
From: Gabor Juhos @ 2010-11-23 15:06 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden, Gabor Juhos
Add common platform_device and helper code to make the registration
of the built-in wireless MAC easier on the Atheros AR9130/AR9132
based boards. Also register the WMAC device on the AR81 board.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
Changes since RFC: ---
arch/mips/ath79/Kconfig | 5 ++
arch/mips/ath79/Makefile | 1 +
arch/mips/ath79/dev-ar913x-wmac.c | 60 ++++++++++++++++++++++++
arch/mips/ath79/dev-ar913x-wmac.h | 17 +++++++
arch/mips/ath79/mach-ap81.c | 5 ++
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 3 +
6 files changed, 91 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/ath79/dev-ar913x-wmac.c
create mode 100644 arch/mips/ath79/dev-ar913x-wmac.h
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 1912d54..af01669 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -5,6 +5,7 @@ menu "Atheros AR71XX/AR724X/AR913X machine selection"
config ATH79_MACH_AP81
bool "Atheros AP81 reference board"
select SOC_AR913X
+ select ATH79_DEV_AR913X_WMAC
select ATH79_DEV_GPIO_BUTTONS
select ATH79_DEV_LEDS_GPIO
select ATH79_DEV_SPI
@@ -40,6 +41,10 @@ config SOC_AR913X
select USB_ARCH_HAS_EHCI
def_bool n
+config ATH79_DEV_AR913X_WMAC
+ depends on SOC_AR913X
+ def_bool n
+
config ATH79_DEV_GPIO_BUTTONS
def_bool n
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index 1b111d8..48398561 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
# Devices
#
obj-y += dev-common.o
+obj-$(CONFIG_ATH79_DEV_AR913X_WMAC) += dev-ar913x-wmac.o
obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o
obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o
obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o
diff --git a/arch/mips/ath79/dev-ar913x-wmac.c b/arch/mips/ath79/dev-ar913x-wmac.c
new file mode 100644
index 0000000..ad2a39f
--- /dev/null
+++ b/arch/mips/ath79/dev-ar913x-wmac.c
@@ -0,0 +1,60 @@
+/*
+ * Atheros AR913X SoC built-in WMAC device support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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/delay.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include "dev-ar913x-wmac.h"
+
+static struct ath9k_platform_data ar913x_wmac_data;
+
+static struct resource ar913x_wmac_resources[] = {
+ {
+ .start = AR913X_WMAC_BASE,
+ .end = AR913X_WMAC_BASE + AR913X_WMAC_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = ATH79_CPU_IRQ_IP2,
+ .end = ATH79_CPU_IRQ_IP2,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device ar913x_wmac_device = {
+ .name = "ath9k",
+ .id = -1,
+ .resource = ar913x_wmac_resources,
+ .num_resources = ARRAY_SIZE(ar913x_wmac_resources),
+ .dev = {
+ .platform_data = &ar913x_wmac_data,
+ },
+};
+
+void __init ath79_register_ar913x_wmac(u8 *cal_data)
+{
+ if (cal_data)
+ memcpy(ar913x_wmac_data.eeprom_data, cal_data,
+ sizeof(ar913x_wmac_data.eeprom_data));
+
+ /* reset the WMAC */
+ ath79_device_stop(AR913X_RESET_AMBA2WMAC);
+ mdelay(10);
+
+ ath79_device_start(AR913X_RESET_AMBA2WMAC);
+ mdelay(10);
+
+ platform_device_register(&ar913x_wmac_device);
+}
diff --git a/arch/mips/ath79/dev-ar913x-wmac.h b/arch/mips/ath79/dev-ar913x-wmac.h
new file mode 100644
index 0000000..5df653f
--- /dev/null
+++ b/arch/mips/ath79/dev-ar913x-wmac.h
@@ -0,0 +1,17 @@
+/*
+ * Atheros AR913X SoC built-in WMAC device support
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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.
+ */
+
+#ifndef _ATH79_DEV_AR913X_WMAC_H
+#define _ATH79_DEV_AR913X_WMAC_H
+
+void ath79_register_ar913x_wmac(u8 *cal_data) __init;
+
+#endif /* _ATH79_DEV_AR913X_WMAC_H */
diff --git a/arch/mips/ath79/mach-ap81.c b/arch/mips/ath79/mach-ap81.c
index 9cfaff3..00ef1cd 100644
--- a/arch/mips/ath79/mach-ap81.c
+++ b/arch/mips/ath79/mach-ap81.c
@@ -10,6 +10,7 @@
*/
#include "machtypes.h"
+#include "dev-ar913x-wmac.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-spi.h"
@@ -24,6 +25,7 @@
#define AP81_GPIO_BTN_SW1 21
#define AP81_BUTTONS_POLL_INTERVAL 20
+#define AP81_CAL_DATA_ADDR 0x1fff1000
static struct gpio_led ap81_leds_gpio[] __initdata = {
{
@@ -79,6 +81,8 @@ static struct ath79_spi_platform_data ap81_spi_data = {
static void __init ap81_setup(void)
{
+ u8 *cal_data = (u8 *) KSEG1ADDR(AP81_CAL_DATA_ADDR);
+
ath79_register_leds_gpio(-1, ARRAY_SIZE(ap81_leds_gpio),
ap81_leds_gpio);
ath79_register_gpio_buttons(-1, AP81_BUTTONS_POLL_INTERVAL,
@@ -87,6 +91,7 @@ static void __init ap81_setup(void)
ath79_register_spi(&ap81_spi_data, ap81_spi_info,
ARRAY_SIZE(ap81_spi_info));
ath79_register_usb();
+ ath79_register_ar913x_wmac(cal_data);
}
MIPS_MACHINE(ATH79_MACH_AP81, "AP81", "Atheros AP81 reference board",
diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index 95be423..e8b0e2f 100644
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -43,6 +43,9 @@
#define AR7240_OHCI_BASE 0x1b000000
#define AR7240_OHCI_SIZE 0x1000
+#define AR913X_WMAC_BASE (AR71XX_APB_BASE + 0x000C0000)
+#define AR913X_WMAC_SIZE 0x30000
+
/*
* DDR_CTRL block
*/
--
1.7.2.1
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs
2010-11-23 15:06 [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Gabor Juhos
` (17 preceding siblings ...)
2010-11-23 15:06 ` [PATCH 18/18] MIPS: ath79: add common WMAC device for AR913X based boards Gabor Juhos
@ 2010-11-23 18:16 ` Arnaud Lacombe
2010-11-23 18:18 ` Arnaud Lacombe
18 siblings, 1 reply; 62+ messages in thread
From: Arnaud Lacombe @ 2010-11-23 18:16 UTC (permalink / raw)
To: Gabor Juhos
Cc: Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden
Hi,
On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
> This patch set contains initial support for the
> Atheros AR71XX/AR724X/AR913X SoCs.
>
Could you maybe describe what changed between the first submission and
this serie ? AFAIK, there has been private review/discussions going
on, so this would give a hit of the evolution.
Thanks,
- Arnaud
> Gabor Juhos (18):
> MIPS: add initial support for the Atheros AR71XX/AR724X/AR931X SoCs
> MIPS: ath79: add GPIOLIB support
> MIPS: add generic support for multiple machines within a single
> kernel
> MIPS: ath79: utilize the MIPS multi-machine support
> MIPS: ath79: add initial support for the Atheros PB44 reference board
> MIPS: ath79: add common GPIO LEDs device
> watchdog: add driver for the Atheros AR71XX/AR724X/AR913X SoCs
> MIPS: ath79: add common watchdog device
> input: add input driver for polled GPIO buttons
> MIPS: ath79: add common GPIO buttons device
> spi: add SPI controller driver for the Atheros AR71XX/AR724X/AR913X
> SoCs
> MIPS: ath79: add common SPI controller device
> USB: ehci: add workaround for Synopsys HC bug
> USB: ehci: add bus glue for the Atheros AR71XX/AR724X/AR913X SoCs
> USB: ohci: add bus glue for the Atheros AR71XX/AR7240 SoCs
> MIPS: ath79: add common USB Host Controller device
> MIPS: ath79: add initial support for the Atheros AP81 reference board
> MIPS: ath79: add common WMAC device for AR913X based boards
>
> arch/mips/Kbuild.platforms | 1 +
> arch/mips/Kconfig | 20 ++
> arch/mips/ath79/Kconfig | 60 ++++
> arch/mips/ath79/Makefile | 29 ++
> arch/mips/ath79/Platform | 7 +
> arch/mips/ath79/common.c | 113 ++++++++
> arch/mips/ath79/common.h | 67 +++++
> arch/mips/ath79/dev-ar913x-wmac.c | 60 ++++
> arch/mips/ath79/dev-ar913x-wmac.h | 17 ++
> arch/mips/ath79/dev-common.c | 69 +++++
> arch/mips/ath79/dev-common.h | 18 ++
> arch/mips/ath79/dev-gpio-buttons.c | 58 ++++
> arch/mips/ath79/dev-gpio-buttons.h | 23 ++
> arch/mips/ath79/dev-leds-gpio.c | 56 ++++
> arch/mips/ath79/dev-leds-gpio.h | 21 ++
> arch/mips/ath79/dev-spi.c | 38 +++
> arch/mips/ath79/dev-spi.h | 22 ++
> arch/mips/ath79/dev-usb.c | 192 +++++++++++++
> arch/mips/ath79/dev-usb.h | 17 ++
> arch/mips/ath79/early_printk.c | 36 +++
> arch/mips/ath79/gpio.c | 196 +++++++++++++
> arch/mips/ath79/irq.c | 187 +++++++++++++
> arch/mips/ath79/mach-ap81.c | 98 +++++++
> arch/mips/ath79/mach-pb44.c | 119 ++++++++
> arch/mips/ath79/machtypes.h | 23 ++
> arch/mips/ath79/prom.c | 57 ++++
> arch/mips/ath79/setup.c | 279 +++++++++++++++++++
> arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 248 +++++++++++++++++
> arch/mips/include/asm/mach-ath79/ath79.h | 50 ++++
> .../include/asm/mach-ath79/ath79_ehci_platform.h | 18 ++
> .../include/asm/mach-ath79/ath79_spi_platform.h | 19 ++
> .../include/asm/mach-ath79/cpu-feature-overrides.h | 56 ++++
> arch/mips/include/asm/mach-ath79/gpio.h | 26 ++
> arch/mips/include/asm/mach-ath79/irq.h | 36 +++
> .../include/asm/mach-ath79/kernel-entry-init.h | 32 +++
> arch/mips/include/asm/mach-ath79/war.h | 25 ++
> arch/mips/include/asm/mips_machine.h | 54 ++++
> arch/mips/kernel/Makefile | 1 +
> arch/mips/kernel/mips_machine.c | 86 ++++++
> arch/mips/kernel/proc.c | 7 +-
> arch/mips/kernel/vmlinux.lds.S | 7 +
> drivers/input/misc/Kconfig | 16 +
> drivers/input/misc/Makefile | 1 +
> drivers/input/misc/gpio_buttons.c | 232 ++++++++++++++++
> drivers/spi/Kconfig | 8 +
> drivers/spi/Makefile | 1 +
> drivers/spi/ath79_spi.c | 290 +++++++++++++++++++
> drivers/usb/host/Kconfig | 16 +
> drivers/usb/host/ehci-ath79.c | 176 ++++++++++++
> drivers/usb/host/ehci-hcd.c | 5 +
> drivers/usb/host/ehci-q.c | 3 +
> drivers/usb/host/ehci.h | 1 +
> drivers/usb/host/ohci-ath79.c | 162 +++++++++++
> drivers/usb/host/ohci-hcd.c | 5 +
> drivers/watchdog/Kconfig | 8 +
> drivers/watchdog/Makefile | 1 +
> drivers/watchdog/ath79_wdt.c | 293 ++++++++++++++++++++
> include/linux/gpio_buttons.h | 33 +++
> 58 files changed, 3798 insertions(+), 1 deletions(-)
> create mode 100644 arch/mips/ath79/Kconfig
> create mode 100644 arch/mips/ath79/Makefile
> create mode 100644 arch/mips/ath79/Platform
> create mode 100644 arch/mips/ath79/common.c
> create mode 100644 arch/mips/ath79/common.h
> create mode 100644 arch/mips/ath79/dev-ar913x-wmac.c
> create mode 100644 arch/mips/ath79/dev-ar913x-wmac.h
> create mode 100644 arch/mips/ath79/dev-common.c
> create mode 100644 arch/mips/ath79/dev-common.h
> create mode 100644 arch/mips/ath79/dev-gpio-buttons.c
> create mode 100644 arch/mips/ath79/dev-gpio-buttons.h
> create mode 100644 arch/mips/ath79/dev-leds-gpio.c
> create mode 100644 arch/mips/ath79/dev-leds-gpio.h
> create mode 100644 arch/mips/ath79/dev-spi.c
> create mode 100644 arch/mips/ath79/dev-spi.h
> create mode 100644 arch/mips/ath79/dev-usb.c
> create mode 100644 arch/mips/ath79/dev-usb.h
> create mode 100644 arch/mips/ath79/early_printk.c
> create mode 100644 arch/mips/ath79/gpio.c
> create mode 100644 arch/mips/ath79/irq.c
> create mode 100644 arch/mips/ath79/mach-ap81.c
> create mode 100644 arch/mips/ath79/mach-pb44.c
> create mode 100644 arch/mips/ath79/machtypes.h
> create mode 100644 arch/mips/ath79/prom.c
> create mode 100644 arch/mips/ath79/setup.c
> create mode 100644 arch/mips/include/asm/mach-ath79/ar71xx_regs.h
> create mode 100644 arch/mips/include/asm/mach-ath79/ath79.h
> create mode 100644 arch/mips/include/asm/mach-ath79/ath79_ehci_platform.h
> create mode 100644 arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
> create mode 100644 arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
> create mode 100644 arch/mips/include/asm/mach-ath79/gpio.h
> create mode 100644 arch/mips/include/asm/mach-ath79/irq.h
> create mode 100644 arch/mips/include/asm/mach-ath79/kernel-entry-init.h
> create mode 100644 arch/mips/include/asm/mach-ath79/war.h
> create mode 100644 arch/mips/include/asm/mips_machine.h
> create mode 100644 arch/mips/kernel/mips_machine.c
> create mode 100644 drivers/input/misc/gpio_buttons.c
> create mode 100644 drivers/spi/ath79_spi.c
> create mode 100644 drivers/usb/host/ehci-ath79.c
> create mode 100644 drivers/usb/host/ohci-ath79.c
> create mode 100644 drivers/watchdog/ath79_wdt.c
> create mode 100644 include/linux/gpio_buttons.h
>
> --
> 1.7.2.1
>
>
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs
2010-11-23 18:16 ` [PATCH 00/18] MIPS: initial support for the Atheros AR71XX/AR724X/AR913X SoCs Arnaud Lacombe
@ 2010-11-23 18:18 ` Arnaud Lacombe
0 siblings, 0 replies; 62+ messages in thread
From: Arnaud Lacombe @ 2010-11-23 18:18 UTC (permalink / raw)
To: Gabor Juhos
Cc: Ralf Baechle, linux-mips, kaloz, Luis R. Rodriguez, Cliff Holden
Hi,
On Tue, Nov 23, 2010 at 1:16 PM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Hi,
>
> On Tue, Nov 23, 2010 at 10:06 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
>> This patch set contains initial support for the
>> Atheros AR71XX/AR724X/AR913X SoCs.
>>
> Could you maybe describe what changed between the first submission and
> this serie ? AFAIK, there has been private review/discussions going
> on, so this would give a hit of the evolution.
>
Please forget about that, it's included in each patch :)
- Arnaud
^ permalink raw reply [flat|nested] 62+ messages in thread