1 files changed, 10 insertions, 76 deletions

diff --git a/src/mainboard/google/oak/mainboard.c b/src/mainboard/google/oak/mainboard.c
index 21525fa488..fde2bd00e1 100644
--- a/src/mainboard/google/oak/mainboard.c
+++ b/src/mainboard/google/oak/mainboard.c
@@ -127,12 +127,10 @@ static void configure_usb(void)
 	if (board_id() + CONFIG_BOARD_ID_ADJUSTMENT > 3) {
 		/* Type C port 0 Over current alert pin */
 		gpio_input_pullup(GPIO(MSDC3_DSL));
-		if (!CONFIG(BOARD_GOOGLE_ROWAN)) {
-			/* Enable USB3 type A port 0 5V load switch */
-			gpio_output(GPIO(CM2MCLK), 1);
-			/* USB3 Type A port 0 power over current alert pin */
-			gpio_input_pullup(GPIO(CMPCLK));
-		}
+		/* Enable USB3 type A port 0 5V load switch */
+		gpio_output(GPIO(CM2MCLK), 1);
+		/* USB3 Type A port 0 power over current alert pin */
+		gpio_input_pullup(GPIO(CMPCLK));
 		/* Type C port 1 over current alert pin */
 		if (board_id() + CONFIG_BOARD_ID_ADJUSTMENT < 7)
 			gpio_input_pullup(GPIO(PCM_SYNC));
@@ -150,9 +148,6 @@ static void configure_usb(void)
 
 static void configure_usb_hub(void)
 {
-	if (CONFIG(BOARD_GOOGLE_ROWAN))
-		return;
-
 	/* set usb hub reset pin (low active) to high */
 	if (board_id() + CONFIG_BOARD_ID_ADJUSTMENT > 4)
 		gpio_output(GPIO(UTXD3), 1);
@@ -203,51 +198,6 @@ static void configure_display(void)
 	udelay(100);
 }
 
-static void configure_backlight_rowan(void)
-{
-	gpio_output(GPIO(DAIPCMOUT), 0);	/* PANEL_LCD_POWER_EN */
-	gpio_output(GPIO(DISP_PWM0), 0);	/* DISP_PWM0 */
-	gpio_output(GPIO(PCM_TX), 0);	/* PANEL_POWER_EN */
-}
-
-static void configure_display_rowan(void)
-{
-	gpio_output(GPIO(UCTS2), 1); /* VDDIO_EN */
-	/* delay 15 ms for panel vddio to stabilize */
-	mdelay(15);
-
-	gpio_output(GPIO(SRCLKENAI2), 1); /* LCD_RESET */
-	udelay(20);
-	gpio_output(GPIO(SRCLKENAI2), 0); /* LCD_RESET */
-	udelay(20);
-	gpio_output(GPIO(SRCLKENAI2), 1); /* LCD_RESET */
-	mdelay(20);
-
-	/* Rowan panel avdd */
-	gpio_output(GPIO(URTS2), 1);
-
-	/* Rowan panel avee */
-	gpio_output(GPIO(URTS0), 1);
-
-	/* panel.delay.prepare */
-	mdelay(20);
-}
-
-static const struct edid rowan_boe_edid = {
-	.panel_bits_per_color = 8,
-	.panel_bits_per_pixel = 24,
-	.mode = {
-		.name = "1536x2048@60Hz",
-		.pixel_clock = 241646,
-		.lvds_dual_channel = 1,
-		.refresh = 60,
-		.ha = 1536, .hbl = 404, .hso = 200, .hspw = 4, .hborder = 0,
-		.va = 2048, .vbl = 28, .vso = 12, .vspw = 2, .vborder = 0,
-		.phsync = '-', .pvsync = '-',
-		.x_mm = 147, .y_mm = 196,
-	},
-};
-
 static int read_edid_from_ps8640(struct edid *edid)
 {
 	u8 i2c_bus, i2c_addr;
@@ -278,22 +228,11 @@ static void display_startup(void)
 	u32 mipi_dsi_flags;
 	bool dual_dsi_mode;
 
-	if (CONFIG(BOARD_GOOGLE_ROWAN)) {
-		edid = rowan_boe_edid;
-		dual_dsi_mode = true;
-		mipi_dsi_flags = MIPI_DSI_MODE_VIDEO |
-				 MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
-				 MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET |
-				 MIPI_DSI_CLOCK_NON_CONTINUOUS;
-	} else {
-		if (read_edid_from_ps8640(&edid) < 0)
-			return;
-
-		dual_dsi_mode = false;
-		mipi_dsi_flags = MIPI_DSI_MODE_VIDEO |
-				 MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
-	}
+	if (read_edid_from_ps8640(&edid) < 0)
+		return;
 
+	dual_dsi_mode = false;
+	mipi_dsi_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
 	edid_set_framebuffer_bits_per_pixel(&edid, 32, 0);
 
 	mtk_ddp_init(dual_dsi_mode);
@@ -327,13 +266,8 @@ static void mainboard_init(struct device *dev)
 
 	if (display_init_required()) {
 		mtcmos_display_power_on();
-		if (CONFIG(BOARD_GOOGLE_ROWAN)) {
-			configure_backlight_rowan();
-			configure_display_rowan();
-		} else {
-			configure_backlight();
-			configure_display();
-		}
+		configure_backlight();
+		configure_display();
 		display_startup();
 	} else {
 		printk(BIOS_INFO, "Skipping display init.\n");