Driver for the Maxim DS1WM, a 1-wire bus master ASIC core.
PATCH 2/2 Driver for the Maxim DS1WM, a 1-wire bus master ASIC core.
--- drivers/w1/masters/Kconfig | 8 + drivers/w1/masters/Makefile | 2 +- drivers/w1/masters/ds1wm.c | 463 +++++++++++++++++++++++++++++++++++++++++++ include/linux/ds1wm.h | 13 ++ 4 files changed, 485 insertions(+), 1 deletions(-) create mode 100644 drivers/w1/masters/ds1wm.c create mode 100644 include/linux/ds1wm.h
drivers/w1/masters/Kconfig +8 -0
@@ -35,5 +35,13 @@ config W1_MASTER_DS2482 This driver can also be built as a module. If so, the module will be called ds2482. +config W1_DS1WM + tristate "Maxim DS1WM 1-wire busmaster" + depends on W1 + help + Say Y here to enable the DS1WM 1-wire driver, such as that + in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like + hx4700. + endmenu
drivers/w1/masters/Makefile +1 -1
@@ -5,4 +5,4 @@ obj-$(CONFIG_W1_MASTER_MATROX) += matrox_w1.o obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.o - +obj-$(CONFIG_W1_DS1WM) += ds1wm.o
drivers/w1/masters/ds1wm.c new file +463 -0
463 lines not on this page · raw message
include/linux/ds1wm.h new file +13 -0
@@ -0,0 +1,13 @@ +/* platform data for the DS1WM driver */ + +struct ds1wm_platform_data { +int bus_shift;/* number of shifts needed to calculate the +* offset between DS1WM registers; +* e.g. on h5xxx and h2200 this is 2 +* (registers aligned to 4-byte boundaries), +* while on hx4700 this is 1 */ +int falling_edge;/* interrupt edge - passed to set_irq_type() */ +int active_high;/* interrupt polarity, passed to DS1WM as IAS bit */ +void (*enable)(struct platform_device *pdev); +void (*disable)(struct platform_device *pdev); +};
Signature · 1 line
Evgeniy Polyakov
Quoted 10 lines · On Tue, 24 Apr 2007 14:02:03 +0400 Evgeniy Polyakov <[email protected]> wrote:
drivers/w1/masters/ds1wm.c new file +10
-0+#define DS1WM_CMD_1W_RESET 1 << 0/* force reset on 1-wire bus */ +#define DS1WM_CMD_SRA 1 << 1/* enable Search ROM accelerator mode */ +#define DS1WM_CMD_DQ_OUTPUT 1 << 2/* write only - forces bus low */ +#define DS1WM_CMD_DQ_INPUT 1 << 3/* read only - reflects state of bus */ + +#define DS1WM_INT_PD 1 << 0/* presence detect */ +#define DS1WM_INT_PDR 1 << 1/* presence detect result */ +#define DS1WM_INT_TBE 1 << 2/* tx buffer empty */ +#define DS1WM_INT_TSRE 1 << 3/* tx shift register empty */ +#define DS1WM_INT_RBF 1 << 4/* rx buffer full */
drivers/w1/masters/ds1wm.c line 54
Quoted 10 lines
drivers/w1/masters/ds1wm.c new file +10
-0+#define DS1WM_INT_RSRF 1 << 5/* rx shift register full */ + +#define DS1WM_INTEN_EPD 1 << 0/* enable presence detect int */ +#define DS1WM_INTEN_IAS 1 << 1/* INTR active state */ +#define DS1WM_INTEN_ETBE 1 << 2/* enable tx buffer empty int */ +#define DS1WM_INTEN_ETMT 1 << 3/* enable tx shift register empty int */ +#define DS1WM_INTEN_ERBF 1 << 4/* enable rx buffer full int */ +#define DS1WM_INTEN_ERSRF 1 << 5/* enable rx shift register full int */ +#define DS1WM_INTEN_DQO 1 << 6/* enable direct bus driving ops +(undocumented), Szabolcs Gyurko */
These macros are very dangerous - please parenthesise them all.
Quoted 23 lines
drivers/w1/masters/ds1wm.c new file +23
-0+ +struct ds1wm_data { +void *map; +int bus_shift;/* # of shifts to calc register offsets */ +struct platform_device *pdev; +struct ds1wm_platform_data *pdata; +int irq; +struct clk *clk; +int slave_present; +void *reset_complete; +void *read_complete; +void *write_complete; +u8 read_byte;/* last byte received */ +}; + +static inline void ds1wm_write_register (struct ds1wm_data *ds1wm_data,u32 reg, +u8 val) +{ +__raw_writeb (val, ds1wm_data->map + (reg << ds1wm_data->bus_shift)); +} + +static inline u8 ds1wm_read_register (struct ds1wm_data *ds1wm_data,u32 reg) +{
drivers/w1/masters/ds1wm.c line 117
Quoted 10 lines
drivers/w1/masters/ds1wm.c new file +10
-0+return __raw_readb (ds1wm_data->map + (reg << ds1wm_data->bus_shift)); +} + + +static irqreturn_t ds1wm_isr (int isr,void *data) +{ +struct ds1wm_data *ds1wm_data = data; +u8 intr =ds1wm_read_register (ds1wm_data,DS1WM_INT ); + + ds1wm_data->slave_present = intr &DS1WM_INT_PDR ?0 :1 ;
Normally we'd parenthesise an expression like this so people don't have to go scrambling for the C precedence table.
drivers/w1/masters/ds1wm.c line 120
Quoted 2 lines
drivers/w1/masters/ds1wm.c new file +2
-0+if (intr &DS1WM_INT_PD && ds1wm_data->reset_complete) +complete (ds1wm_data->reset_complete);
Ditto (lots of instances of this in this patch)
Quoted 7 lines
drivers/w1/masters/ds1wm.c new file +7
-0+if (intr &DS1WM_INT_RBF ) { + ds1wm_data->read_byte =ds1wm_read_register (ds1wm_data, +DS1WM_DATA ); +if (ds1wm_data->read_complete) +complete (ds1wm_data->read_complete); + } +
drivers/w1/masters/ds1wm.c line 138
Quoted 10 lines
drivers/w1/masters/ds1wm.c new file +10
-0+if (intr &DS1WM_INT_TSRE && ds1wm_data->write_complete) +complete (ds1wm_data->write_complete); + +return IRQ_HANDLED ; +} + +static int ds1wm_reset (struct ds1wm_data *ds1wm_data) +{ +unsigned long timeleft; +DECLARE_COMPLETION (reset_done);
This will cause lockdep warnings.
- Convert to DECLARE_COMPLETION_ONSTACK
- Test the code using lockdep! This is covered in Documentation/SubmitChecklist, which has many other useful tips.
Quoted 21 lines
drivers/w1/masters/ds1wm.c new file +21
-0+ ds1wm_data->reset_complete = &reset_done; + +ds1wm_write_register (ds1wm_data,DS1WM_INT_EN ,DS1WM_INTEN_EPD | + (ds1wm_data->pdata->active_high ?DS1WM_INTEN_IAS :0 )); + +ds1wm_write_register (ds1wm_data,DS1WM_CMD ,DS1WM_CMD_1W_RESET ); + + timeleft =wait_for_completion_timeout (&reset_done,DS1WM_TIMEOUT ); + ds1wm_data->reset_complete =NULL ; +if (!timeleft) { +dev_dbg (&ds1wm_data->pdev->dev,"reset failed\n" ); +return 1 ; + } + +/* Wait for the end of the reset. According to the specs, the time +* from when the interrupt is asserted to the end of the reset is: +* tRSTH - tPDH - tPDL - tPDI +* 625 us - 60 us - 240 us - 100 ns = 324.9 us +* +* We'll wait a bit longer just to be sure. +*/
drivers/w1/masters/ds1wm.c line 170
Quoted 10 lines
drivers/w1/masters/ds1wm.c new file +10
-0+udelay (500 ); + +ds1wm_write_register (ds1wm_data,DS1WM_INT_EN , +DS1WM_INTEN_ERBF |DS1WM_INTEN_ETMT |DS1WM_INTEN_EPD | + (ds1wm_data->pdata->active_high ?DS1WM_INTEN_IAS :0 )); + +if (!ds1wm_data->slave_present) { +dev_dbg (&ds1wm_data->pdev->dev,"reset: no devices found\n" ); +return 1 ; + }
whitespace broke here.
drivers/w1/masters/ds1wm.c line 177
Quoted 6 lines
drivers/w1/masters/ds1wm.c new file +6
-0+return 0 ; +} + +static int ds1wm_write (struct ds1wm_data *ds1wm_data,u8 data) +{ +DECLARE_COMPLETION (write_done);
Multiple instances of this.
Quoted 17 lines
drivers/w1/masters/ds1wm.c new file +17
-0+ ds1wm_data->write_complete = &write_done; + +ds1wm_write_register (ds1wm_data,DS1WM_DATA , data); + +wait_for_completion_timeout (&write_done,DS1WM_TIMEOUT ); + ds1wm_data->write_complete =NULL ; + +return 0 ; +} + +static int ds1wm_read (struct ds1wm_data *ds1wm_data,unsigned char write_data) +{ +DECLARE_COMPLETION (read_done); + ds1wm_data->read_complete = &read_done; + +ds1wm_write (ds1wm_data, write_data); +wait_for_completion_timeout (&read_done,DS1WM_TIMEOUT );
drivers/w1/masters/ds1wm.c line 204
Quoted 10 lines
drivers/w1/masters/ds1wm.c new file +10
-0+ ds1wm_data->read_complete =NULL ; + +return ds1wm_data->read_byte; +} + +static int ds1wm_find_divisor (int gclk) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (freq); i++)
No space after the ARRAY_SIZE
Quoted 27 lines
drivers/w1/masters/ds1wm.c new file +27
-0+if (gclk <= freq[i].freq) +return freq[i].divisor; + +return 0 ; +} + +static void ds1wm_up (struct ds1wm_data *ds1wm_data) +{ +int gclk, divisor; + +if (ds1wm_data->pdata->enable) + ds1wm_data->pdata->enable (ds1wm_data->pdev); + + gclk =clk_get_rate (ds1wm_data->clk); +clk_enable (ds1wm_data->clk); + divisor =ds1wm_find_divisor (gclk); +if (divisor ==0 ) { +dev_err (&ds1wm_data->pdev->dev, +"no suitable divisor for %dHz clock\n" , gclk); +return ; + } +ds1wm_write_register (ds1wm_data,DS1WM_CLKDIV , divisor); + +/* Let the w1 clock stabilize. */ +msleep (1 ); + +enable_irq (ds1wm_data->irq);
drivers/w1/masters/ds1wm.c line 241
Quoted 10 lines
drivers/w1/masters/ds1wm.c new file +10
-0+} + +static void ds1wm_down (struct ds1wm_data *ds1wm_data) +{ +disable_irq (ds1wm_data->irq); +if (ds1wm_data->pdata->disable) + ds1wm_data->pdata->disable (ds1wm_data->pdev); + +clk_disable (ds1wm_data->clk); +}
eh? What happens if that IRQ is shared with another device?
Isn't there some chip register which can be written to to disable the device's interrupts?
Quoted 42 lines
drivers/w1/masters/ds1wm.c new file +42
-0+static struct w1_bus_master ds1wm_master = { + .read_byte = ds1wm_read_byte, + .write_byte = ds1wm_write_byte, + .reset_bus = ds1wm_reset_bus, + .search = ds1wm_search, +}; + +static int ds1wm_probe (struct platform_device *pdev) +{ +struct ds1wm_data *ds1wm_data; +struct ds1wm_platform_data *plat; +struct resource *res; +int ret; + +if (!pdev) +return -ENODEV ; + + ds1wm_data =kzalloc (sizeof (*ds1wm_data),GFP_KERNEL ); +if (!ds1wm_data) +return -ENOMEM ; + +platform_set_drvdata (pdev, ds1wm_data); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { + ret = -ENXIO ; + goto err0; + } + ds1wm_data->map =ioremap (res->start, res->end - res->start +1 ); +if (!ds1wm_data->map) { + ret = -ENOMEM ; + goto err0; + } + plat = pdev->dev.platform_data; + ds1wm_data->bus_shift = plat->bus_shift; + ds1wm_data->pdev = pdev; + ds1wm_data->pdata = plat; + + ds1wm_data->irq =platform_get_irq (pdev,0 ); +if (ds1wm_data->irq <0 ) { + ret = -ENXIO ; + goto err1;
drivers/w1/masters/ds1wm.c line 364
Quoted 10 lines
drivers/w1/masters/ds1wm.c new file +10
-0+ } + +if (plat->falling_edge) +set_irq_type (ds1wm_data->irq,IRQ_TYPE_EDGE_FALLING ); +else +set_irq_type (ds1wm_data->irq,IRQ_TYPE_EDGE_RISING ); + + ret =request_irq (ds1wm_data->irq, ds1wm_isr, +IRQF_DISABLED |IRQF_SAMPLE_RANDOM ,"ds1wm" , + ds1wm_data);
Is w1 really a suitable source of entropy?
Quoted 43 lines
drivers/w1/masters/ds1wm.c new file +43
-0+if (ret) + goto err1; +disable_irq (ds1wm_data->irq); + + ds1wm_data->clk =clk_get (&pdev->dev,"ds1wm" ); +if (!ds1wm_data->clk) { + ret = -ENOENT ; + goto err2; + } + +ds1wm_up (ds1wm_data); + + ds1wm_master.data = (void *)ds1wm_data; + + ret =w1_add_master_device (&ds1wm_master); +if (ret) + goto err3; + +return 0 ; + +err3: +ds1wm_reset (ds1wm_data); +ds1wm_down (ds1wm_data); +clk_put (ds1wm_data->clk); +err2: +free_irq (ds1wm_data->irq, ds1wm_data); +err1: +iounmap (ds1wm_data->map); +err0: +kfree (ds1wm_data); + +return ret; +} + +#ifdef CONFIG_PM +static int ds1wm_suspend (struct platform_device *pdev,pm_message_t state) +{ +struct ds1wm_data *ds1wm_data =platform_get_drvdata (pdev); + +ds1wm_down (ds1wm_data); + +return 0 ; +}
drivers/w1/masters/ds1wm.c line 417
Quoted 10 lines
drivers/w1/masters/ds1wm.c new file +10
-0+ +static int ds1wm_resume (struct platform_device *pdev) +{ +struct ds1wm_data *ds1wm_data =platform_get_drvdata (pdev); + +ds1wm_up (ds1wm_data); + +return 0 ; +} +#endif
Here, please do
#else
#define ds1wm_suspend NULL
#define ds1wm_resume NULL
#endif
Quoted 15 lines
drivers/w1/masters/ds1wm.c new file +15
-0+static int ds1wm_remove (struct platform_device *pdev) +{ +struct ds1wm_data *ds1wm_data =platform_get_drvdata (pdev); + +w1_remove_master_device (&ds1wm_master); +ds1wm_reset (ds1wm_data); +ds1wm_down (ds1wm_data); +clk_put (ds1wm_data->clk); +free_irq (ds1wm_data->irq, ds1wm_data); +iounmap (ds1wm_data->map); +kfree (ds1wm_data); + +return 0 ; +} +
drivers/w1/masters/ds1wm.c line 443
Quoted 10 lines
drivers/w1/masters/ds1wm.c new file +10
-0+static struct platform_driver ds1wm_driver = { + .driver = { + .name ="ds1wm" , + }, + .probe = ds1wm_probe, + .remove = ds1wm_remove, +#ifdef CONFIG_PM + .suspend = ds1wm_suspend, + .resume = ds1wm_resume +#endif
then remove these ifdefs.
drivers/w1/masters/ds1wm.c line 450
Quoted 7 lines
drivers/w1/masters/ds1wm.c new file +7
-0+}; + +static int ds1wm_init (void ) +{ +printk ("DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko\n" ); +return platform_driver_register (&ds1wm_driver); +}
__init
drivers/w1/masters/ds1wm.c line 455
Quoted 4 lines
drivers/w1/masters/ds1wm.c new file +4
-0+static void ds1wm_exit (void ) +{ +platform_driver_unregister (&ds1wm_driver); +}
__exit
Quoted 26 lines
drivers/w1/masters/ds1wm.c new file +7
-0+module_init (ds1wm_init); +module_exit (ds1wm_exit); + +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Szabolcs Gyurko <[email protected]>, " +"Matt Reimer <[email protected]>" ); +MODULE_DESCRIPTION ("DS1WM w1 busmaster driver" );include/linux/ds1wm.h new file +13
-0@@ -0,0 +1,13 @@ +/* platform data for the DS1WM driver */ + +struct ds1wm_platform_data { +int bus_shift;/* number of shifts needed to calculate the +* offset between DS1WM registers; +* e.g. on h5xxx and h2200 this is 2 +* (registers aligned to 4-byte boundaries), +* while on hx4700 this is 1 */ +int falling_edge;/* interrupt edge - passed to set_irq_type() */ +int active_high;/* interrupt polarity, passed to DS1WM as IAS bit */ +void (*enable)(struct platform_device *pdev); +void (*disable)(struct platform_device *pdev); +};
Quoted 20 lines · Andrew Morton
Quoted 18 lines · On Tue, 24 Apr 2007 14:02:03 +0400 Evgeniy Polyakov <[email protected]> wrote:
(quoted diff) +2
-0+#define DS1WM_CMD_1W_RESET 1 << 0 /* force reset on 1-wire bus */ +#define DS1WM_CMD_SRA 1 << 1 /* enable Search ROM acceleratormode */
(quoted diff) +2
-0+#define DS1WM_CMD_DQ_OUTPUT 1 << 2 /* write only - forces bus low */ +#define DS1WM_CMD_DQ_INPUT 1 << 3 /* read only - reflects stateof bus */
(quoted diff) +12
-0+ +#define DS1WM_INT_PD 1 << 0 /* presence detect */ +#define DS1WM_INT_PDR 1 << 1 /* presence detect result */ +#define DS1WM_INT_TBE 1 << 2 /* tx buffer empty */ +#define DS1WM_INT_TSRE 1 << 3 /* tx shift register empty */ +#define DS1WM_INT_RBF 1 << 4 /* rx buffer full */ +#define DS1WM_INT_RSRF 1 << 5 /* rx shift register full */ + +#define DS1WM_INTEN_EPD 1 << 0 /* enable presence detect int */ +#define DS1WM_INTEN_IAS 1 << 1 /* INTR active state */ +#define DS1WM_INTEN_ETBE 1 << 2 /* enable tx buffer empty int */ +#define DS1WM_INTEN_ETMT 1 << 3 /* enable tx shift register
Quoted 8 lines
Review
Quoted 6 lines
empty int */
(quoted diff) +2
-0+#define DS1WM_INTEN_ERBF 1 << 4 /* enable rx buffer full int */ +#define DS1WM_INTEN_ERSRF 1 << 5 /* enable rx shift registerfull int */
(quoted diff) +2
-0+#define DS1WM_INTEN_DQO 1 << 6 /* enable direct bus driving ops + (undocumented), Szabolcs Gyurko */These macros are very dangerous - please parenthesise them all.
(and several other helpful suggestions...)
Thanks for your review Andrew. I made all the code changes you suggested in the attached patch.
Matt
From b1f6ac622b85cbc08b96dbff3ccb5e0b3a8e1ad0 Mon Sep 17 00:00:00 2001
From: Matt Reimer <[email protected]>
Date: Thu, 26 Apr 2007 09:39:30 -0700
Subject: [PATCH] w1 driver for Maxim DS1WM
Implements a driver for the Maxim DS1WM ASIC core, used in most HP iPAQs.
--- drivers/w1/masters/Kconfig | 8 + drivers/w1/masters/Makefile | 2 +- drivers/w1/masters/ds1wm.c | 461 +++++++++++++++++++++++++++++++++++++++++++ include/linux/ds1wm.h | 12 ++ 4 files changed, 482 insertions(+), 1 deletions(-) create mode 100644 drivers/w1/masters/ds1wm.c create mode 100644 include/linux/ds1wm.h
drivers/w1/masters/Kconfig +8 -0
@@ -35,5 +35,13 @@ config W1_MASTER_DS2482 This driver can also be built as a module. If so, the module will be called ds2482. +config W1_DS1WM + tristate "Maxim DS1WM 1-wire busmaster" + depends on W1 + help + Say Y here to enable the DS1WM 1-wire driver, such as that + in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like + hx4700. + endmenu
drivers/w1/masters/Makefile +1 -1
@@ -5,4 +5,4 @@ obj-$(CONFIG_W1_MASTER_MATROX) += matrox_w1.o obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.o - +obj-$(CONFIG_W1_DS1WM) += ds1wm.o
drivers/w1/masters/ds1wm.c new file +461 -0
461 lines not on this page · raw message
include/linux/ds1wm.h new file +12 -0
@@ -0,0 +1,12 @@ +/* platform data for the DS1WM driver */ + +struct ds1wm_platform_data { +int bus_shift;/* number of shifts needed to calculate the +* offset between DS1WM registers; +* e.g. on h5xxx and h2200 this is 2 +* (registers aligned to 4-byte boundaries), +* while on hx4700 this is 1 */ +int active_high;/* interrupt polarity, passed to DS1WM as IAS bit */ +void (*enable)(struct platform_device *pdev); +void (*disable)(struct platform_device *pdev); +};
Signature · 1 line
1.5.1.1
Quoted 32 lines · Matt Reimer
Quoted 21 lines · Andrew Morton
Quoted 18 lines · On Tue, 24 Apr 2007 14:02:03 +0400 Evgeniy Polyakov <[email protected]> wrote:
(quoted diff) +2
-0+#define DS1WM_CMD_1W_RESET 1 << 0 /* force reset on 1-wire bus */ +#define DS1WM_CMD_SRA 1 << 1 /* enable Search ROM acceleratormode */
(quoted diff) +2
-0+#define DS1WM_CMD_DQ_OUTPUT 1 << 2 /* write only - forces bus low */ +#define DS1WM_CMD_DQ_INPUT 1 << 3 /* read only - reflects stateof bus */
(quoted diff) +12
-0+ +#define DS1WM_INT_PD 1 << 0 /* presence detect */ +#define DS1WM_INT_PDR 1 << 1 /* presence detect result */ +#define DS1WM_INT_TBE 1 << 2 /* tx buffer empty */ +#define DS1WM_INT_TSRE 1 << 3 /* tx shift register empty */ +#define DS1WM_INT_RBF 1 << 4 /* rx buffer full */ +#define DS1WM_INT_RSRF 1 << 5 /* rx shift register full */ + +#define DS1WM_INTEN_EPD 1 << 0 /* enable presence detect int */ +#define DS1WM_INTEN_IAS 1 << 1 /* INTR active state */ +#define DS1WM_INTEN_ETBE 1 << 2 /* enable tx buffer empty int */ +#define DS1WM_INTEN_ETMT 1 << 3 /* enable tx shift registerQuoted 8 lines
Review
Quoted 6 lines
empty int */
(quoted diff) +2
-0+#define DS1WM_INTEN_ERBF 1 << 4 /* enable rx buffer full int */ +#define DS1WM_INTEN_ERSRF 1 << 5 /* enable rx shift registerfull int */
(quoted diff) +2
-0+#define DS1WM_INTEN_DQO 1 << 6 /* enable direct bus driving ops + (undocumented), Szabolcs Gyurko */These macros are very dangerous - please parenthesise them all.
Quoted 8 lines
(and several other helpful suggestions...)
Thanks for your review Andrew. I made all the code changes you suggested in the attached patch.
Matt
drivers/w1/masters/Makefile +0 -0
@@ -5,4 +5,4 @@
obj-$(CONFIG_W1_MASTER_MATROX) += matrox_w1.o
obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o
obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.o
-
+obj-$(CONFIG_W1_DS1WM) += ds1wm.o
Wouldn't it be better to call the config option CONFIG_W1_MASTER_DS1WM for consistency?
regards
Philipp
Quoted 11 lines · pHilipp Zabel
drivers/w1/masters/Makefile +0
-0@@ -5,4 +5,4 @@obj-$(CONFIG_W1_MASTER_MATROX) += matrox_w1.o
obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o
obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.odrivers/w1/masters/Makefile +1
-1- +obj-$(CONFIG_W1_DS1WM) += ds1wm.o
Quoted 2 lines
Wouldn't it be better to call the config option
CONFIG_W1_MASTER_DS1WMfor consistency?
Yes it would. I've made this change. Thanks for the suggestion.
Matt
i386 `make allmodconfig' has a few issues.
ERROR: "clk_get" [drivers/w1/masters/ds1wm.ko] undefined!
ERROR: "clk_put" [drivers/w1/masters/ds1wm.ko] undefined!
ERROR: "clk_disable" [drivers/w1/masters/ds1wm.ko] undefined!
ERROR: "clk_enable" [drivers/w1/masters/ds1wm.ko] undefined!
ERROR: "clk_get_rate" [drivers/w1/masters/ds1wm.ko] undefined!
Quoted 7 lines · Andrew Morton
i386 `make allmodconfig' has a few issues.
ERROR: "
clk_get" [drivers/w1/masters/ds1wm.ko] undefined!
ERROR: "clk_put" [drivers/w1/masters/ds1wm.ko] undefined!
ERROR: "clk_disable" [drivers/w1/masters/ds1wm.ko] undefined!
ERROR: "clk_enable" [drivers/w1/masters/ds1wm.ko] undefined!
ERROR: "clk_get_rate" [drivers/w1/masters/ds1wm.ko] undefined!
Attached is a patch to fix this. AFAIK only ARM platforms presently use DS1WM and implement linux/clk.h.
Matt
From 61511610faf651adc9d09311f4f054737d1a68d8 Mon Sep 17 00:00:00 2001
From: Matt Reimer <[email protected]>
Date: Sat, 28 Apr 2007 10:11:35 -0700
Subject: [PATCH] Make CONFIG_MASTER_DS1WM depend on ARM
Make CONFIG_MASTER_DS1WM depend on ARM as that's apparently the only other platform that implements linux/clk.h, and as far as I know, is the only other platform presently using DS1WM.
--- drivers/w1/masters/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/w1/masters/Kconfig +1 -1
@@ -37,7 +37,7 @@ config W1_MASTER_DS2482 config W1_MASTER_DS1WM tristate "Maxim DS1WM 1-wire busmaster" - depends on W1 + depends on W1 && ARM help Say Y here to enable the DS1WM 1-wire driver, such as that in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
Signature · 1 line
1.5.1.1