Commit 59384796 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next/topic-s3c64xx-devel' into next-samsung-devel

parents a102a9ec d5160ecf

arch/arm/mach-s3c64xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -288,5 +288,6 @@ config MACH_WLF_CRAGG_6410 
	select S3C_DEV_RTC

	select S3C64XX_DEV_SPI

	select S3C24XX_GPIO_EXTRA128

	select I2C

	help

	  Machine support for the Wolfson Cragganmore S3C6410 variant.

arch/arm/mach-s3c64xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ obj-$(CONFIG_MACH_HMT) += mach-hmt.o 
obj-$(CONFIG_MACH_SMARTQ)	+= mach-smartq.o

obj-$(CONFIG_MACH_SMARTQ5)	+= mach-smartq5.o

obj-$(CONFIG_MACH_SMARTQ7)	+= mach-smartq7.o

obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o

obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o



# device support

arch/arm/mach-s3c64xx/clock.c

+7 −1
Original line number Diff line number Diff line
@@ -744,7 +744,13 @@ void __init_or_cpufreq s3c6400_setup_clocks(void) 
	printk(KERN_INFO "S3C64XX: PLL settings, A=%ld, M=%ld, E=%ld\n",

	       apll, mpll, epll);



	if(__raw_readl(S3C64XX_OTHERS) & S3C64XX_OTHERS_SYNCMUXSEL)

		/* Synchronous mode */

		hclk2 = apll / GET_DIV(clkdiv0, S3C6400_CLKDIV0_HCLK2);

	else

		/* Asynchronous mode */

		hclk2 = mpll / GET_DIV(clkdiv0, S3C6400_CLKDIV0_HCLK2);



	hclk = hclk2 / GET_DIV(clkdiv0, S3C6400_CLKDIV0_HCLK);

	pclk = hclk2 / GET_DIV(clkdiv0, S3C6400_CLKDIV0_PCLK);

arch/arm/mach-s3c64xx/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static int __init s3c64xx_dma_init(void) 
	}



	/* Set all DMA configuration to be DMA, not SDMA */

	writel(0xffffff, S3C_SYSREG(0x110));

	writel(0xffffff, S3C64XX_SDMA_SEL);



	/* Register standard DMA controllers */

	s3c64xx_dma_init1(0, DMACH_UART0, IRQ_DMA0, 0x75000000);

arch/arm/mach-s3c64xx/include/mach/crag6410.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/* Cragganmore 6410 shared definitions

 *

 * Copyright 2011 Wolfson Microelectronics plc

 *	Mark Brown <broonie@opensource.wolfsonmicro.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef MACH_CRAG6410_H

#define MACH_CRAG6410_H



#include <linux/gpio.h>



#define BANFF_PMIC_IRQ_BASE		IRQ_BOARD_START

#define GLENFARCLAS_PMIC_IRQ_BASE	(IRQ_BOARD_START + 64)



#define PCA935X_GPIO_BASE		GPIO_BOARD_START

#define CODEC_GPIO_BASE		(GPIO_BOARD_START + 8)

#define GLENFARCLAS_PMIC_GPIO_BASE	(GPIO_BOARD_START + 16)



#endif