Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751333AbWCJSHr (ORCPT ); Fri, 10 Mar 2006 13:07:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751629AbWCJSHr (ORCPT ); Fri, 10 Mar 2006 13:07:47 -0500 Received: from gprs189-60.eurotel.cz ([160.218.189.60]:2475 "EHLO amd.ucw.cz") by vger.kernel.org with ESMTP id S1751333AbWCJSHr (ORCPT ); Fri, 10 Mar 2006 13:07:47 -0500 Date: Fri, 10 Mar 2006 19:07:20 +0100 From: Pavel Machek To: Richard Purdie Cc: kernel list , lenz@cs.wisc.edu Subject: Re: [rfc] separate sharpsl_pm initialization from sysfs code Message-ID: <20060310180719.GD8018@elf.ucw.cz> References: <20060309124237.GA3794@elf.ucw.cz> <1141911202.10107.54.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1141911202.10107.54.camel@localhost.localdomain> X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7981 Lines: 337 Hi! > > On collie, battery sensing code is not on platform bus -- it is on > > ucb1x00. Is this acceptable way to make sharpsl_pm useful for collie? > > It separates code that is bus-independent, so collie can call only > > code it needs. > > I'm not sure why the battery sensing code being on a non-platform bus > prevents you from registering a platform device as mentioned in my other > email? If you register the device, you then get the benefit of all the > features of the common code like the sysfs attributes and common > charging code. Its not really designed to be used outside the device > model and I suspect trying to do so is just going to mean lots more > nasty changes to it in the future... Does this look better? If so, I'll cleanup #if 0s /comments/printks and send it as a proper diff... Pavel /* * Based on spitz_pm.c and sharp code. * * Copyright (C) 2001 SHARP * Copyright 2005 Pavel Machek * * Distribute under GPLv2. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "../drivers/mfd/ucb1x00.h" #ifdef CONFIG_MCP_UCB1200_TS #error Battery interferes with touchscreen #endif static struct ucb1x00 *ucb; static int ad_revise; #define ADCtoPower(x) ((330 * x * 2) / 1024) static void collie_charger_init(void) { int err; if (sharpsl_param.adadj != -1) { ad_revise = sharpsl_param.adadj; } /* Register interrupt handler. */ if ((err = request_irq(COLLIE_IRQ_GPIO_AC_IN, sharpsl_ac_isr, SA_INTERRUPT, "ACIN", sharpsl_ac_isr))) { printk("Could not get irq %d.\n", COLLIE_IRQ_GPIO_AC_IN); return; } if ((err = request_irq(COLLIE_IRQ_GPIO_CO, sharpsl_chrg_full_isr, SA_INTERRUPT, "CO", sharpsl_chrg_full_isr))) { free_irq(COLLIE_IRQ_GPIO_AC_IN, sharpsl_ac_isr); printk("Could not get irq %d.\n", COLLIE_IRQ_GPIO_CO); return; } #if 0 if (!ucb) printk(KERN_CRIT "ucb is null!\n"); #endif /* Set transition detect */ ucb1x00_enable_irq(ucb, COLLIE_GPIO_AC_IN, UCB_RISING); ucb1x00_enable_irq(ucb, COLLIE_GPIO_CO, UCB_RISING); ucb1x00_adc_enable(ucb); ucb1x00_io_set_dir(ucb, 0, COLLIE_TC35143_GPIO_MBAT_ON | COLLIE_TC35143_GPIO_TMP_ON | COLLIE_TC35143_GPIO_BBAT_ON); return; } static void collie_measure_temp(int on) { if (on) ucb1x00_io_write(ucb, COLLIE_TC35143_GPIO_TMP_ON, 0); else ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_TMP_ON); } static void collie_charge(int on) { if (on) { printk("Should start charger\n"); } else { printk("Should stop charger\n"); } #ifdef I_AM_SURE #define CF_BUF_CTRL_BASE 0xF0800000 #define SCOOP_REG(adr) (*(volatile unsigned short*)(CF_BUF_CTRL_BASE+(adr))) #define SCOOP_REG_GPWR SCOOP_REG(SCOOP_GPWR) if (on) { set_scoop_gpio(&colliescoop_device.dev, COLLIE_SCP_CHARGE_ON); } else { reset_scoop_gpio(&colliescoop_device.dev, COLLIE_SCP_CHARGE_ON); } #endif } static void collie_discharge(int on) { } static void collie_discharge1(int on) { } static void collie_presuspend(void) { } static void collie_postsuspend(void) { } static int collie_should_wakeup(unsigned int resume_on_alarm) { return 0; } static unsigned long collie_charger_wakeup(void) { return 0; } int collie_read_backup_battery(void) { int voltage; /* Gives 75..130 */ ucb1x00_io_write(ucb, COLLIE_TC35143_GPIO_BBAT_ON, 0); voltage = ucb1x00_adc_read(ucb, UCB_ADC_INP_AD1, UCB_SYNC); ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_BBAT_ON); printk("Backup battery = %d(%d)\n", ADCtoPower(voltage), voltage); return ADCtoPower(voltage); } int collie_read_main_battery(void) { int voltage, voltage_rev, voltage_volts; #if 0 collie_read_temp(); collie_read_backup_battery(); #endif ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_BBAT_ON); ucb1x00_io_write(ucb, COLLIE_TC35143_GPIO_MBAT_ON, 0); voltage = ucb1x00_adc_read(ucb, UCB_ADC_INP_AD1, UCB_SYNC); ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_MBAT_ON); /* gives values 160..255 with battery removed... and 145..255 with battery inserted. (on AC) On battery, it goes as low as 80. */ voltage_rev = voltage + ((ad_revise * voltage) / 652); voltage_volts = ADCtoPower(voltage_rev); printk("Main battery = %d(%d)\n", voltage_volts, voltage); if ( voltage != -1 ) { return voltage_volts; } else { return voltage; } } int collie_read_temp(void) { int voltage; /* temp must be > 973, main battery must be < 465 */ /* FIXME sharpsl_pm.c has both conditions negated? */ ucb1x00_io_write(ucb, COLLIE_TC35143_GPIO_TMP_ON, 0); voltage = ucb1x00_adc_read(ucb, UCB_ADC_INP_AD0, UCB_SYNC); ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_TMP_ON); /* >1010 = battery removed. 460 = 22C ? higer = lower temp ? */ printk("Battery temp = %d\n", voltage); return voltage; } static unsigned long read_devdata(int which) { switch (which) { case SHARPSL_BATT_VOLT: return collie_read_main_battery(); case SHARPSL_BATT_TEMP: return collie_read_temp(); case SHARPSL_ACIN_VOLT: return 0x1; case SHARPSL_STATUS_ACIN: { int ret = GPLR & COLLIE_GPIO_AC_IN; printk("AC status = %d\n", ret); return ret; } case SHARPSL_STATUS_FATAL: { int ret = GPLR & COLLIE_GPIO_MAIN_BAT_LOW; printk("Fatal bat = %d\n", ret); return ret; } default: return ~0; } } struct battery_thresh spitz_battery_levels_noac[] = { #ifdef FOO_FRONTLIGHT { 368, 100}, { 358, 25}, { 356, 5}, { 0, 0}, #else { 378, 100}, { 365, 25}, { 363, 5}, { 0, 0}, #endif }; struct battery_thresh spitz_battery_levels_acin[] = { #ifdef FOO_FRONTLIGHT { 368, 100}, { 358, 25}, { 356, 5}, { 0, 0}, #else { 378, 100}, { 365, 25}, { 363, 5}, { 0, 0}, #endif }; struct sharpsl_charger_machinfo collie_pm_machinfo = { .init = collie_charger_init, .read_devdata = read_devdata, .discharge = collie_discharge, .discharge1 = collie_discharge1, .charge = collie_charge, .measure_temp = collie_measure_temp, .presuspend = collie_presuspend, .postsuspend = collie_postsuspend, .charger_wakeup = collie_charger_wakeup, .should_wakeup = collie_should_wakeup, .bat_levels = 3, .bat_levels_noac = spitz_battery_levels_noac, .bat_levels_acin = spitz_battery_levels_acin, .status_high_acin = 368, .status_low_acin = 358, .status_high_noac = 368, .status_low_noac = 358, }; static int __init collie_pm_ucb_add(struct ucb1x00_dev *pdev) { sharpsl_pm.machinfo = &collie_pm_machinfo; ucb = pdev->ucb; return 0; } static struct ucb1x00_driver collie_pm_ucb_driver = { .add = collie_pm_ucb_add, }; static struct platform_device *collie_pm_device; static int __init collie_pm_init(void) { int ret; collie_pm_device = platform_device_alloc("sharpsl-pm", -1); if (!collie_pm_device) return -ENOMEM; collie_pm_device->dev.platform_data = &collie_pm_machinfo; ret = platform_device_add(collie_pm_device); if (ret) platform_device_put(collie_pm_device); if (!ret) ret = ucb1x00_register_driver(&collie_pm_ucb_driver); return ret; } static void __exit collie_pm_exit(void) { ucb1x00_unregister_driver(&collie_pm_ucb_driver); platform_device_unregister(collie_pm_device); } module_init(collie_pm_init); module_exit(collie_pm_exit); -- 6: { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/