Commit eca4ee0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] amba: fix amba device resources
  [ARM] pgtable: file pte layout documentation
  [ARM] pgtable: swp pte layout documentation, definitions, and check
  [ARM] export __cpu_flush_dcache_page
  [ARM] 5576/1: Update kb9202_defconfig
  [ARM] 5581/1: U300 clock updates
  [ARM] 5579/1: Updated U300 defconfig
parents e5a7675d 557dca5f

arch/arm/configs/kb9202_defconfig

+842 −316

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/u300_defconfig

+53 −39
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30-rc6

# Mon Jun  1 09:18:22 2009

# Linux kernel version: 2.6.31-rc1

# Thu Jul  2 00:16:59 2009

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -9,7 +9,7 @@ CONFIG_GENERIC_GPIO=y 
CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

# CONFIG_NO_IOPORT is not set

CONFIG_HAVE_TCM=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -18,13 +18,12 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y 
CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y



#

# General setup
@@ -68,7 +67,6 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y
@@ -81,8 +79,13 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

# CONFIG_AIO is not set



#

# Performance Counters

#

# CONFIG_VM_EVENT_COUNTERS is not set

CONFIG_SLUB_DEBUG=y

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_COMPAT_BRK=y

# CONFIG_SLAB is not set

CONFIG_SLUB=y
@@ -94,6 +97,10 @@ CONFIG_HAVE_OPROFILE=y 
CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_CLK=y



#

# GCOV-based kernel profiling

#

# CONFIG_SLOW_WORK is not set

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y
@@ -106,7 +113,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

CONFIG_LBDAF=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -138,9 +145,9 @@ CONFIG_DEFAULT_IOSCHED="deadline" 
# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_STMP3XXX is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set
@@ -216,8 +223,8 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_WRITETHROUGH is not set

# CONFIG_CPU_CACHE_ROUND_ROBIN is not set

# CONFIG_OUTER_CACHE is not set

CONFIG_ARM_VIC=y

CONFIG_ARM_VIC_NR=2

CONFIG_COMMON_CLKDEV=y



#
@@ -243,7 +250,6 @@ CONFIG_PREEMPT=y 
CONFIG_HZ=100

CONFIG_AEABI=y

CONFIG_OABI_COMPAT=y

CONFIG_ARCH_FLATMEM_HAS_HOLES=y

# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set

# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

# CONFIG_HIGHMEM is not set
@@ -258,17 +264,18 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 
# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

CONFIG_ALIGNMENT_TRAP=y

# CONFIG_UACCESS_WITH_MEMCPY is not set



#

# Boot options

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/mtdblock2 rw rootfstype=yaffs2 console=ttyAMA0,115200n8 ab3100.force=0,0x48 mtdparts=u300nand:128k@0x0(bootrecords)ro,8064k@128k(free)ro,253952k@8192k(platform) lpj=515072"

CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=rootfs console=ttyAMA0,115200n8 lpj=515072"

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set
@@ -359,6 +366,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_IEEE802154 is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -497,6 +505,7 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_EEPROM_AT24 is not set

# CONFIG_EEPROM_AT25 is not set

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_MAX6875 is not set

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -538,6 +547,7 @@ CONFIG_INPUT_KEYBOARD=y 
# CONFIG_KEYBOARD_XTKBD is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

# CONFIG_KEYBOARD_LM8323 is not set

# CONFIG_KEYBOARD_GPIO is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set
@@ -597,9 +607,11 @@ CONFIG_I2C_HELPER_AUTO=y 
#

# I2C system bus drivers (mostly embedded / system-on-chip)

#

# CONFIG_I2C_DESIGNWARE is not set

# CONFIG_I2C_GPIO is not set

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_SIMTEC is not set

CONFIG_I2C_STU300=y



#

# External I2C/SMBus adapter drivers
@@ -620,7 +632,6 @@ CONFIG_I2C_HELPER_AUTO=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set
@@ -635,6 +646,7 @@ CONFIG_SPI_MASTER=y 
#

# CONFIG_SPI_BITBANG is not set

# CONFIG_SPI_GPIO is not set

CONFIG_SPI_PL022=y



#

# SPI Protocol Masters
@@ -647,6 +659,7 @@ CONFIG_POWER_SUPPLY=y 
# CONFIG_PDA_POWER is not set

# CONFIG_BATTERY_DS2760 is not set

# CONFIG_BATTERY_BQ27x00 is not set

# CONFIG_BATTERY_MAX17040 is not set

# CONFIG_HWMON is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set
@@ -657,6 +670,7 @@ CONFIG_WATCHDOG=y 
# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_COH901327_WATCHDOG=y

CONFIG_SSB_POSSIBLE=y



#
@@ -678,22 +692,9 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_PCF50633 is not set



#

# Multimedia devices

#



#

# Multimedia core support

#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

# CONFIG_VIDEO_MEDIA is not set



#

# Multimedia drivers

#

# CONFIG_DAB is not set

CONFIG_AB3100_CORE=y

# CONFIG_EZX_PCAP is not set

# CONFIG_MEDIA_SUPPORT is not set



#

# Graphics support
@@ -760,6 +761,11 @@ CONFIG_SND_JACK=y 
# CONFIG_SND_VERBOSE_PROCFS is not set

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set

# CONFIG_SND_RAWMIDI_SEQ is not set

# CONFIG_SND_OPL3_LIB_SEQ is not set

# CONFIG_SND_OPL4_LIB_SEQ is not set

# CONFIG_SND_SBAWE_SEQ is not set

# CONFIG_SND_EMU10K1_SEQ is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_ARM is not set

# CONFIG_SND_SPI is not set
@@ -770,7 +776,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y 
# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

# CONFIG_MMC_DEBUG is not set

CONFIG_MMC_DEBUG=y

# CONFIG_MMC_UNSAFE_RESUME is not set



#
@@ -797,7 +803,7 @@ CONFIG_LEDS_CLASS=y 
#

# CONFIG_LEDS_PCA9532 is not set

# CONFIG_LEDS_GPIO is not set

# CONFIG_LEDS_LP5521 is not set

# CONFIG_LEDS_LP3944 is not set

# CONFIG_LEDS_PCA955X is not set

# CONFIG_LEDS_DAC124S085 is not set

# CONFIG_LEDS_BD2802 is not set
@@ -845,6 +851,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set

# CONFIG_RTC_DRV_RX8025 is not set



#

# SPI RTC drivers
@@ -887,7 +894,10 @@ CONFIG_REGULATOR=y 
# CONFIG_REGULATOR_DEBUG is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set

# CONFIG_REGULATOR_MAX1586 is not set

# CONFIG_REGULATOR_LP3971 is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set
@@ -900,16 +910,20 @@ CONFIG_REGULATOR=y 
# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_FILE_LOCKING=y

CONFIG_FSNOTIFY=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY is not set

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

CONFIG_FUSE_FS=y

# CONFIG_CUSE is not set



#

# Caches
@@ -1033,6 +1047,7 @@ CONFIG_TIMER_STATS=y 
# CONFIG_DEBUG_OBJECTS is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

# CONFIG_DEBUG_KMEMLEAK is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set
@@ -1063,18 +1078,16 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_PAGE_POISONING is not set

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers

#

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_PREEMPT_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_ENABLE_DEFAULT_TRACERS is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

CONFIG_BRANCH_PROFILE_NONE=y

# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set

# CONFIG_PROFILE_ALL_BRANCHES is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set
@@ -1109,6 +1122,7 @@ CONFIG_GENERIC_FIND_LAST_BIT=y 
# CONFIG_CRC32 is not set

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_GENERIC_ALLOCATOR=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

arch/arm/include/asm/pgtable.h

+39 −14
Original line number Diff line number Diff line
@@ -285,15 +285,6 @@ extern struct page *empty_zero_page; 
#define pte_young(pte)		(pte_val(pte) & L_PTE_YOUNG)

#define pte_special(pte)	(0)



/*

 * The following only works if pte_present() is not true.

 */

#define pte_file(pte)		(pte_val(pte) & L_PTE_FILE)

#define pte_to_pgoff(x)		(pte_val(x) >> 2)

#define pgoff_to_pte(x)		__pte(((x) << 2) | L_PTE_FILE)



#define PTE_FILE_MAX_BITS	30



#define PTE_BIT_FUNC(fn,op) \

static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; }
@@ -384,16 +375,50 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 


extern pgd_t swapper_pg_dir[PTRS_PER_PGD];



/* Encode and decode a swap entry.

/*

 * Encode and decode a swap entry.  Swap entries are stored in the Linux

 * page tables as follows:

 *

 * We support up to 32GB of swap on 4k machines

 *   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1

 *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 *   <--------------- offset --------------------> <--- type --> 0 0

 *

 * This gives us up to 127 swap files and 32GB per swap file.  Note that

 * the offset field is always non-zero.

 */

#define __swp_type(x)		(((x).val >> 2) & 0x7f)

#define __swp_offset(x)		((x).val >> 9)

#define __swp_entry(type,offset) ((swp_entry_t) { ((type) << 2) | ((offset) << 9) })

#define __SWP_TYPE_SHIFT	2

#define __SWP_TYPE_BITS		7

#define __SWP_TYPE_MASK		((1 << __SWP_TYPE_BITS) - 1)

#define __SWP_OFFSET_SHIFT	(__SWP_TYPE_BITS + __SWP_TYPE_SHIFT)



#define __swp_type(x)		(((x).val >> __SWP_TYPE_SHIFT) & __SWP_TYPE_MASK)

#define __swp_offset(x)		((x).val >> __SWP_OFFSET_SHIFT)

#define __swp_entry(type,offset) ((swp_entry_t) { ((type) << __SWP_TYPE_SHIFT) | ((offset) << __SWP_OFFSET_SHIFT) })



#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })

#define __swp_entry_to_pte(swp)	((pte_t) { (swp).val })



/*

 * It is an error for the kernel to have more swap files than we can

 * encode in the PTEs.  This ensures that we know when MAX_SWAPFILES

 * is increased beyond what we presently support.

 */

#define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS)



/*

 * Encode and decode a file entry.  File entries are stored in the Linux

 * page tables as follows:

 *

 *   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1

 *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 *   <------------------------ offset -------------------------> 1 0

 */

#define pte_file(pte)		(pte_val(pte) & L_PTE_FILE)

#define pte_to_pgoff(x)		(pte_val(x) >> 2)

#define pgoff_to_pte(x)		__pte(((x) << 2) | L_PTE_FILE)



#define PTE_FILE_MAX_BITS	30



/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */

/* FIXME: this is not correct */

#define kern_addr_valid(addr)	(1)

arch/arm/mach-u300/clock.c

+80 −41
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/init.h>

#include <linux/timer.h>

#include <linux/io.h>

#include <linux/seq_file.h>



#include <asm/clkdev.h>

#include <mach/hardware.h>
@@ -702,6 +703,7 @@ static struct clk amba_clk = { 
	.rate	    = 52000000, /* this varies! */

	.hw_ctrld   = true,

	.reset	    = false,

	.lock       = __SPIN_LOCK_UNLOCKED(amba_clk.lock),

};



/*
@@ -720,6 +722,7 @@ static struct clk cpu_clk = { 
	.set_rate   = clk_set_rate_cpuclk,

	.get_rate   = clk_get_rate_cpuclk,

	.round_rate = clk_round_rate_cpuclk,

	.lock       = __SPIN_LOCK_UNLOCKED(cpu_clk.lock),

};



static struct clk nandif_clk = {
@@ -732,6 +735,7 @@ static struct clk nandif_clk = { 
	.clk_val    = U300_SYSCON_SBCER_NANDIF_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(nandif_clk.lock),

};



static struct clk semi_clk = {
@@ -744,6 +748,7 @@ static struct clk semi_clk = { 
	.clk_val    = U300_SYSCON_SBCER_SEMI_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(semi_clk.lock),

};



#ifdef CONFIG_MACH_U300_BS335
@@ -758,6 +763,7 @@ static struct clk isp_clk = { 
	.clk_val    = U300_SYSCON_SBCER_ISP_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(isp_clk.lock),

};



static struct clk cds_clk = {
@@ -771,6 +777,7 @@ static struct clk cds_clk = { 
	.clk_val    = U300_SYSCON_SBCER_CDS_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(cds_clk.lock),

};

#endif
@@ -785,6 +792,7 @@ static struct clk dma_clk = { 
	.clk_val    = U300_SYSCON_SBCER_DMAC_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(dma_clk.lock),

};



static struct clk aaif_clk = {
@@ -798,6 +806,7 @@ static struct clk aaif_clk = { 
	.clk_val    = U300_SYSCON_SBCER_AAIF_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(aaif_clk.lock),

};



static struct clk apex_clk = {
@@ -811,6 +820,7 @@ static struct clk apex_clk = { 
	.clk_val    = U300_SYSCON_SBCER_APEX_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(apex_clk.lock),

};



static struct clk video_enc_clk = {
@@ -825,6 +835,7 @@ static struct clk video_enc_clk = { 
	.clk_val    = U300_SYSCON_SBCER_VIDEO_ENC_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(video_enc_clk.lock),

};



static struct clk xgam_clk = {
@@ -839,6 +850,7 @@ static struct clk xgam_clk = { 
	.get_rate   = clk_get_rate_xgamclk,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(xgam_clk.lock),

};



/* This clock is used to activate the video encoder */
@@ -854,6 +866,7 @@ static struct clk ahb_clk = { 
	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.get_rate   = clk_get_rate_ahb_clk,

	.lock       = __SPIN_LOCK_UNLOCKED(ahb_clk.lock),

};
@@ -871,6 +884,7 @@ static struct clk ahb_subsys_clk = { 
	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.get_rate   = clk_get_rate_ahb_clk,

	.lock       = __SPIN_LOCK_UNLOCKED(ahb_subsys_clk.lock),

};



static struct clk intcon_clk = {
@@ -882,6 +896,8 @@ static struct clk intcon_clk = { 
	.res_reg    = U300_SYSCON_VBASE + U300_SYSCON_RRR,

	.res_mask   = U300_SYSCON_RRR_INTCON_RESET_EN,

	/* INTCON can be reset but not clock-gated */

	.lock       = __SPIN_LOCK_UNLOCKED(intcon_clk.lock),



};



static struct clk mspro_clk = {
@@ -895,6 +911,7 @@ static struct clk mspro_clk = { 
	.clk_val    = U300_SYSCON_SBCER_MSPRO_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(mspro_clk.lock),

};



static struct clk emif_clk = {
@@ -909,6 +926,7 @@ static struct clk emif_clk = { 
	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.get_rate   = clk_get_rate_emif_clk,

	.lock       = __SPIN_LOCK_UNLOCKED(emif_clk.lock),

};
@@ -926,6 +944,7 @@ static struct clk fast_clk = { 
	.clk_val    = U300_SYSCON_SBCER_FAST_BRIDGE_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(fast_clk.lock),

};



static struct clk mmcsd_clk = {
@@ -942,6 +961,7 @@ static struct clk mmcsd_clk = { 
	.round_rate = clk_round_rate_mclk,

	.disable    = syscon_clk_disable,

	.enable     = syscon_clk_enable,

	.lock       = __SPIN_LOCK_UNLOCKED(mmcsd_clk.lock),

};



static struct clk i2s0_clk = {
@@ -956,6 +976,7 @@ static struct clk i2s0_clk = { 
	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.get_rate   = clk_get_rate_i2s_i2c_spi,

	.lock       = __SPIN_LOCK_UNLOCKED(i2s0_clk.lock),

};



static struct clk i2s1_clk = {
@@ -970,6 +991,7 @@ static struct clk i2s1_clk = { 
	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.get_rate   = clk_get_rate_i2s_i2c_spi,

	.lock       = __SPIN_LOCK_UNLOCKED(i2s1_clk.lock),

};



static struct clk i2c0_clk = {
@@ -984,6 +1006,7 @@ static struct clk i2c0_clk = { 
	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.get_rate   = clk_get_rate_i2s_i2c_spi,

	.lock       = __SPIN_LOCK_UNLOCKED(i2c0_clk.lock),

};



static struct clk i2c1_clk = {
@@ -998,6 +1021,7 @@ static struct clk i2c1_clk = { 
	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.get_rate   = clk_get_rate_i2s_i2c_spi,

	.lock       = __SPIN_LOCK_UNLOCKED(i2c1_clk.lock),

};



static struct clk spi_clk = {
@@ -1012,6 +1036,7 @@ static struct clk spi_clk = { 
	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.get_rate   = clk_get_rate_i2s_i2c_spi,

	.lock       = __SPIN_LOCK_UNLOCKED(spi_clk.lock),

};



#ifdef CONFIG_MACH_U300_BS335
@@ -1026,6 +1051,7 @@ static struct clk uart1_clk = { 
	.clk_val    = U300_SYSCON_SBCER_UART1_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(uart1_clk.lock),

};

#endif
@@ -1044,6 +1070,7 @@ static struct clk slow_clk = { 
	.clk_val    = U300_SYSCON_SBCER_SLOW_BRIDGE_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(slow_clk.lock),

};



/* TODO: implement SYSCON clock? */
@@ -1055,6 +1082,7 @@ static struct clk wdog_clk = { 
	.rate	    = 32768,

	.reset	    = false,

	/* This is always on, cannot be enabled/disabled or reset */

	.lock       = __SPIN_LOCK_UNLOCKED(wdog_clk.lock),

};



/* This one is hardwired to PLL13 */
@@ -1069,6 +1097,7 @@ static struct clk uart_clk = { 
	.clk_val    = U300_SYSCON_SBCER_UART_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(uart_clk.lock),

};



static struct clk keypad_clk = {
@@ -1082,6 +1111,7 @@ static struct clk keypad_clk = { 
	.clk_val    = U300_SYSCON_SBCER_KEYPAD_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(keypad_clk.lock),

};



static struct clk gpio_clk = {
@@ -1095,6 +1125,7 @@ static struct clk gpio_clk = { 
	.clk_val    = U300_SYSCON_SBCER_GPIO_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(gpio_clk.lock),

};



static struct clk rtc_clk = {
@@ -1106,6 +1137,7 @@ static struct clk rtc_clk = { 
	.res_reg    = U300_SYSCON_VBASE + U300_SYSCON_RSR,

	.res_mask   = U300_SYSCON_RSR_RTC_RESET_EN,

	/* This clock is always on, cannot be enabled/disabled */

	.lock       = __SPIN_LOCK_UNLOCKED(rtc_clk.lock),

};



static struct clk bustr_clk = {
@@ -1119,6 +1151,7 @@ static struct clk bustr_clk = { 
	.clk_val    = U300_SYSCON_SBCER_BTR_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(bustr_clk.lock),

};



static struct clk evhist_clk = {
@@ -1132,6 +1165,7 @@ static struct clk evhist_clk = { 
	.clk_val    = U300_SYSCON_SBCER_EH_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(evhist_clk.lock),

};



static struct clk timer_clk = {
@@ -1145,6 +1179,7 @@ static struct clk timer_clk = { 
	.clk_val    = U300_SYSCON_SBCER_ACC_TMR_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(timer_clk.lock),

};



static struct clk app_timer_clk = {
@@ -1158,6 +1193,7 @@ static struct clk app_timer_clk = { 
	.clk_val    = U300_SYSCON_SBCER_APP_TMR_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(app_timer_clk.lock),

};



#ifdef CONFIG_MACH_U300_BS335
@@ -1172,6 +1208,7 @@ static struct clk ppm_clk = { 
	.clk_val    = U300_SYSCON_SBCER_PPM_CLK_EN,

	.enable     = syscon_clk_enable,

	.disable    = syscon_clk_disable,

	.lock       = __SPIN_LOCK_UNLOCKED(ppm_clk.lock),

};

#endif
@@ -1189,20 +1226,20 @@ static struct clk_lookup lookups[] = { 
	/* Connected directly to the AMBA bus */

	DEF_LOOKUP("amba",      &amba_clk),

	DEF_LOOKUP("cpu",       &cpu_clk),

	DEF_LOOKUP("nandif", &nandif_clk),

	DEF_LOOKUP("fsmc",      &nandif_clk),

	DEF_LOOKUP("semi",      &semi_clk),

#ifdef CONFIG_MACH_U300_BS335

	DEF_LOOKUP("isp",       &isp_clk),

	DEF_LOOKUP("cds",       &cds_clk),

#endif

	DEF_LOOKUP("dma",       &dma_clk),

	DEF_LOOKUP("aaif", &aaif_clk),

	DEF_LOOKUP("msl",       &aaif_clk),

	DEF_LOOKUP("apex",      &apex_clk),

	DEF_LOOKUP("video_enc", &video_enc_clk),

	DEF_LOOKUP("xgam",      &xgam_clk),

	DEF_LOOKUP("ahb",       &ahb_clk),

	/* AHB bridge clocks */

	DEF_LOOKUP("ahb", &ahb_subsys_clk),

	DEF_LOOKUP("ahb_subsys", &ahb_subsys_clk),

	DEF_LOOKUP("intcon",    &intcon_clk),

	DEF_LOOKUP("mspro",     &mspro_clk),

	DEF_LOOKUP("pl172",     &emif_clk),
@@ -1215,20 +1252,20 @@ static struct clk_lookup lookups[] = { 
	 */

	DEF_LOOKUP("i2s.0",     &i2s0_clk),

	DEF_LOOKUP("i2s.1",     &i2s1_clk),

	DEF_LOOKUP("stddci2c.0", &i2c0_clk),

	DEF_LOOKUP("stddci2c.1", &i2c1_clk),

	DEF_LOOKUP("stu300.0",  &i2c0_clk),

	DEF_LOOKUP("stu300.1",  &i2c1_clk),

	DEF_LOOKUP("pl022",     &spi_clk),

#ifdef CONFIG_MACH_U300_BS335

	DEF_LOOKUP("uart1",     &uart1_clk),

#endif

	/* SLOW bridge clocks */

	DEF_LOOKUP("slow",      &slow_clk),

	DEF_LOOKUP("wdog", &wdog_clk),

	DEF_LOOKUP("coh901327_wdog",      &wdog_clk),

	DEF_LOOKUP("uart0",     &uart_clk),

	DEF_LOOKUP("apptimer",  &app_timer_clk),

	DEF_LOOKUP("keypad", &keypad_clk),

	DEF_LOOKUP("coh901461-keypad",    &keypad_clk),

	DEF_LOOKUP("u300-gpio", &gpio_clk),

	DEF_LOOKUP("rtc0", &rtc_clk),

	DEF_LOOKUP("rtc-coh901331",      &rtc_clk),

	DEF_LOOKUP("bustr",     &bustr_clk),

	DEF_LOOKUP("evhist",    &evhist_clk),

	DEF_LOOKUP("timer",     &timer_clk),
@@ -1427,16 +1464,20 @@ static const struct file_operations u300_clocks_operations = { 
	.release	= single_release,

};



static void init_clk_read_procfs(void)

static int __init init_clk_read_debugfs(void)

{

	/* Expose a simple debugfs interface to view all clocks */

	(void) debugfs_create_file("u300_clocks", S_IFREG | S_IRUGO,

				   NULL, NULL, &u300_clocks_operations);

}

#else

static inline void init_clk_read_procfs(void)

{

				   NULL, NULL,

				   &u300_clocks_operations);

	return 0;

}

/*

 * This needs to come in after the core_initcall() for the

 * overall clocks, because debugfs is not available until

 * the subsystems come up.

 */

module_init(init_clk_read_debugfs);

#endif



static int __init u300_clock_init(void)
@@ -1462,8 +1503,6 @@ static int __init u300_clock_init(void) 


	clk_register();



	init_clk_read_procfs();



	/*

	 * Some of these may be on when we boot the system so make sure they

	 * are turned OFF.

arch/arm/mm/proc-syms.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ EXPORT_SYMBOL(__cpuc_flush_kern_all); 
EXPORT_SYMBOL(__cpuc_flush_user_all);

EXPORT_SYMBOL(__cpuc_flush_user_range);

EXPORT_SYMBOL(__cpuc_coherent_kern_range);

EXPORT_SYMBOL(__cpuc_flush_dcache_page);

EXPORT_SYMBOL(dmac_inv_range);  /* because of flush_ioremap_region() */

#else

EXPORT_SYMBOL(cpu_cache);

CRA Git | Maintained and supported by SUSTech CRA and CCSE