From: Gabor Juhos Date: Tue, 29 Apr 2008 15:53:04 +0000 (+0000) Subject: [kernel] add Dallas's 1-wire related packages X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=020edf57b62b36190430786eedfb068f9c429d37 [kernel] add Dallas's 1-wire related packages SVN-Revision: 10977 --- diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk new file mode 100644 index 0000000000..0e75742598 --- /dev/null +++ b/package/kernel/modules/w1.mk @@ -0,0 +1,116 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +W1_MENU:=W1 support +W1_MASTERS_DIR:=$(LINUX_DIR)/drivers/w1/masters +W1_SLAVES_DIR:=$(LINUX_DIR)/drivers/w1/slaves + +define KernelPackage/w1 + SUBMENU:=$(W1_MENU) + TITLE:=Dallas's 1-wire support + DEPENDS:=@LINUX_2_6 + KCONFIG:=CONFIG_W1 + FILES:=$(LINUX_DIR)/drivers/w1/wire.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,wire) +endef + +define KernelPackage/w1/description + Kernel module for Dallas's 1-wire support +endef + +$(eval $(call KernelPackage,w1)) + +define w1dep + SUBMENU:=$(W1_MENU) + DEPENDS:=kmod-w1 $(1) +endef + + +# +# 1-wire masters +# +define KernelPackage/w1-master-gpio + $(call w1dep,@GPIO_SUPPORT) + TITLE:=GPIO 1-wire bus master driver + KCONFIG:=CONFIG_W1_MASTER_GPIO + FILES:=$(W1_MASTERS_DIR)/w1-gpio.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,51,w1-gpio) +endef + +define KernelPackage/w1-master-gpio/description + Kernel module for the GPIO 1-wire bus master driver +endef + +$(eval $(call KernelPackage,w1-master-gpio)) + + +# +# 1-wire slaves +# +ifeq (1,1) +define KernelPackage/w1-slave-therm + $(call w1dep,) + TITLE:=Thermal family implementation + KCONFIG:=CONFIG_W1_SLAVE_THERM + FILES:=$(W1_SLAVES_DIR)/w1_therm.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,52,w1_therm) +endef + +define KernelPackage/w1-slave-therm/description + Kernel module for 1-wire thermal sensors +endef + +$(eval $(call KernelPackage,w1-slave-therm)) + + +define KernelPackage/w1-slave-smem + $(call w1dep,) + TITLE:=Simple 64bit memory family implementation + KCONFIG:=CONFIG_W1_SLAVE_SMEM + FILES:=$(W1_SLAVES_DIR)/w1_smem.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,52,w1_smem) +endef + +define KernelPackage/w1-slave-smem/description + Kernel module for 1-wire simple 64bit memory rom(ds2401/ds2411/ds1990*) +endef + +$(eval $(call KernelPackage,w1-slave-smem)) + +define KernelPackage/w1-slave-ds2433 + $(call w1dep,) + TITLE:=Simple 64bit memory family implementation + KCONFIG:= \ + CONFIG_W1_SLAVE_DS2433 \ + CONFIG_W1_SLAVE_DS2433_CRC=n + FILES:=$(W1_SLAVES_DIR)/w1_ds2433.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,52,w1_ds2433) +endef + +define KernelPackage/w1-slave-ds2433/description + Kernel module for 1-wire simple 64bit memory rom(ds2401/ds2411/ds1990*) +endef + +$(eval $(call KernelPackage,w1-slave-ds2433)) + + +define KernelPackage/w1-slave-ds2760 + $(call w1dep,) + TITLE:=Dallas 2760 battery monitor chip (HP iPAQ & others) + KCONFIG:= \ + CONFIG_W1_SLAVE_DS2760 \ + CONFIG_W1_SLAVE_DS2433_CRC=n + FILES:=$(W1_SLAVES_DIR)/w1_ds2760.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,52,w1_ds2760) +endef + +define KernelPackage/w1-slave-ds2760/description + Kernel module for 1-wire DS2760 battery monitor chip support +endef + +$(eval $(call KernelPackage,w1-slave-ds2760)) +endif \ No newline at end of file diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23 index 3f55a31dae..3b6c01e88f 100644 --- a/target/linux/generic-2.6/config-2.6.23 +++ b/target/linux/generic-2.6/config-2.6.23 @@ -1702,7 +1702,16 @@ CONFIG_VLAN_8021Q=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VT is not set # CONFIG_VXFS_FS is not set -# CONFIG_W1 is not set +CONFIG_W1=m +# CONFIG_W1_MASTER_DS1WM is not set +# CONFIG_W1_MASTER_DS2482 is not set +# CONFIG_W1_MASTER_DS2490 is not set +# CONFIG_W1_MASTER_GPIO is not set +# CONFIG_W1_MASTER_MATROX is not set +# CONFIG_W1_SLAVE_DS2433 is not set +# CONFIG_W1_SLAVE_DS2760 is not set +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_THERM is not set # CONFIG_W83627HF_WDT is not set # CONFIG_W83697HF_WDT is not set # CONFIG_W83877F_WDT is not set diff --git a/target/linux/generic-2.6/config-2.6.24 b/target/linux/generic-2.6/config-2.6.24 index e5aa9c5756..a0e7beccc5 100644 --- a/target/linux/generic-2.6/config-2.6.24 +++ b/target/linux/generic-2.6/config-2.6.24 @@ -1755,7 +1755,16 @@ CONFIG_VLAN_8021Q=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VT is not set # CONFIG_VXFS_FS is not set -# CONFIG_W1 is not set +CONFIG_W1=m +# CONFIG_W1_MASTER_DS1WM is not set +# CONFIG_W1_MASTER_DS2482 is not set +# CONFIG_W1_MASTER_DS2490 is not set +# CONFIG_W1_MASTER_GPIO is not set +# CONFIG_W1_MASTER_MATROX is not set +# CONFIG_W1_SLAVE_DS2433 is not set +# CONFIG_W1_SLAVE_DS2760 is not set +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_THERM is not set # CONFIG_W83627HF_WDT is not set # CONFIG_W83697HF_WDT is not set # CONFIG_W83877F_WDT is not set diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index 04f3c8b91c..30e51b93cd 100644 --- a/target/linux/generic-2.6/config-2.6.25 +++ b/target/linux/generic-2.6/config-2.6.25 @@ -1780,7 +1780,16 @@ CONFIG_VLAN_8021Q=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VT is not set # CONFIG_VXFS_FS is not set -# CONFIG_W1 is not set +CONFIG_W1=m +# CONFIG_W1_MASTER_DS1WM is not set +# CONFIG_W1_MASTER_DS2482 is not set +# CONFIG_W1_MASTER_DS2490 is not set +# CONFIG_W1_MASTER_GPIO is not set +# CONFIG_W1_MASTER_MATROX is not set +# CONFIG_W1_SLAVE_DS2433 is not set +# CONFIG_W1_SLAVE_DS2760 is not set +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_THERM is not set # CONFIG_W83627HF_WDT is not set # CONFIG_W83697HF_WDT is not set # CONFIG_W83877F_WDT is not set diff --git a/target/linux/generic-2.6/patches-2.6.23/922-w1_gpio_driver_backport.patch b/target/linux/generic-2.6/patches-2.6.23/922-w1_gpio_driver_backport.patch new file mode 100644 index 0000000000..43d73d0bfa --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.23/922-w1_gpio_driver_backport.patch @@ -0,0 +1,186 @@ +Index: linux-2.6.24.5/drivers/w1/masters/Kconfig +=================================================================== +--- linux-2.6.23.16.orig/drivers/w1/masters/Kconfig ++++ linux-2.6.23.16/drivers/w1/masters/Kconfig +@@ -42,5 +42,15 @@ config W1_MASTER_DS1WM + in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like + hx4700. + ++config W1_MASTER_GPIO ++ tristate "GPIO 1-wire busmaster" ++ depends on GENERIC_GPIO ++ help ++ Say Y here if you want to communicate with your 1-wire devices using ++ GPIO pins. This driver uses the GPIO API to control the wire. ++ ++ This support is also available as a module. If so, the module ++ will be called w1-gpio.ko. ++ + endmenu + +Index: linux-2.6.23.16/drivers/w1/masters/Makefile +=================================================================== +--- linux-2.6.23.16.orig/drivers/w1/masters/Makefile ++++ linux-2.6.23.16/drivers/w1/masters/Makefile +@@ -6,3 +6,4 @@ obj-$(CONFIG_W1_MASTER_MATROX) += matro + obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o + obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.o + obj-$(CONFIG_W1_MASTER_DS1WM) += ds1wm.o ++obj-$(CONFIG_W1_MASTER_GPIO) += w1-gpio.o +Index: linux-2.6.23.16/drivers/w1/masters/w1-gpio.c +=================================================================== +--- /dev/null ++++ linux-2.6.23.16/drivers/w1/masters/w1-gpio.c +@@ -0,0 +1,124 @@ ++/* ++ * w1-gpio - GPIO w1 bus master driver ++ * ++ * Copyright (C) 2007 Ville Syrjala ++ * ++ * 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 ++#include ++#include ++#include ++ ++#include "../w1.h" ++#include "../w1_int.h" ++ ++#include ++ ++static void w1_gpio_write_bit_dir(void *data, u8 bit) ++{ ++ struct w1_gpio_platform_data *pdata = data; ++ ++ if (bit) ++ gpio_direction_input(pdata->pin); ++ else ++ gpio_direction_output(pdata->pin, 0); ++} ++ ++static void w1_gpio_write_bit_val(void *data, u8 bit) ++{ ++ struct w1_gpio_platform_data *pdata = data; ++ ++ gpio_set_value(pdata->pin, bit); ++} ++ ++static u8 w1_gpio_read_bit(void *data) ++{ ++ struct w1_gpio_platform_data *pdata = data; ++ ++ return gpio_get_value(pdata->pin); ++} ++ ++static int __init w1_gpio_probe(struct platform_device *pdev) ++{ ++ struct w1_bus_master *master; ++ struct w1_gpio_platform_data *pdata = pdev->dev.platform_data; ++ int err; ++ ++ if (!pdata) ++ return -ENXIO; ++ ++ master = kzalloc(sizeof(struct w1_bus_master), GFP_KERNEL); ++ if (!master) ++ return -ENOMEM; ++ ++ err = gpio_request(pdata->pin, "w1"); ++ if (err) ++ goto free_master; ++ ++ master->data = pdata; ++ master->read_bit = w1_gpio_read_bit; ++ ++ if (pdata->is_open_drain) { ++ gpio_direction_output(pdata->pin, 1); ++ master->write_bit = w1_gpio_write_bit_val; ++ } else { ++ gpio_direction_input(pdata->pin); ++ master->write_bit = w1_gpio_write_bit_dir; ++ } ++ ++ err = w1_add_master_device(master); ++ if (err) ++ goto free_gpio; ++ ++ platform_set_drvdata(pdev, master); ++ ++ return 0; ++ ++ free_gpio: ++ gpio_free(pdata->pin); ++ free_master: ++ kfree(master); ++ ++ return err; ++} ++ ++static int __exit w1_gpio_remove(struct platform_device *pdev) ++{ ++ struct w1_bus_master *master = platform_get_drvdata(pdev); ++ struct w1_gpio_platform_data *pdata = pdev->dev.platform_data; ++ ++ w1_remove_master_device(master); ++ gpio_free(pdata->pin); ++ kfree(master); ++ ++ return 0; ++} ++ ++static struct platform_driver w1_gpio_driver = { ++ .driver = { ++ .name = "w1-gpio", ++ .owner = THIS_MODULE, ++ }, ++ .remove = __exit_p(w1_gpio_remove), ++}; ++ ++static int __init w1_gpio_init(void) ++{ ++ return platform_driver_probe(&w1_gpio_driver, w1_gpio_probe); ++} ++ ++static void __exit w1_gpio_exit(void) ++{ ++ platform_driver_unregister(&w1_gpio_driver); ++} ++ ++module_init(w1_gpio_init); ++module_exit(w1_gpio_exit); ++ ++MODULE_DESCRIPTION("GPIO w1 bus master driver"); ++MODULE_AUTHOR("Ville Syrjala "); ++MODULE_LICENSE("GPL"); +Index: linux-2.6.23.16/include/linux/w1-gpio.h +=================================================================== +--- /dev/null ++++ linux-2.6.23.16/include/linux/w1-gpio.h +@@ -0,0 +1,23 @@ ++/* ++ * w1-gpio interface to platform code ++ * ++ * Copyright (C) 2007 Ville Syrjala ++ * ++ * 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 _LINUX_W1_GPIO_H ++#define _LINUX_W1_GPIO_H ++ ++/** ++ * struct w1_gpio_platform_data - Platform-dependent data for w1-gpio ++ * @pin: GPIO pin to use ++ * @is_open_drain: GPIO pin is configured as open drain ++ */ ++struct w1_gpio_platform_data { ++ unsigned int pin; ++ unsigned int is_open_drain:1; ++}; ++ ++#endif /* _LINUX_W1_GPIO_H */ diff --git a/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch b/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch new file mode 100644 index 0000000000..414c8ab2c5 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch @@ -0,0 +1,186 @@ +Index: linux-2.6.24.5/drivers/w1/masters/Kconfig +=================================================================== +--- linux-2.6.24.5.orig/drivers/w1/masters/Kconfig ++++ linux-2.6.24.5/drivers/w1/masters/Kconfig +@@ -42,5 +42,15 @@ config W1_MASTER_DS1WM + in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like + hx4700. + ++config W1_MASTER_GPIO ++ tristate "GPIO 1-wire busmaster" ++ depends on GENERIC_GPIO ++ help ++ Say Y here if you want to communicate with your 1-wire devices using ++ GPIO pins. This driver uses the GPIO API to control the wire. ++ ++ This support is also available as a module. If so, the module ++ will be called w1-gpio.ko. ++ + endmenu + +Index: linux-2.6.24.5/drivers/w1/masters/Makefile +=================================================================== +--- linux-2.6.24.5.orig/drivers/w1/masters/Makefile ++++ linux-2.6.24.5/drivers/w1/masters/Makefile +@@ -6,3 +6,4 @@ obj-$(CONFIG_W1_MASTER_MATROX) += matro + obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o + obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.o + obj-$(CONFIG_W1_MASTER_DS1WM) += ds1wm.o ++obj-$(CONFIG_W1_MASTER_GPIO) += w1-gpio.o +Index: linux-2.6.24.5/drivers/w1/masters/w1-gpio.c +=================================================================== +--- /dev/null ++++ linux-2.6.24.5/drivers/w1/masters/w1-gpio.c +@@ -0,0 +1,124 @@ ++/* ++ * w1-gpio - GPIO w1 bus master driver ++ * ++ * Copyright (C) 2007 Ville Syrjala ++ * ++ * 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 ++#include ++#include ++#include ++ ++#include "../w1.h" ++#include "../w1_int.h" ++ ++#include ++ ++static void w1_gpio_write_bit_dir(void *data, u8 bit) ++{ ++ struct w1_gpio_platform_data *pdata = data; ++ ++ if (bit) ++ gpio_direction_input(pdata->pin); ++ else ++ gpio_direction_output(pdata->pin, 0); ++} ++ ++static void w1_gpio_write_bit_val(void *data, u8 bit) ++{ ++ struct w1_gpio_platform_data *pdata = data; ++ ++ gpio_set_value(pdata->pin, bit); ++} ++ ++static u8 w1_gpio_read_bit(void *data) ++{ ++ struct w1_gpio_platform_data *pdata = data; ++ ++ return gpio_get_value(pdata->pin); ++} ++ ++static int __init w1_gpio_probe(struct platform_device *pdev) ++{ ++ struct w1_bus_master *master; ++ struct w1_gpio_platform_data *pdata = pdev->dev.platform_data; ++ int err; ++ ++ if (!pdata) ++ return -ENXIO; ++ ++ master = kzalloc(sizeof(struct w1_bus_master), GFP_KERNEL); ++ if (!master) ++ return -ENOMEM; ++ ++ err = gpio_request(pdata->pin, "w1"); ++ if (err) ++ goto free_master; ++ ++ master->data = pdata; ++ master->read_bit = w1_gpio_read_bit; ++ ++ if (pdata->is_open_drain) { ++ gpio_direction_output(pdata->pin, 1); ++ master->write_bit = w1_gpio_write_bit_val; ++ } else { ++ gpio_direction_input(pdata->pin); ++ master->write_bit = w1_gpio_write_bit_dir; ++ } ++ ++ err = w1_add_master_device(master); ++ if (err) ++ goto free_gpio; ++ ++ platform_set_drvdata(pdev, master); ++ ++ return 0; ++ ++ free_gpio: ++ gpio_free(pdata->pin); ++ free_master: ++ kfree(master); ++ ++ return err; ++} ++ ++static int __exit w1_gpio_remove(struct platform_device *pdev) ++{ ++ struct w1_bus_master *master = platform_get_drvdata(pdev); ++ struct w1_gpio_platform_data *pdata = pdev->dev.platform_data; ++ ++ w1_remove_master_device(master); ++ gpio_free(pdata->pin); ++ kfree(master); ++ ++ return 0; ++} ++ ++static struct platform_driver w1_gpio_driver = { ++ .driver = { ++ .name = "w1-gpio", ++ .owner = THIS_MODULE, ++ }, ++ .remove = __exit_p(w1_gpio_remove), ++}; ++ ++static int __init w1_gpio_init(void) ++{ ++ return platform_driver_probe(&w1_gpio_driver, w1_gpio_probe); ++} ++ ++static void __exit w1_gpio_exit(void) ++{ ++ platform_driver_unregister(&w1_gpio_driver); ++} ++ ++module_init(w1_gpio_init); ++module_exit(w1_gpio_exit); ++ ++MODULE_DESCRIPTION("GPIO w1 bus master driver"); ++MODULE_AUTHOR("Ville Syrjala "); ++MODULE_LICENSE("GPL"); +Index: linux-2.6.24.5/include/linux/w1-gpio.h +=================================================================== +--- /dev/null ++++ linux-2.6.24.5/include/linux/w1-gpio.h +@@ -0,0 +1,23 @@ ++/* ++ * w1-gpio interface to platform code ++ * ++ * Copyright (C) 2007 Ville Syrjala ++ * ++ * 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 _LINUX_W1_GPIO_H ++#define _LINUX_W1_GPIO_H ++ ++/** ++ * struct w1_gpio_platform_data - Platform-dependent data for w1-gpio ++ * @pin: GPIO pin to use ++ * @is_open_drain: GPIO pin is configured as open drain ++ */ ++struct w1_gpio_platform_data { ++ unsigned int pin; ++ unsigned int is_open_drain:1; ++}; ++ ++#endif /* _LINUX_W1_GPIO_H */