diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:32 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:32 +0200 |
commit | 8f2c6a3d2b513e64f680e7e9a70d1e068b71110a (patch) | |
tree | 2cd7facc579bfe2c268567a35e8322f178b692dc /arch | |
parent | 4856aee6a85e50ce73a9d8a2b827766454faf033 (diff) | |
parent | a17aee8d86956f0e6071489f37d45a8f264dabdb (diff) | |
download | barebox-8f2c6a3d2b513e64f680e7e9a70d1e068b71110a.tar.gz barebox-8f2c6a3d2b513e64f680e7e9a70d1e068b71110a.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 18 | ||||
-rw-r--r-- | arch/arm/include/asm/clkdev.h | 17 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/clkdev.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-bcm2835/include/mach/clkdev.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/clkdev.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-highbank/include/mach/clkdev.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/clkdev.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-nomadik/include/mach/clkdev.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/clkdev.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/include/mach/clkdev.h | 7 |
10 files changed, 17 insertions, 74 deletions
diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index 1bc20cf21c..a37b0898eb 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c @@ -90,9 +90,25 @@ static struct i2c_gpio_platform_data i2c_gpio_pdata = { .udelay = 5, /* ~100 kHz */ }; +void v5_mmu_cache_flush(void); +long cfa10036_get_ram_size(void) +{ + volatile u32 *base = (void *)IMX_MEMORY_BASE; + volatile u32 *ofs = base + SZ_128M / sizeof(u32); + + *base = *ofs = 0xdeadbeef; + *ofs = 0xbaadcafe; + + v5_mmu_cache_flush(); + if (*base == 0xbaadcafe) + return SZ_128M; + else + return SZ_256M; +} + static int cfa10036_mem_init(void) { - arm_add_mem_device("ram0", IMX_MEMORY_BASE, 128 * 1024 * 1024); + arm_add_mem_device("ram0", IMX_MEMORY_BASE, cfa10036_get_ram_size()); return 0; } diff --git a/arch/arm/include/asm/clkdev.h b/arch/arm/include/asm/clkdev.h deleted file mode 100644 index ad33945880..0000000000 --- a/arch/arm/include/asm/clkdev.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * arch/arm/include/asm/clkdev.h - * - * Copyright (C) 2008 Russell King. - * - * 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. - * - * Helper for the clk API to assist looking up a struct clk. - */ -#ifndef __ASM_CLKDEV_H -#define __ASM_CLKDEV_H - -#include <mach/clkdev.h> - -#endif diff --git a/arch/arm/mach-at91/include/mach/clkdev.h b/arch/arm/mach-at91/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-at91/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-bcm2835/include/mach/clkdev.h b/arch/arm/mach-bcm2835/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-bcm2835/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-clps711x/include/mach/clkdev.h b/arch/arm/mach-clps711x/include/mach/clkdev.h deleted file mode 100644 index 9278209017..0000000000 --- a/arch/arm/mach-clps711x/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __MACH_CLKDEV_H -#define __MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-highbank/include/mach/clkdev.h b/arch/arm/mach-highbank/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-highbank/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-imx/include/mach/clkdev.h b/arch/arm/mach-imx/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-imx/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-nomadik/include/mach/clkdev.h b/arch/arm/mach-nomadik/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-nomadik/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-versatile/include/mach/clkdev.h b/arch/arm/mach-versatile/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-versatile/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-vexpress/include/mach/clkdev.h b/arch/arm/mach-vexpress/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-vexpress/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif |