From 2e73bd974d2b07d3ea80c602dfafc2ac8293f30e Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Mon, 25 Feb 2013 10:41:59 +0100
Subject: [PATCH] meta-digi: Add battery configuration and module autoload for
 CCIMX51JS.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 meta-digi-arm/conf/machine/ccimx51js.conf                      | 2 ++
 meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb      | 1 +
 .../linux-del_2.6.35.14/ccimx51js/config-battery-module.cfg    | 3 +++
 .../recipes-digi/del-examples/del-examples-battery.bb          | 2 ++
 4 files changed, 8 insertions(+)
 create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-battery-module.cfg

diff --git a/meta-digi-arm/conf/machine/ccimx51js.conf b/meta-digi-arm/conf/machine/ccimx51js.conf
index e6a6d1462..5dc9b199c 100644
--- a/meta-digi-arm/conf/machine/ccimx51js.conf
+++ b/meta-digi-arm/conf/machine/ccimx51js.conf
@@ -21,10 +21,12 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l \"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \"
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pmic_battery \"
 
 module_autoload_mma7455l = "mma7455l"
 module_autoload_scc2_driver = "scc2_driver"
 module_autoload_sahara = "sahara"
 module_autoload_mt9v111_camera = "mt9v111_camera"
+module_autoload_pmic_battery = "pmic_battery"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb
index cd99ffba5..b66b63a08 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb
@@ -10,6 +10,7 @@ SRCREV_mx5 = "${AUTOREV}"
 LOCALVERSION_mx5 = "mx5+master"
 
 KERNEL_CFG_FRAGS_mx5 = "file://config-accel-module.cfg file://config-sahara-module.cfg file://config-camera-module.cfg"
+KERNEL_CFG_FRAGS_ccimx51js_mx5 = "file://config-battery-module.cfg"
 SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/master \
            file://defconfig \
 	   ${KERNEL_CFG_FRAGS} \
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-battery-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-battery-module.cfg
new file mode 100644
index 000000000..4812bc6e2
--- /dev/null
+++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14/ccimx51js/config-battery-module.cfg
@@ -0,0 +1,3 @@
+CONFIG_MXC_MC13892_BATTERY=m
+CONFIG_MXC_MC13892_BATTERY_DEFAULT_CHARGING_CURRENT=40
+
diff --git a/meta-digi-del/recipes-digi/del-examples/del-examples-battery.bb b/meta-digi-del/recipes-digi/del-examples/del-examples-battery.bb
index 16c01fe2b..e3f2de123 100644
--- a/meta-digi-del/recipes-digi/del-examples/del-examples-battery.bb
+++ b/meta-digi-del/recipes-digi/del-examples/del-examples-battery.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 
 PR = "r0"
 
+RDEPENDS_${PN} = "kernel-module-pmic_battery"
+
 SRC_URI = "file://battery_test"
 
 S = "${WORKDIR}/battery_test"