Merge git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / drivers / misc / ali512x.c

diff --git a/drivers/misc/ali512x.c b/drivers/misc/ali512x.c
index 7b7edc09af94c35fde778c47733bf12abb94d719..e714e28bdc30b3de55ad875441fbd0157a03c14a 100644 (file)
--- a/drivers/misc/ali512x.c
+++ b/drivers/misc/ali512x.c
@@ -1,24 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
- * Daniel Engström, Omicron Ceti AB <daniel@omicron.se>.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Daniel Engström, Omicron Ceti AB <daniel@omicron.se>.
  */
 
 /*
@@ -32,11 +15,9 @@
 
 #include <config.h>
 
-#ifdef CONFIG_ALI152X
-
 #include <common.h>
 #include <asm/io.h>
-#include <asm/ic/ali512x.h>
+#include <ali512x.h>
 
 
 /* ALI M5123 Logical device numbers:
@@ -262,7 +243,7 @@ void ali512x_set_kbc(int enabled, u8 kbc_irq, u8 mouse_irq)
  * SIO reigster 3 (CIO Address Selection) bit definitions:
  * bit 7   CIO index and data registers enabled
  * bit 1-0 CIO indirect registers port address select
- *              0  index = 0xE0 data = 0xE1
+ *      0  index = 0xE0 data = 0xE1
  *       1  index = 0xE2 data = 0xE3
  *       2  index = 0xE4 data = 0xE5
  *       3  index = 0xEA data = 0xEB
@@ -418,6 +399,3 @@ int ali512x_cio_in(int pin)
 
        return data & bit;
 }
-
-
-#endif