staging: olpc_dcon: drop support for DCON v1

The v1 DCONs only existed for XO-1 prototypes (and even then, very very
early prototypes).  Drop support for v1 DCON.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index cf4b45440f6731e9eedd9202ff3a3cd4e487785a..ae18cd455fd9a83878f3e2633248055c3d53d57a 100644 (file)
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -88,29 +88,18 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init)
        }
 
        if (ver < 0xdc02) {
-               /* Initialize the DCON registers */
-
-               /* Start with work-arounds for DCON ASIC */
-               i2c_smbus_write_word_data(client, 0x4b, 0x00cc);
-               i2c_smbus_write_word_data(client, 0x4b, 0x00cc);
-               i2c_smbus_write_word_data(client, 0x4b, 0x00cc);
-               i2c_smbus_write_word_data(client, 0x0b, 0x007a);
-               i2c_smbus_write_word_data(client, 0x36, 0x025c);
-               i2c_smbus_write_word_data(client, 0x37, 0x025e);
-
-               /* Initialise SDRAM */
-
-               i2c_smbus_write_word_data(client, 0x3b, 0x002b);
-               i2c_smbus_write_word_data(client, 0x41, 0x0101);
-               i2c_smbus_write_word_data(client, 0x42, 0x0101);
-       } else {
-               /* SDRAM setup/hold time */
-               i2c_smbus_write_word_data(client, 0x3a, 0xc040);
-               i2c_smbus_write_word_data(client, 0x41, 0x0000);
-               i2c_smbus_write_word_data(client, 0x41, 0x0101);
-               i2c_smbus_write_word_data(client, 0x42, 0x0101);
+               dev_err(&dcon->client->dev,
+                               "DCON v1 is unsupported, giving up..\n");
+               rc = -ENODEV;
+               goto err;
        }
 
+       /* SDRAM setup/hold time */
+       i2c_smbus_write_word_data(client, 0x3a, 0xc040);
+       i2c_smbus_write_word_data(client, 0x41, 0x0000);
+       i2c_smbus_write_word_data(client, 0x41, 0x0101);
+       i2c_smbus_write_word_data(client, 0x42, 0x0101);
+
        /* Colour swizzle, AA, no passthrough, backlight */
        if (is_init) {
                dcon->disp_mode = MODE_PASSTHRU | MODE_BL_ENABLE |