linux-openmoko 2.6.24: solve the sysfs battery clash differently as it lead to nonwor...

(too many implicit cross-module dependencies :/)

diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index 781579b..c986975 100644 (file)
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -38,14 +38,10 @@ do_configure_prepend() {
                 echo -n "fixing up configuration for Openmoko GTA01..."
                 sed -i -e s,CONFIG_S3C_LOWLEVEL_UART_PORT=2,CONFIG_S3C_LOWLEVEL_UART_PORT=0, ${WORKDIR}/defconfig
                 sed -i -e s,CONFIG_DEBUG_S3C_UART=2,CONFIG_DEBUG_S3C_UART=0, ${WORKDIR}/defconfig
-                echo "# CONFIG_BATTERY_BQ27000_HDQ is not set" >>${WORKDIR}/defconfig
-                echo "CONFIG_BATTERY_GTA01=y" >>${WORKDIR}/defconfig
                 echo "done"
         fi
         if [ ${MACHINE} == "om-gta02" ]; then
                 echo -n "fixing up configuration for Openmoko GTA02..."
-                echo "CONFIG_BATTERY_BQ27000_HDQ=y" >>${WORKDIR}/defconfig
-                echo "# CONFIG_BATTERY_GTA01 is not set" >>${WORKDIR}/defconfig
                 echo "done"
         fi                                                                       
 }

diff --git a/packages/linux/linux-openmoko/defconfig-oe b/packages/linux/linux-openmoko/defconfig-oe
index 5b8fb37..e3714b7 100644 (file)
--- a/packages/linux/linux-openmoko/defconfig-oe
+++ b/packages/linux/linux-openmoko/defconfig-oe
@@ -1023,9 +1023,9 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_APM_POWER is not set
 # CONFIG_BATTERY_DS2760 is not set
-### override CONFIG_BATTERY_BQ27000_HDQ=y
+CONFIG_BATTERY_BQ27000_HDQ=y
 CONFIG_GTA02_HDQ=y
-### override CONFIG_BATTERY_GTA01=y
+CONFIG_BATTERY_GTA01=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set

diff --git a/packages/linux/linux-openmoko/gta01-fix-battery-class-name.patch b/packages/linux/linux-openmoko/gta01-fix-battery-class-name.patch
new file mode 100644 (file)
index 0000000..6e8692c
--- /dev/null
+++ b/packages/linux/linux-openmoko/gta01-fix-battery-class-name.patch
@@ -0,0 +1,13 @@
+Index: git/drivers/power/gta01_battery.c
+===================================================================
+--- git.orig/drivers/power/gta01_battery.c
++++ git/drivers/power/gta01_battery.c
+@@ -70,7 +70,7 @@ static int __init gta01_bat_init(void)
+ {
+       int ret;
+ 
+-      bat_pdev = platform_device_register_simple("bat", 0, NULL, 0);
++      bat_pdev = platform_device_register_simple("bat-th-gta01", 0, NULL, 0);
+       if (IS_ERR(bat_pdev))
+               return PTR_ERR(bat_pdev);
+ 

diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 134542a..6f62b3d 100644 (file)
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "The Linux kernel for the Openmoko devices GTA01 (Neo1973) and GTA
 KERNEL_RELEASE = "2.6.24"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-OEV = "oe2"
+OEV = "oe3"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
 PR = "r0"
 
@@ -20,6 +20,7 @@ SRC_URI = "\
   file://0005-squashfs-Makefile.patch;patch=1 \
   \
   file://openwrt-ledtrig-netdev.patch;patch=1 \
+  file://gta01-fix-battery-class-name.patch;patch=1 \
   \
   file://defconfig-oe \
 "