Hi Ameya, This bug is fixed by another sr 8420. For any kernel fix, please submit to devel:kernel:1.1 at first and then submit to MeeGo:1.1:Core:Testing. I didn't accept that request because I'm waiting for Srikanth's latest n900 1.1 Testing report.
Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Ameya Palande > Sent: Thursday, October 14, 2010 8:01 PM > To: [email protected] > Subject: [meego-commits] 8448: Changes to MeeGo:1.1:Core/kernel > > Hi, > I have made the following changes to kernel in project MeeGo:1.1:Core. Please > review and accept ASAP. > > Thank You, > Ameya Palande > > [This message was auto-generated] > > --- > > Request #8448: > > submit: home:apalande/kernel(r3) -> MeeGo:1.1:Core/kernel > > > Message: > * Thu Oct 14 2010 Ameya Palande <[email protected]> - > 2.6.35.3 > - N900: Implement TWL4030 poweroff. Fixes BMC #6090 > > State: new 2010-10-14T05:00:49 apalande > Comment: None > > > > changes files: > -------------- > --- kernel.changes > +++ kernel.changes > @@ -0,0 +1,3 @@ > +* Thu Oct 14 2010 Ameya Palande <[email protected]> - 2.6.35.3 > +- N900: Implement TWL4030 poweroff. Fixes BMC #6090 > + > > new: > ---- > linux-2.6-mfd-Implement-twl4030-poweroff.patch > > spec files: > ----------- > --- kernel-ivi.spec > +++ kernel-ivi.spec > @@ -281,6 +281,8 @@ > Patch316: > linux-2.6.37-power_supply-add-isp1704-charger-detection-driver.patch > Patch317: linux-2.6.37-power_supply-add-types-for-USB-chargers.patch > Patch318: linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > +# N900 Poweroff fix > +Patch319: linux-2.6-mfd-Implement-twl4030-poweroff.patch > > # > # End of the Nokia N900 patches > @@ -697,6 +699,9 @@ > %patch317 -p1 > # linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > %patch318 -p1 > +# N900 Poweroff fix > +# linux-2.6-mfd-Implement-twl4030-poweroff.patch > +%patch319 -p1 > > # > # End of the Nokia N900 patches > --- kernel-mrst.spec > +++ kernel-mrst.spec > @@ -282,6 +282,8 @@ > Patch316: > linux-2.6.37-power_supply-add-isp1704-charger-detection-driver.patch > Patch317: linux-2.6.37-power_supply-add-types-for-USB-chargers.patch > Patch318: linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > +# N900 Poweroff fix > +Patch319: linux-2.6-mfd-Implement-twl4030-poweroff.patch > > # > # End of the Nokia N900 patches > @@ -698,6 +700,9 @@ > %patch317 -p1 > # linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > %patch318 -p1 > +# N900 Poweroff fix > +# linux-2.6-mfd-Implement-twl4030-poweroff.patch > +%patch319 -p1 > > # > # End of the Nokia N900 patches > --- kernel-n900.spec > +++ kernel-n900.spec > @@ -281,6 +281,8 @@ > Patch316: > linux-2.6.37-power_supply-add-isp1704-charger-detection-driver.patch > Patch317: linux-2.6.37-power_supply-add-types-for-USB-chargers.patch > Patch318: linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > +# N900 Poweroff fix > +Patch319: linux-2.6-mfd-Implement-twl4030-poweroff.patch > > # > # End of the Nokia N900 patches > @@ -697,6 +699,9 @@ > %patch317 -p1 > # linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > %patch318 -p1 > +# N900 Poweroff fix > +# linux-2.6-mfd-Implement-twl4030-poweroff.patch > +%patch319 -p1 > > # > # End of the Nokia N900 patches > --- kernel-netbook.spec > +++ kernel-netbook.spec > @@ -281,6 +281,8 @@ > Patch316: > linux-2.6.37-power_supply-add-isp1704-charger-detection-driver.patch > Patch317: linux-2.6.37-power_supply-add-types-for-USB-chargers.patch > Patch318: linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > +# N900 Poweroff fix > +Patch319: linux-2.6-mfd-Implement-twl4030-poweroff.patch > > # > # End of the Nokia N900 patches > @@ -697,6 +699,9 @@ > %patch317 -p1 > # linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > %patch318 -p1 > +# N900 Poweroff fix > +# linux-2.6-mfd-Implement-twl4030-poweroff.patch > +%patch319 -p1 > > # > # End of the Nokia N900 patches > --- kernel.spec > +++ kernel.spec > @@ -293,6 +293,8 @@ > Patch316: > linux-2.6.37-power_supply-add-isp1704-charger-detection-driver.patch > Patch317: linux-2.6.37-power_supply-add-types-for-USB-chargers.patch > Patch318: linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > +# N900 Poweroff fix > +Patch319: linux-2.6-mfd-Implement-twl4030-poweroff.patch > > # > # End of the Nokia N900 patches > @@ -739,6 +741,9 @@ > %patch317 -p1 > # linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > %patch318 -p1 > +# N900 Poweroff fix > +# linux-2.6-mfd-Implement-twl4030-poweroff.patch > +%patch319 -p1 > > # > # End of the Nokia N900 patches > > other changes: > -------------- > > ++++++ config-arm-n900 > --- config-arm-n900 > +++ config-arm-n900 > @@ -150,6 +150,8 @@ > CONFIG_TWL4030_WATCHDOG=y > > CONFIG_TWL4030_CORE=y > +CONFIG_TWL4030_POWER=y > + > CONFIG_REGULATOR=y > CONFIG_REGULATOR_TWL4030=y > > > ++++++ linux-2.6-mfd-Implement-twl4030-poweroff.patch (new) > --- linux-2.6-mfd-Implement-twl4030-poweroff.patch > +++ linux-2.6-mfd-Implement-twl4030-poweroff.patch > +From 02b61b47ff7bb1a6b648061fbebe9f94fbf42b46 Mon Sep 17 00:00:00 > 2001 > +From: Peter 'p2' De Schrijver <[email protected]> > +Date: Thu, 30 Sep 2010 14:59:30 +0300 > +Subject: [PATCH] mfd: Implement twl4030 poweroff > + > +Add support for software controlled power off for TWL4030 based devices. > + > +[Forward ported by: Ameya Palande <[email protected]] > + > +Signed-off-by: Peter 'p2' De Schrijver <[email protected]> > +Tested-by: Ameya Palande <[email protected]> > +Fixes: BMC #6090 - [N900] Poweroff fails > +--- > + drivers/mfd/twl4030-power.c | 52 > +++++++++++++++++++++++++++++++++++++++++++ > + 1 files changed, 52 insertions(+), 0 deletions(-) > + > +diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c > +index 7efa878..c743b5f 100644 > +--- a/drivers/mfd/twl4030-power.c > ++++ b/drivers/mfd/twl4030-power.c > +@@ -33,6 +33,11 @@ > + > + static u8 twl4030_start_script_address = 0x2b; > + > ++#define STS_HW_CONDITIONS 0x0f > ++#define STS_VBUS (1<<7) > ++ > ++#define TWL4030_WATCHDOG_CFG_REG_OFFS 0x3 > ++ > + #define PWR_P1_SW_EVENTS 0x10 > + #define PWR_DEVOFF (1<<0) > + > +@@ -511,6 +516,51 @@ int twl4030_remove_script(u8 flags) > + return err; > + } > + > ++static void twl4030_poweroff(void) > ++{ > ++ u8 val[4]; > ++ int err; > ++ > ++ err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &val[0], > ++ STS_HW_CONDITIONS); > ++ if (err) > ++ pr_err("I2C error %d while reading TWL4030" > ++ " PM_MASTER HW_CONDITIONS\n", err); > ++ > ++ if (val[0] & STS_VBUS) { > ++ pr_emerg("twl4030-poweroff: VBUS on," > ++ " forcing restart!\n"); > ++ /* > ++ * Set watchdog, Triton goes to WAIT-ON state. > ++ * VBUS will cause start up > ++ */ > ++ twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 1, > ++ TWL4030_WATCHDOG_CFG_REG_OFFS); > ++ return; > ++ } > ++ > ++ err = twl_i2c_read(TWL4030_MODULE_PM_MASTER, &val[0], > ++ PWR_P1_SW_EVENTS, 3); > ++ if (err) { > ++ printk(KERN_WARNING "I2C error %d while reading TWL4030" > ++ "PM_MASTER P1_SW_EVENTS\n", err); > ++ return; > ++ } > ++ > ++ val[0] |= PWR_DEVOFF; > ++ val[1] |= PWR_DEVOFF; > ++ val[2] |= PWR_DEVOFF; > ++ > ++ err = twl_i2c_write(TWL4030_MODULE_PM_MASTER, val, > ++ PWR_P1_SW_EVENTS, 3); > ++ > ++ if (err) { > ++ printk(KERN_WARNING "I2C error %d while writing TWL4030" > ++ "PM_MASTER P1_SW_EVENTS\n", err); > ++ return ; > ++ } > ++} > ++ > + void __init twl4030_power_init(struct twl4030_power_data > *twl4030_scripts) > + { > + int err = 0; > +@@ -518,6 +568,8 @@ void __init twl4030_power_init(struct > twl4030_power_data *twl4030_scripts) > + struct twl4030_resconfig *resconfig; > + u8 address = twl4030_start_script_address; > + > ++ pm_power_off = twl4030_poweroff; > ++ > + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_1, > + R_PROTECT_KEY); > + if (err) > +-- > +1.7.0.4 > + > > ++++++ series > --- series > +++ series > @@ -126,6 +126,8 @@ > linux-2.6.37-power_supply-add-isp1704-charger-detection-driver.patch > linux-2.6.37-power_supply-add-types-for-USB-chargers.patch > linux-2.6-usb-musb-ignore-spurious-SESSREQ-interrupts.patch > +# N900 Poweroff fix > +linux-2.6-mfd-Implement-twl4030-poweroff.patch > > # > # End of the Nokia N900 patches > > _______________________________________________ > Meego-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
