cyan/strago: disable Ambient Light Sensor device

No devices are connected to i2c4 bus on
both strago and cyan board.
Hence disabling the ALS platform data.
This will fix the i2c4 timeout issue and
also help in boot time optimization.

Removed unused macros.

BUG=None
BRANCH=chrome-os-partner:41934
TEST=After booting to kernel, i2c4 timeout
error message should not appear in dmesg.

Change-Id: Ib7ab4c95b0830a8d4e53c6c0ee919649ad1ed354
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 3c52b64037b46016fe01f1d55c4c58f7684eb778
Original-Change-Id: Ia7acdcef67a2f2837866f56aa0426a02ee05db46
Original-Signed-off-by: Jagadish Krishnamoorthy <jagadish.krishnamoorthy@intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/283608
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11005
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

6 files changed, 0 insertions, 111 deletions

diff --git a/src/mainboard/google/cyan/acpi/mainboard.asl b/src/mainboard/google/cyan/acpi/mainboard.asl
index 34b345e574..9918672421 100755
--- a/src/mainboard/google/cyan/acpi/mainboard.asl
+++ b/src/mainboard/google/cyan/acpi/mainboard.asl
@@ -199,46 +199,6 @@ Scope (\_SB.I2C2)
 	}
 }
 
-Scope (\_SB.I2C5)
-{
-	Device (ALSI)
-	{
-		/*
-		 * TODO(dlaurie): Need official HID.
-		 *
-		 * The current HID is created from the Intersil PNP
-		 * Vendor ID "LSD" and a shortened device identifier.
-		 */
-		Name (_HID, EisaId ("LSD2918"))
-		Name (_DDN, "Intersil 29018 Ambient Light Sensor")
-		Name (_UID, 1)
-
-		Name (_CRS, ResourceTemplate()
-		{
-			I2cSerialBus (
-				0x44,                     /* SlaveAddress */
-				ControllerInitiated,      /* SlaveMode */
-				400000,                   /* ConnectionSpeed */
-				AddressingMode7Bit,       /* AddressingMode */
-				"\\_SB.I2C5",             /* ResourceSource */
-			)
-			Interrupt (ResourceConsumer, Edge, ActiveLow)
-			{
-				BOARD_ALS_IRQ
-			}
-		})
-
-		Method (_STA)
-		{
-			If (LEqual (\S5EN, 1)) {
-				Return (0xF)
-			} Else {
-				Return (0x0)
-			}
-		}
-	}
-}
-
 Scope (\_SB.I2C6)
 {
 	Device (ETPA)
diff --git a/src/mainboard/google/cyan/irqroute.h b/src/mainboard/google/cyan/irqroute.h
index c670beebda..e66c87f841 100644
--- a/src/mainboard/google/cyan/irqroute.h
+++ b/src/mainboard/google/cyan/irqroute.h
@@ -47,18 +47,3 @@
 	PIRQ_PIC(G, DISABLE), \
 	PIRQ_PIC(H, DISABLE)
 
-/* CORE bank DIRQs - up to 16 supported */
-#define TPAD_IRQ_OFFSET		0
-#define TOUCH_IRQ_OFFSET	1
-#define I8042_IRQ_OFFSET	2
-#define ALS_IRQ_OFFSET		3
-/* Corresponding SCORE GPIO pins */
-#define TPAD_IRQ_GPIO		55
-#define TOUCH_IRQ_GPIO		72
-#define I8042_IRQ_GPIO		101
-#define ALS_IRQ_GPIO		70
-
-/* SUS bank DIRQs - up to 16 supported */
-#define CODEC_IRQ_OFFSET	0
-/* Corresponding SUS GPIO pins */
-#define CODEC_IRQ_GPIO		9
diff --git a/src/mainboard/google/cyan/onboard.h b/src/mainboard/google/cyan/onboard.h
index eae880bb94..7e770244bd 100755
--- a/src/mainboard/google/cyan/onboard.h
+++ b/src/mainboard/google/cyan/onboard.h
@@ -65,7 +65,6 @@
 #define BOARD_TOUCHSCREEN_I2C_BUS       0
 #define BOARD_TOUCHSCREEN_I2C_ADDR      0x4a    /* TODO(shawnn): Check this */
 
-#define BOARD_ALS_IRQ                   GPIO_S0_DED_IRQ(ALS_IRQ_OFFSET)
 
 /* SD CARD gpio */
 #define SDCARD_CD			81
diff --git a/src/mainboard/intel/strago/acpi/mainboard.asl b/src/mainboard/intel/strago/acpi/mainboard.asl
index 1228a73895..eefa005cc3 100755
--- a/src/mainboard/intel/strago/acpi/mainboard.asl
+++ b/src/mainboard/intel/strago/acpi/mainboard.asl
@@ -168,45 +168,6 @@ Scope (\_SB.I2C1)
 
 Scope (\_SB.I2C5)
 {
-	Device (ALSI)
-	{
-		/*
-		 * TODO(dlaurie): Need official HID.
-		 *
-		 * The current HID is created from the Intersil PNP
-		 * Vendor ID "LSD" and a shortened device identifier.
-		 */
-		Name (_HID, EisaId ("LSD2918"))
-		Name (_DDN, "Intersil 29018 Ambient Light Sensor")
-		Name (_UID, 1)
-
-		Name (_CRS, ResourceTemplate()
-		{
-			I2cSerialBus (
-				0x44,                     /* SlaveAddress */
-				ControllerInitiated,      /* SlaveMode */
-				400000,                   /* ConnectionSpeed */
-				AddressingMode7Bit,       /* AddressingMode */
-				"\\_SB.I2C5",             /* ResourceSource */
-			)
-			Interrupt (ResourceConsumer, Edge, ActiveLow)
-			{
-				BOARD_ALS_IRQ
-			}
-		})
-
-		Method (_STA)
-		{
-			If (LEqual (\BDID, BOARD_BCRD2)) {
-				Return (0x0)
-			}
-			If (LEqual (\S5EN, 1)) {
-				Return (0xF)
-			} Else {
-				Return (0x0)
-			}
-		}
-	}
 
 	/* Realtek Audio Codec */
 	Device (RTEK)   /* Audio Codec driver I2C */
diff --git a/src/mainboard/intel/strago/irqroute.h b/src/mainboard/intel/strago/irqroute.h
index c670beebda..e66c87f841 100644
--- a/src/mainboard/intel/strago/irqroute.h
+++ b/src/mainboard/intel/strago/irqroute.h
@@ -47,18 +47,3 @@
 	PIRQ_PIC(G, DISABLE), \
 	PIRQ_PIC(H, DISABLE)
 
-/* CORE bank DIRQs - up to 16 supported */
-#define TPAD_IRQ_OFFSET		0
-#define TOUCH_IRQ_OFFSET	1
-#define I8042_IRQ_OFFSET	2
-#define ALS_IRQ_OFFSET		3
-/* Corresponding SCORE GPIO pins */
-#define TPAD_IRQ_GPIO		55
-#define TOUCH_IRQ_GPIO		72
-#define I8042_IRQ_GPIO		101
-#define ALS_IRQ_GPIO		70
-
-/* SUS bank DIRQs - up to 16 supported */
-#define CODEC_IRQ_OFFSET	0
-/* Corresponding SUS GPIO pins */
-#define CODEC_IRQ_GPIO		9
diff --git a/src/mainboard/intel/strago/onboard.h b/src/mainboard/intel/strago/onboard.h
index ec75578eaa..4b4403c0e1 100755
--- a/src/mainboard/intel/strago/onboard.h
+++ b/src/mainboard/intel/strago/onboard.h
@@ -62,7 +62,6 @@
 #define BOARD_TOUCHSCREEN_I2C_BUS       0
 #define BOARD_TOUCHSCREEN_I2C_ADDR      0x4a    /* TODO(shawnn): Check this */
 
-#define BOARD_ALS_IRQ                   GPIO_S0_DED_IRQ(ALS_IRQ_OFFSET)
 
 
 /* SD CARD gpio */