iPhone: iPhone 3G should have PMU defined. Thanks to bluerise.

bluerise · May 17, 2010 · 7ceb450 · 7ceb450
1 parent 1637a09
commit 7ceb450
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/arch/arm/mach-apple_iphone/iphone.c b/arch/arm/mach-apple_iphone/iphone.c
@@ -214,6 +214,9 @@ static struct i2c_board_info __initdata iphone_i2c0[] = {
 	},
 #endif
 #ifdef CONFIG_IPHONE_3G
+	{
+		I2C_BOARD_INFO("iphone-pmu", 0xe6),
+	},
 	{
 		I2C_BOARD_INFO("wm8991", 0x36),
 	},

diff --git a/drivers/input/touchscreen/zephyr2.c b/drivers/input/touchscreen/zephyr2.c
@@ -1033,9 +1033,9 @@ int z2_setup(const u8* constructedFirmware, int constructedFirmwareLen, const u8
 		kfree(GetResultPacket);
 		return err;
 	}
-#endif
 
 	printk("zephyr2: loaded %d byte proximity calibration data\n", prox_cal_size);
+#endif
 
 	if(!loadCal(cal, cal_size))
 	{