Silence bootup errors from timer and gpio

bspratt · Dec 27, 2012 · 7deb3fa · 7deb3fa
1 parent 0e07ced
commit 7deb3fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
@@ -762,13 +762,14 @@ static void timer_set_mode(enum clock_event_mode mode,
 	unsigned long stc;
 
 	switch (mode) {
-	case CLOCK_EVT_MODE_PERIODIC:
-		stc = readl(__io_address(ST_BASE + 0x04));
-		writel(stc + TIMER_PERIOD, __io_address(ST_BASE + 0x18));	/* stc3 */
+	case CLOCK_EVT_MODE_ONESHOT: /* Leave the timer disabled, .set_next_event will enable it */
+	case CLOCK_EVT_MODE_SHUTDOWN:
 		break;
-	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_PERIODIC:
+
 	case CLOCK_EVT_MODE_UNUSED:
-	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
+
 	default:
 		printk(KERN_ERR "timer_set_mode: unhandled mode:%d\n",
 		       (int)mode);

diff --git a/arch/arm/mach-bcm2708/bcm2708_gpio.c b/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -263,7 +263,7 @@ static int bcm2708_gpio_probe(struct platform_device *dev)
 	struct resource *res;
 	int err = 0;
 
-	printk(KERN_ERR DRIVER_NAME ": bcm2708_gpio_probe %p\n", dev);
+	printk(KERN_INFO DRIVER_NAME ": bcm2708_gpio_probe %p\n", dev);
 
 	ucb = kzalloc(sizeof(*ucb), GFP_KERNEL);
 	if (NULL == ucb) {