diff for duplicates of <20101110120912.000073d3@unknown> diff --git a/a/1.txt b/N1/1.txt index 2e8e3a6..9da8cb9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,11 +29,11 @@ Marek Vasut <marek.vasut.n900@gmail.com> wrote: > > > arch/arm/mach-pxa/nilux_pm.c > > > > > > /* -> > > * Based on spitz_pm.c and sharp code. -> > > * -> > > * Distributed under term of GPLv2. -> > > * -> > > */ +> > > ?* Based on spitz_pm.c and sharp code. +> > > ?* +> > > ?* Distributed under term of GPLv2. +> > > ?* +> > > ?*/ > > > > > > #include <linux/module.h> > > > #include <linux/stat.h> @@ -60,11 +60,11 @@ Marek Vasut <marek.vasut.n900@gmail.com> wrote: > > > #include <mach/sharpsl_pm.h> > > > > > > -> > > #define AC_IN_INT 17 -> > > #define NYLUX_BATT_VOLT 1 -> > > #define NYLUX_STATUS_ACIN 4 -> > > #define NYLUX_BKUPBATT_TEMP 2 -> > > #define NYLUX_CHARGE_STATUS 3 +> > > #define AC_IN_INT ? ? ? ? ? ? ? 17 +> > > #define NYLUX_BATT_VOLT ? ? ? ? 1 +> > > #define NYLUX_STATUS_ACIN ? ? ? 4 +> > > #define NYLUX_BKUPBATT_TEMP ? ? 2 +> > > #define NYLUX_CHARGE_STATUS ? ? 3 > > > > > > > > > static struct ucb1400_ts *ucb; @@ -79,154 +79,154 @@ Marek Vasut <marek.vasut.n900@gmail.com> wrote: > > > > > > unsigned long nylux_read_main_battery(void) > > > { -> > > // struct ucb1400_ts *ucb; -> > > unsigned int voltage = 0; +> > > // ? ? ?struct ucb1400_ts *ucb; +> > > ? ? ? ?unsigned int voltage = 0; > > > -> > > printk(KERN_INFO "Reading_Main_Battery\n"); +> > > ? ? ? ?printk(KERN_INFO "Reading_Main_Battery\n"); > > > -> > > ucb1400_adc_enable(ucb->ac97); +> > > ? ? ? ?ucb1400_adc_enable(ucb->ac97); > > > -> > > // printk(KERN_INFO "Post adc_enable\n"); +> > > // ? ? ?printk(KERN_INFO "Post adc_enable\n"); > > > -> > > mdelay(1); -> > > voltage = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD0, 0); -> > > printk(KERN_INFO "\nVVVVVVvoltage %d\n", voltage); +> > > ? ? ? ?mdelay(1); +> > > ? ? ? ?voltage = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD0, 0); +> > > ? ? ? ?printk(KERN_INFO "\nVVVVVVvoltage %d\n", voltage); > > > -> > > ucb1400_adc_disable(ucb->ac97); +> > > ? ? ? ?ucb1400_adc_disable(ucb->ac97); > > > -> > > return voltage; +> > > ? ? ? ?return voltage; > > > } > > > > > > unsigned long nylux_read_bkup_battery(void) > > > { -> > > // struct ucb1400_ts *ucb; -> > > unsigned int voltage; +> > > // ? ? ?struct ucb1400_ts *ucb; +> > > ? ? ? ?unsigned int voltage; > > > -> > > ucb1400_adc_enable(ucb->ac97); +> > > ? ? ? ?ucb1400_adc_enable(ucb->ac97); > > > -> > > mdelay(1); -> > > voltage = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD1, 0); +> > > ? ? ? ?mdelay(1); +> > > ? ? ? ?voltage = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD1, 0); > > > -> > > ucb1400_adc_disable(ucb->ac97); -> > > //printk(KERN_INFO "Battery_bkup value = %d\n", voltage); +> > > ? ? ? ?ucb1400_adc_disable(ucb->ac97); +> > > ? ? ? ?//printk(KERN_INFO "Battery_bkup value = %d\n", voltage); > > > -> > > return voltage; +> > > ? ? ? ?return voltage; > > > } > > > > > > unsigned long nylux_charge_status(void) > > > { -> > > // struct ucb1400_ts *ucb; -> > > unsigned int status; +> > > // ? ? ?struct ucb1400_ts *ucb; +> > > ? ? ? ?unsigned int status; > > > -> > > //printk(KERN_INFO "Charge_status\n"); -> > > ucb1400_adc_enable(ucb->ac97); -> > > mdelay(1); -> > > status = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD2, 0); -> > > //printk(KERN_INFO "Charge status= %d\n", status); -> > > ucb1400_adc_disable(ucb->ac97); +> > > ? ? ? ?//printk(KERN_INFO "Charge_status\n"); +> > > ? ? ? ?ucb1400_adc_enable(ucb->ac97); +> > > ? ? ? ?mdelay(1); +> > > ? ? ? ?status = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD2, 0); +> > > ? ? ? ?//printk(KERN_INFO "Charge status= %d\n", status); +> > > ? ? ? ?ucb1400_adc_disable(ucb->ac97); > > > -> > > return status; +> > > ? ? ? ?return status; > > > > > > } > > > > > > static unsigned long nylux_read_devdata(int which) > > > { -> > > unsigned long ret = ~0; -> > > -> > > switch (which) { -> > > case NYLUX_BATT_VOLT: -> > > ret = nylux_read_main_battery(); -> > > //printk(KERN_INFO "read_main_battery: %d\n", ret); -> > > break; -> > > //case NYLUX_BKUPBATT_TEMP: -> > > //ret = nylux_read_bkup_battery(); -> > > //break; -> > > //case NYLUX_CHARGE_STATUS: -> > > //ret = nylux_charge_status(); -> > > //break; -> > > case NYLUX_STATUS_ACIN: { -> > > ret = GPLR(AC_IN_INT) & GPIO_bit(AC_IN_INT); -> > > //printk(KERN_INFO "AC_IN = %d\n", ret); -> > > //ret = read_ac_status(); -> > > //printk(KERN_INFO "read_ac_status: %d\n", ret); -> > > break; -> > > } -> > > -> > > default: -> > > ret = ~0; -> > > } -> > > -> > > return ret; +> > > ? ? ? ?unsigned long ret = ~0; +> > > +> > > ? ? ? ?switch (which) { +> > > ? ? ? ?case NYLUX_BATT_VOLT: +> > > ? ? ? ? ? ? ? ?ret = nylux_read_main_battery(); +> > > ? ? ? ? ? ? ? ?//printk(KERN_INFO "read_main_battery: %d\n", ret); +> > > ? ? ? ? ? ? ? ?break; +> > > ? ? ? ?//case NYLUX_BKUPBATT_TEMP: +> > > ? ? ? ? ? ? ? ?//ret = nylux_read_bkup_battery(); +> > > ? ? ? ? ? ? ? ?//break; +> > > ? ? ? ?//case NYLUX_CHARGE_STATUS: +> > > ? ? ? ? ? ? ? ?//ret = nylux_charge_status(); +> > > ? ? ? ? ? ? ? ?//break; +> > > ? ? ? ?case NYLUX_STATUS_ACIN: { +> > > ? ? ? ? ? ? ? ?ret = GPLR(AC_IN_INT) & GPIO_bit(AC_IN_INT); +> > > ? ? ? ? ? ? ? ?//printk(KERN_INFO "AC_IN = %d\n", ret); +> > > ? ? ? ? ? ? ? ?//ret = read_ac_status(); +> > > ? ? ? ? ? ? ? ?//printk(KERN_INFO "read_ac_status: %d\n", ret); +> > > ? ? ? ? ? ? ? ?break; +> > > ? ? ? ?} +> > > +> > > ? ? ? ?default: +> > > ? ? ? ? ? ? ? ?ret = ~0; +> > > ? ? ? ?} +> > > +> > > ? ? ? ?return ret; > > > > > > } > > > > > > //****** > > > struct battery_thresh battery_levels[] = { -> > > { 550, 100}, -> > > { 544, 97}, -> > > { 541, 93}, -> > > { 536, 88}, -> > > { 531, 83}, -> > > { 526, 78}, -> > > { 522, 73}, -> > > { 517, 68}, -> > > { 514, 63}, -> > > { 510, 58}, -> > > { 506, 53}, -> > > { 503, 48}, -> > > { 499, 43}, -> > > { 497, 38}, -> > > { 495, 33}, -> > > { 493, 28}, -> > > { 492, 23}, -> > > { 491, 18}, -> > > { 489, 13}, -> > > { 488, 8}, -> > > { 484, 3}, -> > > { 478, 0} +> > > ? ? ? ?{ 550, 100}, +> > > ? ? ? ?{ 544, ?97}, +> > > ? ? ? ?{ 541, ?93}, +> > > ? ? ? ?{ 536, ?88}, +> > > ? ? ? ?{ 531, ?83}, +> > > ? ? ? ?{ 526, ?78}, +> > > ? ? ? ?{ 522, ?73}, +> > > ? ? ? ?{ 517, ?68}, +> > > ? ? ? ?{ 514, ?63}, +> > > ? ? ? ?{ 510, ?58}, +> > > ? ? ? ?{ 506, ?53}, +> > > ? ? ? ?{ 503, ?48}, +> > > ? ? ? ?{ 499, ?43}, +> > > ? ? ? ?{ 497, ?38}, +> > > ? ? ? ?{ 495, ?33}, +> > > ? ? ? ?{ 493, ?28}, +> > > ? ? ? ?{ 492, ?23}, +> > > ? ? ? ?{ 491, ?18}, +> > > ? ? ? ?{ 489, ?13}, +> > > ? ? ? ?{ 488, ? 8}, +> > > ? ? ? ?{ 484, ? 3}, +> > > ? ? ? ?{ 478, ? 0} > > > }; > > > > > > struct sharpsl_charger_machinfo nylux_pm_machinfo = { -> > > .init = nylux_charger_init, -> > > .exit = nylux_charger_exit, -> > > .gpio_acin = AC_IN_INT, -> > > .read_devdata = nylux_read_devdata, -> > > .discharge = 0, -> > > .discharge1 = 0, -> > > .charge = 0, -> > > .measure_temp = 0, -> > > .presuspend = 0, -> > > .postsuspend = 0, -> > > .charger_wakeup = 0, -> > > .should_wakeup = 0, -> > > .bat_levels = 22, -> > > .bat_levels_noac = battery_levels, -> > > .bat_levels_acin = 0, -> > > .status_high_acin = 510, -> > > .status_low_acin = 490, -> > > .status_high_noac = 510, -> > > .status_low_noac = 490, -> > > .charge_on_volt = 0, -> > > .charge_on_temp = 0, -> > > .charge_acin_high = 0, -> > > .charge_acin_low = 0, -> > > .fatal_acin_volt = 0, -> > > .fatal_noacin_volt = 0, -> > > -> > > .batfull_irq = 1 +> > > ? ? ? ?.init ? ? ? ? ? ? = nylux_charger_init, +> > > ? ? ? ?.exit ? ? ? ? ? ? = nylux_charger_exit, +> > > ? ? ? ?.gpio_acin ? ? ? ?= AC_IN_INT, +> > > ? ? ? ?.read_devdata ? ? = nylux_read_devdata, +> > > ? ? ? ?.discharge ? ? ? ?= 0, +> > > ? ? ? ?.discharge1 ? ? ? = 0, +> > > ? ? ? ?.charge ? ? ? ? ? = 0, +> > > ? ? ? ?.measure_temp ? ? = 0, +> > > ? ? ? ?.presuspend ? ? ? = 0, +> > > ? ? ? ?.postsuspend ? ? ?= 0, +> > > ? ? ? ?.charger_wakeup ? = 0, +> > > ? ? ? ?.should_wakeup ? ?= 0, +> > > ? ? ? ?.bat_levels ? ? ? = 22, +> > > ? ? ? ?.bat_levels_noac ?= battery_levels, +> > > ? ? ? ?.bat_levels_acin ?= 0, +> > > ? ? ? ?.status_high_acin = 510, +> > > ? ? ? ?.status_low_acin ?= 490, +> > > ? ? ? ?.status_high_noac = 510, +> > > ? ? ? ?.status_low_noac ?= 490, +> > > ? ? ? ?.charge_on_volt ? = 0, +> > > ? ? ? ?.charge_on_temp ? = 0, +> > > ? ? ? ?.charge_acin_high = 0, +> > > ? ? ? ?.charge_acin_low ?= 0, +> > > ? ? ? ?.fatal_acin_volt ?= 0, +> > > ? ? ? ?.fatal_noacin_volt = 0, +> > > +> > > ? ? ? ?.batfull_irq ? ? ?= 1 > > > }; > > > > > > > > > /* > > > static int __init collie_pm_ucb_add(struct ucb1x00_dev *pdev) > > > { -> > > sharpsl_pm.machinfo = &nylux_pm_machinfo; -> > > ucb = pdev->ucb; -> > > return 0; +> > > ? ? ? ?sharpsl_pm.machinfo = &nylux_pm_machinfo; +> > > ? ? ? ?ucb = pdev->ucb; +> > > ? ? ? ?return 0; > > > } > > > > > > static struct ucb1x00_driver collie_pm_ucb_driver = { -> > > .add = collie_pm_ucb_add, +> > > ? ? ? ?.add ? ? ? ? ? ?= collie_pm_ucb_add, > > > }; > > > */ > > > @@ -234,29 +234,29 @@ Marek Vasut <marek.vasut.n900@gmail.com> wrote: > > > > > > static int __devinit nyluxpm_init(void) > > > { -> > > int ret; +> > > ? ? ? ?int ret; > > > -> > > nyluxpm_device = platform_device_alloc("sharpsl-pm", -1); -> > > if (!nyluxpm_device) -> > > return -ENOMEM; +> > > ? ? ? ?nyluxpm_device = platform_device_alloc("sharpsl-pm", -1); +> > > ? ? ? ?if (!nyluxpm_device) +> > > ? ? ? ? ? ? ? ?return -ENOMEM; > > > -> > > nyluxpm_device->dev.platform_data = &nylux_pm_machinfo; -> > > ret = platform_device_add(nyluxpm_device); +> > > ? ? ? ?nyluxpm_device->dev.platform_data = &nylux_pm_machinfo; +> > > ? ? ? ?ret = platform_device_add(nyluxpm_device); > > > -> > > if (ret) -> > > platform_device_put(nyluxpm_device); +> > > ? ? ? ?if (ret) +> > > ? ? ? ? ? ? ? ?platform_device_put(nyluxpm_device); > > > -> > > // if (!ret) -> > > // ret = +> > > // ? ? ?if (!ret) +> > > // ? ? ? ? ? ? ?ret = > > > ucb1x00_register_driver(&collie_pm_ucb_driver); > > > -> > > return ret; +> > > ? ? ? ?return ret; > > > } > > > > > > static void nyluxpm_exit(void) > > > { -> > > // ucb1x00_unregister_driver(&collie_pm_ucb_driver); -> > > platform_device_unregister(nyluxpm_device); +> > > // ? ? ?ucb1x00_unregister_driver(&collie_pm_ucb_driver); +> > > ? ? ? ?platform_device_unregister(nyluxpm_device); > > > } > > > > > > module_init(nyluxpm_init); @@ -268,7 +268,7 @@ Marek Vasut <marek.vasut.n900@gmail.com> wrote: > > > > > > _______________________________________________ > > > linux-arm-kernel mailing list -> > > linux-arm-kernel@lists.infradead.org +> > > linux-arm-kernel at lists.infradead.org > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > > > > @@ -286,7 +286,3 @@ anything similar just struct 'ucb1400' that is sum of 'ucb1400_ts' and 'ucb1400_gpio', but i don't see how to use these strusctures properly with my driver in fact 'ucb1x00' has a 'device' member into it while for instance ucb1400_ts has an 'input_dev' member --- -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 diff --git a/a/content_digest b/N1/content_digest index 3b5853b..2901b16 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,14 +3,10 @@ "ref\020101110100709.00003d84@unknown\0" "ref\0AANLkTi=TupY6Equaifzs6qX8_1y-tNrPFtVB+0=k_Xyh@mail.gmail.com\0" "ref\01289382751.16575.2.camel@konomi\0" - "From\0dylan cristiani <d.cristiani@idem-tech.it>\0" - "Subject\0Re: hi marek\0" + "From\0d.cristiani@idem-tech.it (dylan cristiani)\0" + "Subject\0hi marek\0" "Date\0Wed, 10 Nov 2010 12:09:12 +0100\0" - "To\0Marek Vasut <marek.vasut.n900@gmail.com>\0" - "Cc\0Haojian Zhuang <haojian.zhuang@gmail.com>" - Marek Vasut <marek.vasut@gmail.com> - linux-arm-kernel <linux-arm-kernel@lists.infradead.org> - " linux-input <linux-input@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, 10 Nov 2010 10:52:31 +0100\n" @@ -44,11 +40,11 @@ "> > > arch/arm/mach-pxa/nilux_pm.c\n" "> > > \n" "> > > /*\n" - "> > > \302\240* Based on spitz_pm.c and sharp code.\n" - "> > > \302\240*\n" - "> > > \302\240* Distributed under term of GPLv2.\n" - "> > > \302\240*\n" - "> > > \302\240*/\n" + "> > > ?* Based on spitz_pm.c and sharp code.\n" + "> > > ?*\n" + "> > > ?* Distributed under term of GPLv2.\n" + "> > > ?*\n" + "> > > ?*/\n" "> > > \n" "> > > #include <linux/module.h>\n" "> > > #include <linux/stat.h>\n" @@ -75,11 +71,11 @@ "> > > #include <mach/sharpsl_pm.h>\n" "> > > \n" "> > > \n" - "> > > #define AC_IN_INT \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 17\n" - "> > > #define NYLUX_BATT_VOLT \302\240 \302\240 \302\240 \302\240 1\n" - "> > > #define NYLUX_STATUS_ACIN \302\240 \302\240 \302\240 4\n" - "> > > #define NYLUX_BKUPBATT_TEMP \302\240 \302\240 2\n" - "> > > #define NYLUX_CHARGE_STATUS \302\240 \302\240 3\n" + "> > > #define AC_IN_INT ? ? ? ? ? ? ? 17\n" + "> > > #define NYLUX_BATT_VOLT ? ? ? ? 1\n" + "> > > #define NYLUX_STATUS_ACIN ? ? ? 4\n" + "> > > #define NYLUX_BKUPBATT_TEMP ? ? 2\n" + "> > > #define NYLUX_CHARGE_STATUS ? ? 3\n" "> > > \n" "> > > \n" "> > > static struct ucb1400_ts *ucb;\n" @@ -94,154 +90,154 @@ "> > > \n" "> > > unsigned long nylux_read_main_battery(void)\n" "> > > {\n" - "> > > // \302\240 \302\240 \302\240struct ucb1400_ts *ucb;\n" - "> > > \302\240 \302\240 \302\240 \302\240unsigned int voltage = 0;\n" + "> > > // ? ? ?struct ucb1400_ts *ucb;\n" + "> > > ? ? ? ?unsigned int voltage = 0;\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240printk(KERN_INFO \"Reading_Main_Battery\\n\");\n" + "> > > ? ? ? ?printk(KERN_INFO \"Reading_Main_Battery\\n\");\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240ucb1400_adc_enable(ucb->ac97);\n" + "> > > ? ? ? ?ucb1400_adc_enable(ucb->ac97);\n" "> > > \n" - "> > > // \302\240 \302\240 \302\240printk(KERN_INFO \"Post adc_enable\\n\");\n" + "> > > // ? ? ?printk(KERN_INFO \"Post adc_enable\\n\");\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240mdelay(1);\n" - "> > > \302\240 \302\240 \302\240 \302\240voltage = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD0, 0);\n" - "> > > \302\240 \302\240 \302\240 \302\240printk(KERN_INFO \"\\nVVVVVVvoltage %d\\n\", voltage);\n" + "> > > ? ? ? ?mdelay(1);\n" + "> > > ? ? ? ?voltage = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD0, 0);\n" + "> > > ? ? ? ?printk(KERN_INFO \"\\nVVVVVVvoltage %d\\n\", voltage);\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240ucb1400_adc_disable(ucb->ac97);\n" + "> > > ? ? ? ?ucb1400_adc_disable(ucb->ac97);\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240return voltage;\n" + "> > > ? ? ? ?return voltage;\n" "> > > }\n" "> > > \n" "> > > unsigned long nylux_read_bkup_battery(void)\n" "> > > {\n" - "> > > // \302\240 \302\240 \302\240struct ucb1400_ts *ucb;\n" - "> > > \302\240 \302\240 \302\240 \302\240unsigned int voltage;\n" + "> > > // ? ? ?struct ucb1400_ts *ucb;\n" + "> > > ? ? ? ?unsigned int voltage;\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240ucb1400_adc_enable(ucb->ac97);\n" + "> > > ? ? ? ?ucb1400_adc_enable(ucb->ac97);\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240mdelay(1);\n" - "> > > \302\240 \302\240 \302\240 \302\240voltage = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD1, 0);\n" + "> > > ? ? ? ?mdelay(1);\n" + "> > > ? ? ? ?voltage = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD1, 0);\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240ucb1400_adc_disable(ucb->ac97);\n" - "> > > \302\240 \302\240 \302\240 \302\240//printk(KERN_INFO \"Battery_bkup value = %d\\n\", voltage);\n" + "> > > ? ? ? ?ucb1400_adc_disable(ucb->ac97);\n" + "> > > ? ? ? ?//printk(KERN_INFO \"Battery_bkup value = %d\\n\", voltage);\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240return voltage;\n" + "> > > ? ? ? ?return voltage;\n" "> > > }\n" "> > > \n" "> > > unsigned long nylux_charge_status(void)\n" "> > > {\n" - "> > > // \302\240 \302\240 \302\240struct ucb1400_ts *ucb;\n" - "> > > \302\240 \302\240 \302\240 \302\240unsigned int status;\n" + "> > > // ? ? ?struct ucb1400_ts *ucb;\n" + "> > > ? ? ? ?unsigned int status;\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240//printk(KERN_INFO \"Charge_status\\n\");\n" - "> > > \302\240 \302\240 \302\240 \302\240ucb1400_adc_enable(ucb->ac97);\n" - "> > > \302\240 \302\240 \302\240 \302\240mdelay(1);\n" - "> > > \302\240 \302\240 \302\240 \302\240status = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD2, 0);\n" - "> > > \302\240 \302\240 \302\240 \302\240//printk(KERN_INFO \"Charge status= %d\\n\", status);\n" - "> > > \302\240 \302\240 \302\240 \302\240ucb1400_adc_disable(ucb->ac97);\n" + "> > > ? ? ? ?//printk(KERN_INFO \"Charge_status\\n\");\n" + "> > > ? ? ? ?ucb1400_adc_enable(ucb->ac97);\n" + "> > > ? ? ? ?mdelay(1);\n" + "> > > ? ? ? ?status = ucb1400_adc_read(ucb->ac97, UCB_ADC_INP_AD2, 0);\n" + "> > > ? ? ? ?//printk(KERN_INFO \"Charge status= %d\\n\", status);\n" + "> > > ? ? ? ?ucb1400_adc_disable(ucb->ac97);\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240return status;\n" + "> > > ? ? ? ?return status;\n" "> > > \n" "> > > }\n" "> > > \n" "> > > static unsigned long nylux_read_devdata(int which)\n" "> > > {\n" - "> > > \302\240 \302\240 \302\240 \302\240unsigned long ret = ~0;\n" - "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240switch (which) {\n" - "> > > \302\240 \302\240 \302\240 \302\240case NYLUX_BATT_VOLT:\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240ret = nylux_read_main_battery();\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240//printk(KERN_INFO \"read_main_battery: %d\\n\", ret);\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240break;\n" - "> > > \302\240 \302\240 \302\240 \302\240//case NYLUX_BKUPBATT_TEMP:\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240//ret = nylux_read_bkup_battery();\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240//break;\n" - "> > > \302\240 \302\240 \302\240 \302\240//case NYLUX_CHARGE_STATUS:\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240//ret = nylux_charge_status();\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240//break;\n" - "> > > \302\240 \302\240 \302\240 \302\240case NYLUX_STATUS_ACIN: {\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240ret = GPLR(AC_IN_INT) & GPIO_bit(AC_IN_INT);\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240//printk(KERN_INFO \"AC_IN = %d\\n\", ret);\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240//ret = read_ac_status();\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240//printk(KERN_INFO \"read_ac_status: %d\\n\", ret);\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240break;\n" - "> > > \302\240 \302\240 \302\240 \302\240}\n" - "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240default:\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240ret = ~0;\n" - "> > > \302\240 \302\240 \302\240 \302\240}\n" - "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240return ret;\n" + "> > > ? ? ? ?unsigned long ret = ~0;\n" + "> > > \n" + "> > > ? ? ? ?switch (which) {\n" + "> > > ? ? ? ?case NYLUX_BATT_VOLT:\n" + "> > > ? ? ? ? ? ? ? ?ret = nylux_read_main_battery();\n" + "> > > ? ? ? ? ? ? ? ?//printk(KERN_INFO \"read_main_battery: %d\\n\", ret);\n" + "> > > ? ? ? ? ? ? ? ?break;\n" + "> > > ? ? ? ?//case NYLUX_BKUPBATT_TEMP:\n" + "> > > ? ? ? ? ? ? ? ?//ret = nylux_read_bkup_battery();\n" + "> > > ? ? ? ? ? ? ? ?//break;\n" + "> > > ? ? ? ?//case NYLUX_CHARGE_STATUS:\n" + "> > > ? ? ? ? ? ? ? ?//ret = nylux_charge_status();\n" + "> > > ? ? ? ? ? ? ? ?//break;\n" + "> > > ? ? ? ?case NYLUX_STATUS_ACIN: {\n" + "> > > ? ? ? ? ? ? ? ?ret = GPLR(AC_IN_INT) & GPIO_bit(AC_IN_INT);\n" + "> > > ? ? ? ? ? ? ? ?//printk(KERN_INFO \"AC_IN = %d\\n\", ret);\n" + "> > > ? ? ? ? ? ? ? ?//ret = read_ac_status();\n" + "> > > ? ? ? ? ? ? ? ?//printk(KERN_INFO \"read_ac_status: %d\\n\", ret);\n" + "> > > ? ? ? ? ? ? ? ?break;\n" + "> > > ? ? ? ?}\n" + "> > > \n" + "> > > ? ? ? ?default:\n" + "> > > ? ? ? ? ? ? ? ?ret = ~0;\n" + "> > > ? ? ? ?}\n" + "> > > \n" + "> > > ? ? ? ?return ret;\n" "> > > \n" "> > > }\n" "> > > \n" "> > > //******\n" "> > > struct battery_thresh battery_levels[] = {\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 550, 100},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 544, \302\24097},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 541, \302\24093},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 536, \302\24088},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 531, \302\24083},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 526, \302\24078},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 522, \302\24073},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 517, \302\24068},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 514, \302\24063},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 510, \302\24058},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 506, \302\24053},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 503, \302\24048},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 499, \302\24043},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 497, \302\24038},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 495, \302\24033},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 493, \302\24028},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 492, \302\24023},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 491, \302\24018},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 489, \302\24013},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 488, \302\240 8},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 484, \302\240 3},\n" - "> > > \302\240 \302\240 \302\240 \302\240{ 478, \302\240 0}\n" + "> > > ? ? ? ?{ 550, 100},\n" + "> > > ? ? ? ?{ 544, ?97},\n" + "> > > ? ? ? ?{ 541, ?93},\n" + "> > > ? ? ? ?{ 536, ?88},\n" + "> > > ? ? ? ?{ 531, ?83},\n" + "> > > ? ? ? ?{ 526, ?78},\n" + "> > > ? ? ? ?{ 522, ?73},\n" + "> > > ? ? ? ?{ 517, ?68},\n" + "> > > ? ? ? ?{ 514, ?63},\n" + "> > > ? ? ? ?{ 510, ?58},\n" + "> > > ? ? ? ?{ 506, ?53},\n" + "> > > ? ? ? ?{ 503, ?48},\n" + "> > > ? ? ? ?{ 499, ?43},\n" + "> > > ? ? ? ?{ 497, ?38},\n" + "> > > ? ? ? ?{ 495, ?33},\n" + "> > > ? ? ? ?{ 493, ?28},\n" + "> > > ? ? ? ?{ 492, ?23},\n" + "> > > ? ? ? ?{ 491, ?18},\n" + "> > > ? ? ? ?{ 489, ?13},\n" + "> > > ? ? ? ?{ 488, ? 8},\n" + "> > > ? ? ? ?{ 484, ? 3},\n" + "> > > ? ? ? ?{ 478, ? 0}\n" "> > > };\n" "> > > \n" "> > > struct sharpsl_charger_machinfo nylux_pm_machinfo = {\n" - "> > > \302\240 \302\240 \302\240 \302\240.init \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 = nylux_charger_init,\n" - "> > > \302\240 \302\240 \302\240 \302\240.exit \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 = nylux_charger_exit,\n" - "> > > \302\240 \302\240 \302\240 \302\240.gpio_acin \302\240 \302\240 \302\240 \302\240= AC_IN_INT,\n" - "> > > \302\240 \302\240 \302\240 \302\240.read_devdata \302\240 \302\240 = nylux_read_devdata,\n" - "> > > \302\240 \302\240 \302\240 \302\240.discharge \302\240 \302\240 \302\240 \302\240= 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.discharge1 \302\240 \302\240 \302\240 = 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.charge \302\240 \302\240 \302\240 \302\240 \302\240 = 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.measure_temp \302\240 \302\240 = 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.presuspend \302\240 \302\240 \302\240 = 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.postsuspend \302\240 \302\240 \302\240= 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.charger_wakeup \302\240 = 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.should_wakeup \302\240 \302\240= 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.bat_levels \302\240 \302\240 \302\240 = 22,\n" - "> > > \302\240 \302\240 \302\240 \302\240.bat_levels_noac \302\240= battery_levels,\n" - "> > > \302\240 \302\240 \302\240 \302\240.bat_levels_acin \302\240= 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.status_high_acin = 510,\n" - "> > > \302\240 \302\240 \302\240 \302\240.status_low_acin \302\240= 490,\n" - "> > > \302\240 \302\240 \302\240 \302\240.status_high_noac = 510,\n" - "> > > \302\240 \302\240 \302\240 \302\240.status_low_noac \302\240= 490,\n" - "> > > \302\240 \302\240 \302\240 \302\240.charge_on_volt \302\240 = 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.charge_on_temp \302\240 = 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.charge_acin_high = 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.charge_acin_low \302\240= 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.fatal_acin_volt \302\240= 0,\n" - "> > > \302\240 \302\240 \302\240 \302\240.fatal_noacin_volt = 0,\n" - "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240.batfull_irq \302\240 \302\240 \302\240= 1\n" + "> > > ? ? ? ?.init ? ? ? ? ? ? = nylux_charger_init,\n" + "> > > ? ? ? ?.exit ? ? ? ? ? ? = nylux_charger_exit,\n" + "> > > ? ? ? ?.gpio_acin ? ? ? ?= AC_IN_INT,\n" + "> > > ? ? ? ?.read_devdata ? ? = nylux_read_devdata,\n" + "> > > ? ? ? ?.discharge ? ? ? ?= 0,\n" + "> > > ? ? ? ?.discharge1 ? ? ? = 0,\n" + "> > > ? ? ? ?.charge ? ? ? ? ? = 0,\n" + "> > > ? ? ? ?.measure_temp ? ? = 0,\n" + "> > > ? ? ? ?.presuspend ? ? ? = 0,\n" + "> > > ? ? ? ?.postsuspend ? ? ?= 0,\n" + "> > > ? ? ? ?.charger_wakeup ? = 0,\n" + "> > > ? ? ? ?.should_wakeup ? ?= 0,\n" + "> > > ? ? ? ?.bat_levels ? ? ? = 22,\n" + "> > > ? ? ? ?.bat_levels_noac ?= battery_levels,\n" + "> > > ? ? ? ?.bat_levels_acin ?= 0,\n" + "> > > ? ? ? ?.status_high_acin = 510,\n" + "> > > ? ? ? ?.status_low_acin ?= 490,\n" + "> > > ? ? ? ?.status_high_noac = 510,\n" + "> > > ? ? ? ?.status_low_noac ?= 490,\n" + "> > > ? ? ? ?.charge_on_volt ? = 0,\n" + "> > > ? ? ? ?.charge_on_temp ? = 0,\n" + "> > > ? ? ? ?.charge_acin_high = 0,\n" + "> > > ? ? ? ?.charge_acin_low ?= 0,\n" + "> > > ? ? ? ?.fatal_acin_volt ?= 0,\n" + "> > > ? ? ? ?.fatal_noacin_volt = 0,\n" + "> > > \n" + "> > > ? ? ? ?.batfull_irq ? ? ?= 1\n" "> > > };\n" "> > > \n" "> > > \n" "> > > /*\n" "> > > static int __init collie_pm_ucb_add(struct ucb1x00_dev *pdev)\n" "> > > {\n" - "> > > \302\240 \302\240 \302\240 \302\240sharpsl_pm.machinfo = &nylux_pm_machinfo;\n" - "> > > \302\240 \302\240 \302\240 \302\240ucb = pdev->ucb;\n" - "> > > \302\240 \302\240 \302\240 \302\240return 0;\n" + "> > > ? ? ? ?sharpsl_pm.machinfo = &nylux_pm_machinfo;\n" + "> > > ? ? ? ?ucb = pdev->ucb;\n" + "> > > ? ? ? ?return 0;\n" "> > > }\n" "> > > \n" "> > > static struct ucb1x00_driver collie_pm_ucb_driver = {\n" - "> > > \302\240 \302\240 \302\240 \302\240.add \302\240 \302\240 \302\240 \302\240 \302\240 \302\240= collie_pm_ucb_add,\n" + "> > > ? ? ? ?.add ? ? ? ? ? ?= collie_pm_ucb_add,\n" "> > > };\n" "> > > */\n" "> > > \n" @@ -249,29 +245,29 @@ "> > > \n" "> > > static int __devinit nyluxpm_init(void)\n" "> > > {\n" - "> > > \302\240 \302\240 \302\240 \302\240int ret;\n" + "> > > ? ? ? ?int ret;\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240nyluxpm_device = platform_device_alloc(\"sharpsl-pm\", -1);\n" - "> > > \302\240 \302\240 \302\240 \302\240if (!nyluxpm_device)\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240return -ENOMEM;\n" + "> > > ? ? ? ?nyluxpm_device = platform_device_alloc(\"sharpsl-pm\", -1);\n" + "> > > ? ? ? ?if (!nyluxpm_device)\n" + "> > > ? ? ? ? ? ? ? ?return -ENOMEM;\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240nyluxpm_device->dev.platform_data = &nylux_pm_machinfo;\n" - "> > > \302\240 \302\240 \302\240 \302\240ret = platform_device_add(nyluxpm_device);\n" + "> > > ? ? ? ?nyluxpm_device->dev.platform_data = &nylux_pm_machinfo;\n" + "> > > ? ? ? ?ret = platform_device_add(nyluxpm_device);\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240if (ret)\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240platform_device_put(nyluxpm_device);\n" + "> > > ? ? ? ?if (ret)\n" + "> > > ? ? ? ? ? ? ? ?platform_device_put(nyluxpm_device);\n" "> > > \n" - "> > > // \302\240 \302\240 \302\240if (!ret)\n" - "> > > // \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240ret =\n" + "> > > // ? ? ?if (!ret)\n" + "> > > // ? ? ? ? ? ? ?ret =\n" "> > > ucb1x00_register_driver(&collie_pm_ucb_driver);\n" "> > > \n" - "> > > \302\240 \302\240 \302\240 \302\240return ret;\n" + "> > > ? ? ? ?return ret;\n" "> > > }\n" "> > > \n" "> > > static void nyluxpm_exit(void)\n" "> > > {\n" - "> > > // \302\240 \302\240 \302\240ucb1x00_unregister_driver(&collie_pm_ucb_driver);\n" - "> > > \302\240 \302\240 \302\240 \302\240platform_device_unregister(nyluxpm_device);\n" + "> > > // ? ? ?ucb1x00_unregister_driver(&collie_pm_ucb_driver);\n" + "> > > ? ? ? ?platform_device_unregister(nyluxpm_device);\n" "> > > }\n" "> > > \n" "> > > module_init(nyluxpm_init);\n" @@ -283,7 +279,7 @@ "> > > \n" "> > > _______________________________________________\n" "> > > linux-arm-kernel mailing list\n" - "> > > linux-arm-kernel@lists.infradead.org\n" + "> > > linux-arm-kernel at lists.infradead.org\n" "> > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n" "> > > \n" "> > \n" @@ -300,10 +296,6 @@ "anything similar just struct 'ucb1400' that is sum of 'ucb1400_ts' and\n" "'ucb1400_gpio', but i don't see how to use these strusctures properly\n" "with my driver in fact 'ucb1x00' has a 'device' member into it while for\n" - "instance ucb1400_ts has an 'input_dev' member\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-input\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + instance ucb1400_ts has an 'input_dev' member -849ed19db4a29a4722c9a863a31cc6063924b6118f63dbde639768cd62c49f28 +a898e2d53757538121f55ec16a4f122cef3416b71bedba944233ec48944214d5
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.