Skip to content
Snippets Groups Projects
Commit c9dcbd55 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

port new diag driver to kamikaze 

SVN-Revision: 5426
parent c7213d81
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
package/diag/Makefile → package/broadcom-diag/Makefile
+ 6
− 11
View file @ c9dcbd55
......@@ -9,20 +9,21 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=kmod-diag
PKG_NAME:=broadcom-diag
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
define Package/kmod-diag
define KernelPackage/diag
SECTION:=kernel
CATEGORY:=Kernel drivers
DEFAULT:=y
DEPENDS:=@LINUX_2_4_BRCM
DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM
TITLE:=Driver for router LEDs and Buttons
VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX)
endef
define Build/Prepare
......@@ -39,10 +40,4 @@ define Build/Compile
modules
endef
define Package/kmod-diag/install
install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
$(CP) $(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX) \
$(1)/lib/modules/$(LINUX_VERSION)/
endef
$(eval $(call BuildPackage,kmod-diag))
$(eval $(call KernelPackage,diag))
package/diag/src/Makefile → package/broadcom-diag/src/Makefile
+ 0
− 1
View file @ c9dcbd55
......@@ -13,7 +13,6 @@
obj-m := diag.o
ifeq ($(MAKING_MODULES),1)
export-objs := diag.o
-include $(TOPDIR)/Rules.make
endif
package/broadcom-diag/src/diag.c 0 → 100644
+ 939
− 0
View file @ c9dcbd55
This diff is collapsed.
package/diag/src/diag.c deleted 100644 → 0
+ 0
− 284
View file @ c7213d81
/*
* diag_led.c - replacement diag module
*
* Copyright (C) 2004 Mike Baker,
* Imre Kaloz <kaloz@dune.hu>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/
/*
* ChangeLog:
* 2004/03/28 initial release
* 2004/08/26 asus & buffalo support added
* 2005/03/14 asus wl-500g deluxe and buffalo v2 support added
* 2005/04/13 added licensing informations
* 2005/04/18 base reset polarity off initial readings
* 2006/02/07 motorola wa840g/we800g support added
* 2006/08/18 asus power led support added
*/
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sysctl.h>
#include <asm/io.h>
#include <typedefs.h>
#include <osl.h>
#include <bcmdevs.h>
#include <sbutils.h>
extern char * nvram_get(const char *name);
static void *sbh;
// v2.x - - - - -
#define DIAG_GPIO (1<<1)
#define DMZ_GPIO (1<<7)
static void set_gpio(uint32 mask, uint32 value) {
sb_gpiocontrol(sbh,mask, 0, GPIO_DRV_PRIORITY);
sb_gpioouten(sbh,mask,mask,GPIO_DRV_PRIORITY);
sb_gpioout(sbh,mask,value,GPIO_DRV_PRIORITY);
}
static void v2_set_diag(u8 state) {
set_gpio(DIAG_GPIO,state);
}
static void v2_set_dmz(u8 state) {
set_gpio(DMZ_GPIO,state);
}
// asus wl-500g (+deluxe)
#define ASUS_PWR_GPIO (1<<0)
static void asus_set_pwr(u8 state) {
set_gpio(ASUS_PWR_GPIO,state);
}
// v1.x - - - - -
#define LED_DIAG 0x13
#define LED_DMZ 0x12
static void v1_set_diag(u8 state) {
if (!state) {
*(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DIAG)=0xFF;
} else {
*(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DIAG);
}
}
static void v1_set_dmz(u8 state) {
if (!state) {
*(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DMZ)=0xFF;
} else {
*(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DMZ);
}
}
static void wap1_set_diag(u8 state) {
set_gpio(1<<3,state);
}
static void wap1_set_dmz(u8 state) {
set_gpio(1<<4,state);
}
// - - - - -
static void ignore(u8 ignored) {};
// - - - - -
#define BIT_DMZ 0x01
#define BIT_PWR 0x02
#define BIT_DIAG 0x04
void (*set_diag)(u8 state);
void (*set_dmz)(u8 state);
void (*set_pwr)(u8 state);
static unsigned int diag = 0x02; // default: diag off, pwr on, dmz off
static void diag_change(void)
{
set_diag(0xFF); // off
set_dmz(0xFF); // off
set_pwr(0xFF); // off
if(diag & BIT_DIAG)
set_diag(0x00); // on
if(diag & BIT_DMZ)
set_dmz(0x00); // on
if (diag & BIT_PWR)
set_pwr(0x00); //on
}
static int proc_diag(ctl_table *table, int write, struct file *filp,
void *buffer, size_t *lenp)
{
int r;
r = proc_dointvec(table, write, filp, buffer, lenp);
if (write && !r) {
diag_change();
}
return r;
}
// - - - - -
static unsigned char reset_gpio = 0;
static unsigned char reset_polarity = 0;
static unsigned int reset = 0;
static int proc_reset(ctl_table *table, int write, struct file *filp,
void *buffer, size_t *lenp)
{
if (reset_gpio) {
sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY);
sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY);
reset=!(sb_gpioin(sbh)&reset_gpio);
if (reset_polarity) reset=!reset;
} else {
reset=0;
}
return proc_dointvec(table, write, filp, buffer, lenp);
}
// - - - - -
static struct ctl_table_header *diag_sysctl_header;
static ctl_table sys_diag[] = {
{
ctl_name: 2000,
procname: "diag",
data: &diag,
maxlen: sizeof(diag),
mode: 0644,
proc_handler: proc_diag
},
{
ctl_name: 2001,
procname: "reset",
data: &reset,
maxlen: sizeof(reset),
mode: 0444,
proc_handler: proc_reset
},
{ 0 }
};
static int __init diag_init(void)
{
char *buf;
u32 board_type;
sbh = (void *)sb_kattach();
sb_gpiosetcore(sbh);
board_type = sb_boardtype(sbh);
printk(KERN_INFO "diag boardtype: %08x\n",board_type);
set_diag=ignore;
set_dmz=ignore;
set_pwr=ignore;
buf=nvram_get("pmon_ver") ?: "";
if (((board_type & 0xf00) == 0x400) && (strncmp(buf, "CFE", 3) != 0)) {
buf=nvram_get("boardtype")?:"";
if (!strncmp(buf,"bcm94710dev",11)) {
buf=nvram_get("boardnum")?:"";
if (!strcmp(buf,"42")) {
// wrt54g v1.x
set_diag=v1_set_diag;
set_dmz=v1_set_dmz;
reset_gpio=(1<<6);
}
if (simple_strtoul(buf, NULL, 0) == 2) {
// wap54g v1.0
// do not use strcmp as PMON v5.3.22 has some built-in nvram
// defaults with trailing \r
set_diag=wap1_set_diag;
// no dmz led on wap54g, used green led
// labeled "WLAN Link" instead
set_dmz=wap1_set_dmz;
reset_gpio=(1<<0);
}
if (!strcmp(buf,"asusX")) {
//asus wl-500g
set_pwr=asus_set_pwr;
reset_gpio=(1<<6);
}
if (!strcmp(buf,"2")) {
//wa840g v1 / we800g v1
reset_gpio=(1<<0);
}
}
if (!strcmp(buf,"bcm94710ap")) {
buf=nvram_get("boardnum")?:"";
if (!strcmp(buf,"42")) {
// buffalo
set_dmz=v2_set_dmz;
reset_gpio=(1<<4);
}
if (!strcmp(buf,"44")) {
//dell truemobile
set_dmz=v2_set_dmz;
reset_gpio=(1<<0);
}
}
} else {
buf=nvram_get("boardnum")?:"";
if (!strcmp(buf,"42")) {
//linksys
set_diag=v2_set_diag;
set_dmz=v2_set_dmz;
reset_gpio=(1<<6);
}
if (!strcmp(buf,"44")) {
//motorola
reset_gpio=(1<<5);
}
if (!strcmp(buf,"00")) {
//buffalo
reset_gpio=(1<<7);
}
if (!strcmp(buf,"45")) {
//wl-500g deluxe
set_pwr=asus_set_pwr;
reset_gpio=(1<<6);
}
}
sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY);
sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY);
reset_polarity=!(sb_gpioin(sbh)&reset_gpio);
diag_sysctl_header = register_sysctl_table(sys_diag, 0);
diag_change();
return 0;
}
static void __exit diag_exit(void)
{
unregister_sysctl_table(diag_sysctl_header);
}
EXPORT_NO_SYMBOLS;
MODULE_AUTHOR("openwrt.org");
MODULE_LICENSE("GPL");
module_init(diag_init);
module_exit(diag_exit);
target/linux/brcm-2.4/patches/001-bcm47xx.patch
+ 6
− 1
View file @ c9dcbd55
......@@ -1743,7 +1743,7 @@ diff -urN linux.old/arch/mips/bcm947xx/compressed/Makefile linux.dev/arch/mips/b
diff -urN linux.old/arch/mips/bcm947xx/export.c linux.dev/arch/mips/bcm947xx/export.c
--- linux.old/arch/mips/bcm947xx/export.c 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/arch/mips/bcm947xx/export.c 2006-10-02 21:19:59.000000000 +0200
@@ -0,0 +1,65 @@
@@ -0,0 +1,70 @@
+#include <linux/module.h>
+
+#define _export(n) \
......@@ -1772,17 +1772,21 @@ diff -urN linux.old/arch/mips/bcm947xx/export.c linux.dev/arch/mips/bcm947xx/exp
+_export(sb_coreflags)
+_export(sb_coreflagshi)
+_export(sb_coreidx)
+_export(sb_coreregs)
+_export(sb_corerev)
+_export(sb_coreunit)
+_export(sb_detach)
+_export(sb_deviceremoved)
+_export(sb_gpiosetcore)
+_export(sb_gpiocontrol)
+_export(sb_gpiointmask)
+_export(sb_gpiointpolarity)
+_export(sb_gpioled)
+_export(sb_gpioin)
+_export(sb_gpioout)
+_export(sb_gpioouten)
+_export(sb_gpiotimerval)
+_export(sb_irq)
+_export(sb_iscoreup)
+_export(sb_pci_setup)
+_export(sb_pcirev)
......@@ -1790,6 +1794,7 @@ diff -urN linux.old/arch/mips/bcm947xx/export.c linux.dev/arch/mips/bcm947xx/exp
+_export(sb_pcmciarev)
+_export(sb_register_intr_callback)
+_export(sb_setcore)
+_export(sb_setcoreidx)
+_export(sb_war16165)
+_export(sb_osh)
+
......
target/linux/brcm-2.6/patches/001-bcm947xx.patch
+ 78
− 64
View file @ c9dcbd55
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Hosted with love by Chaotikum e.V. Support us if you can