r993 - trunk/src/target/u-boot/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Thu Feb 15 02:37:43 CET 2007
Author: laforge
Date: 2007-02-15 02:37:43 +0100 (Thu, 15 Feb 2007)
New Revision: 993
Modified:
trunk/src/target/u-boot/patches/uboot-neo1973-poweroff.patch
Log:
cpu speed change is now (safely) implemented in cmd_s3c2410.
Modified: trunk/src/target/u-boot/patches/uboot-neo1973-poweroff.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-neo1973-poweroff.patch 2007-02-15 01:37:21 UTC (rev 992)
+++ trunk/src/target/u-boot/patches/uboot-neo1973-poweroff.patch 2007-02-15 01:37:43 UTC (rev 993)
@@ -5,8 +5,8 @@
Index: u-boot/board/neo1973/Makefile
===================================================================
---- u-boot.orig/board/neo1973/Makefile 2007-02-10 19:33:14.000000000 +0100
-+++ u-boot/board/neo1973/Makefile 2007-02-11 17:38:13.000000000 +0100
+--- u-boot.orig/board/neo1973/Makefile 2007-02-15 00:43:51.000000000 +0100
++++ u-boot/board/neo1973/Makefile 2007-02-15 01:36:20.000000000 +0100
@@ -25,7 +25,7 @@
LIB = lib$(BOARD).a
@@ -19,8 +19,8 @@
Index: u-boot/board/neo1973/cmd_neo1973.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/cmd_neo1973.c 2007-02-10 19:33:17.000000000 +0100
-@@ -0,0 +1,148 @@
++++ u-boot/board/neo1973/cmd_neo1973.c 2007-02-15 01:55:42.000000000 +0100
+@@ -0,0 +1,120 @@
+/*
+ * (C) Copyright 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <laforge at openmoko.org>
@@ -70,14 +70,6 @@
+ [PCF50606_MBCC1_CHGMOD_IDLE] = "idle",
+};
+
-+static inline void delay (unsigned long loops)
-+{
-+ __asm__ volatile ("1:\n"
-+ "subs %0, %1, #1\n"
-+ "bne 1b":"=r" (loops):"0" (loops));
-+}
-+
-+
+int do_neo1973 ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+ int i;
@@ -124,25 +116,6 @@
+ neo1973_vibrator(1);
+ else
+ neo1973_vibrator(0);
-+ } else if (!strcmp(argv[1], "266MHz")) {
-+ S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
-+ u_int32_t mpllcon;
-+
-+ if (argc < 3)
-+ goto out_help;
-+ if (!strcmp(argv[2], "on"))
-+ mpllcon = ((0x7d << 12) + (0x1 << 4) + 0x1);
-+ else
-+ mpllcon = ((0x90 << 12) + (0x7 << 4) + 0x0);
-+
-+ /* to reduce PLL lock time, adjust the LOCKTIME register */
-+ clk_power->LOCKTIME = 0xFFFFFF;
-+
-+ /* configure MPLL */
-+ clk_power->MPLLCON = mpllcon;
-+
-+ /* some delay */
-+ delay (4000);
+ } else {
+out_help:
+ printf("Usage:\n%s\n", cmdtp->usage);
@@ -166,13 +139,12 @@
+ "neo1973 charger off - disable charging\n"
+ "neo1973 backlight (on|off) - switch backlight on or off\n"
+ "neo1973 vibrator (on|off) - switch vibrator on or off\n"
-+ "neo1973 266MHz (on|off) - switch 266MHz on or off\n"
+);
+#endif /* CFG_CMD_BDI */
Index: u-boot/board/neo1973/neo1973.c
===================================================================
---- u-boot.orig/board/neo1973/neo1973.c 2007-02-10 19:33:14.000000000 +0100
-+++ u-boot/board/neo1973/neo1973.c 2007-02-11 17:38:35.000000000 +0100
+--- u-boot.orig/board/neo1973/neo1973.c 2007-02-15 00:43:51.000000000 +0100
++++ u-boot/board/neo1973/neo1973.c 2007-02-15 01:36:20.000000000 +0100
@@ -34,8 +34,14 @@
#include <s3c2410.h>
#include <i2c.h>
@@ -349,7 +321,7 @@
Index: u-boot/board/neo1973/pcf50606.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/pcf50606.h 2007-02-10 20:19:12.000000000 +0100
++++ u-boot/board/neo1973/pcf50606.h 2007-02-15 00:43:54.000000000 +0100
@@ -0,0 +1,267 @@
+#ifndef _PCF50606_H
+#define _PCF50606_H
@@ -621,7 +593,7 @@
Index: u-boot/board/neo1973/neo1973.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/neo1973.h 2007-02-10 19:33:17.000000000 +0100
++++ u-boot/board/neo1973/neo1973.h 2007-02-15 00:43:54.000000000 +0100
@@ -0,0 +1,18 @@
+#ifndef _NEO1973_H
+#define _NEO1973_H
@@ -644,7 +616,7 @@
Index: u-boot/board/neo1973/pcf50606.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/pcf50606.c 2007-02-10 23:00:36.000000000 +0100
++++ u-boot/board/neo1973/pcf50606.c 2007-02-15 00:43:54.000000000 +0100
@@ -0,0 +1,168 @@
+
+#include <common.h>
@@ -816,8 +788,8 @@
+}
Index: u-boot/common/main.c
===================================================================
---- u-boot.orig/common/main.c 2007-02-10 19:33:14.000000000 +0100
-+++ u-boot/common/main.c 2007-02-10 19:33:17.000000000 +0100
+--- u-boot.orig/common/main.c 2007-02-15 00:43:51.000000000 +0100
++++ u-boot/common/main.c 2007-02-15 00:43:54.000000000 +0100
@@ -61,6 +61,7 @@
#undef DEBUG_PARSER
More information about the commitlog
mailing list