hwmon: dbx500: Migrate to kernel3.0

Patch includes following commits

u5500: prcmu: add irqs for db5500 temperature sensor
dbx500: hwmon: temperature monitor support for DB5500

ST-Ericsson ID: 352334
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: NA

Signed-off-by: Rajagopala V <rajagopala.v@stericsson.com>
Change-Id: I4df816759c0f8d039b88788e35372c05990c11ce
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29681

8 files changed, 30 insertions, 7 deletions

diff --git a/arch/arm/configs/u5500_defconfig b/arch/arm/configs/u5500_defconfig
index 86416b33a6f..6a08e0cc79c 100755
--- a/arch/arm/configs/u5500_defconfig
+++ b/arch/arm/configs/u5500_defconfig
@@ -1037,6 +1037,7 @@ CONFIG_HWMON=y
 # Native drivers
 #
 CONFIG_SENSORS_AB5500=y
+CONFIG_SENSORS_DBX500=y
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADCXX is not set
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 3d1b73cc60f..1b7ba860e90 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -163,7 +163,7 @@ CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y
 CONFIG_AB5500_BM=y
 CONFIG_AB5500_BATTERY_THERM_ON_BATCTRL=y
 CONFIG_SENSORS_AB8500=y
-CONFIG_SENSORS_DB8500=y
+CONFIG_SENSORS_DBX500=y
 CONFIG_SENSORS_LSM303DLH=y
 CONFIG_SENSORS_L3G4200D=y
 CONFIG_WATCHDOG=y
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 83720c26ece..ec8fed561be 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -880,7 +880,7 @@ static struct platform_device *mop500_platform_devs[] __initdata = {
 	&ux500_hwmem_device,
 	&ux500_mcde_device,
 	&ux500_b2r2_device,
-	&u8500_thsens_device,
+	&ux500_thsens_device,
 #ifdef CONFIG_STE_TRACE_MODEM
 	&u8500_trace_modem,
 #endif
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index e4cc9368e3f..bf70b6eedf2 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -396,6 +396,7 @@ static struct platform_device *u5500_platform_devices[] __initdata = {
 #ifdef CONFIG_U5500_MMIO
 	&u5500_mmio_device,
 #endif
+	&ux500_thsens_device,
 };
 
 static void __init u5500_i2c_init(void)
diff --git a/arch/arm/mach-ux500/devices-db5500.c b/arch/arm/mach-ux500/devices-db5500.c
index 593852a2098..641f037f102 100644
--- a/arch/arm/mach-ux500/devices-db5500.c
+++ b/arch/arm/mach-ux500/devices-db5500.c
@@ -253,3 +253,23 @@ struct platform_device ux500_b2r2_device = {
 	.resource	= b2r2_resources,
 };
 
+static struct resource u5500_thsens_resources[] = {
+	[0] = {
+		.name	= "IRQ_HOTMON_LOW",
+		.start  = IRQ_DB5500_PRCMU_TEMP_SENSOR_LOW,
+		.end    = IRQ_DB5500_PRCMU_TEMP_SENSOR_LOW,
+		.flags  = IORESOURCE_IRQ,
+	},
+	[1] = {
+		.name	= "IRQ_HOTMON_HIGH",
+		.start  = IRQ_DB5500_PRCMU_TEMP_SENSOR_HIGH,
+		.end    = IRQ_DB5500_PRCMU_TEMP_SENSOR_HIGH,
+		.flags  = IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device ux500_thsens_device = {
+	.name           = "dbx500_temp",
+	.resource       = u5500_thsens_resources,
+	.num_resources  = ARRAY_SIZE(u5500_thsens_resources),
+};
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 31a4d85c5d5..f2e865d7872 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -436,8 +436,8 @@ static struct resource u8500_thsens_resources[] = {
 	},
 };
 
-struct platform_device u8500_thsens_device = {
-	.name           = "db8500_temp",
+struct platform_device ux500_thsens_device = {
+	.name           = "dbx500_temp",
 	.resource       = u8500_thsens_resources,
 	.num_resources  = ARRAY_SIZE(u8500_thsens_resources),
 };
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h
index 9ea4cfea099..760570b231a 100644
--- a/arch/arm/mach-ux500/include/mach/devices.h
+++ b/arch/arm/mach-ux500/include/mach/devices.h
@@ -27,7 +27,7 @@ extern struct platform_device ux500_cryp1_device;
 extern struct platform_device ux500_wdt_device;
 extern struct platform_device ux500_prcmu_wdt_device;
 extern struct platform_device mloader_fw_device;
-extern struct platform_device u8500_thsens_device;
+extern struct platform_device ux500_thsens_device;
 extern struct platform_device ux500_ske_keypad_device;
 extern struct platform_device u8500_hsi_device;
 extern struct platform_device ux500_mmio_device;
diff --git a/arch/arm/mach-ux500/include/mach/irqs-db5500.h b/arch/arm/mach-ux500/include/mach/irqs-db5500.h
index d8d00b6c2ba..4ea577aefa0 100644
--- a/arch/arm/mach-ux500/include/mach/irqs-db5500.h
+++ b/arch/arm/mach-ux500/include/mach/irqs-db5500.h
@@ -109,8 +109,9 @@
 #define IRQ_DB5500_PRCMU_GPIO7 (IRQ_DB5500_PRCMU_BASE + 18)
 #define IRQ_DB5500_PRCMU_AC_REL_ACK (IRQ_DB5500_PRCMU_BASE + 19)
 #define IRQ_DB5500_PRCMU_LOW_POWER_AUDIO (IRQ_DB5500_PRCMU_BASE + 20)
-#define IRQ_DB5500_PRCMU_TEMP_SENSOR (IRQ_DB5500_PRCMU_BASE + 21)
-#define IRQ_DB5500_PRCMU_END (IRQ_DB5500_PRCMU_BASE + 22)
+#define IRQ_DB5500_PRCMU_TEMP_SENSOR_LOW (IRQ_DB5500_PRCMU_BASE + 21)
+#define IRQ_DB5500_PRCMU_TEMP_SENSOR_HIGH (IRQ_DB5500_PRCMU_BASE + 22)
+#define IRQ_DB5500_PRCMU_END (IRQ_DB5500_PRCMU_BASE + 23)
 
 #define NUM_DB5500_PRCMU_WAKEUPS (IRQ_DB5500_PRCMU_END - IRQ_DB5500_PRCMU_BASE)