From 8907834464b295b18ae6287fb9ccf5754c846d49 Mon Sep 17 00:00:00 2001 From: xxx Date: Tue, 30 Jul 2013 14:48:16 +0800 Subject: [PATCH] add rk3028_ft_defconfig --- arch/arm/configs/rk3028_ft_defconfig | 86 +++++++++++++++++++++++ arch/arm/mach-rk30/Kconfig | 3 + arch/arm/mach-rk30/Makefile | 1 + arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c | 47 ++++++++++--- 4 files changed, 128 insertions(+), 9 deletions(-) create mode 100755 arch/arm/configs/rk3028_ft_defconfig mode change 100644 => 100755 arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c diff --git a/arch/arm/configs/rk3028_ft_defconfig b/arch/arm/configs/rk3028_ft_defconfig new file mode 100755 index 000000000000..afcc129ebda2 --- /dev/null +++ b/arch/arm/configs/rk3028_ft_defconfig @@ -0,0 +1,86 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_KERNEL_LZO=y +CONFIG_LOG_BUF_SHIFT=12 +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_UID16 is not set +# CONFIG_HOTPLUG is not set +# CONFIG_ELF_CORE is not set +# CONFIG_BASE_FULL is not set +# CONFIG_FUTEX is not set +# CONFIG_EPOLL is not set +# CONFIG_SIGNALFD is not set +# CONFIG_TIMERFD is not set +# CONFIG_EVENTFD is not set +# CONFIG_SHMEM is not set +# CONFIG_AIO is not set +CONFIG_EMBEDDED=y +# CONFIG_VM_EVENT_COUNTERS is not set +# CONFIG_SLUB_DEBUG is not set +# CONFIG_BLOCK is not set +CONFIG_ARCH_RK30=y +# CONFIG_DDR_FREQ is not set +# CONFIG_DDR_TEST is not set +CONFIG_RK_PM_TESTS=y +# CONFIG_PM_TEST_CLK_RATE is not set +# CONFIG_PM_TEST_CLK_VOLT is not set +# CONFIG_PM_TEST_MAXFREQ is not set +CONFIG_PM_TEST_FT=y +# CONFIG_RK29_LAST_LOG is not set +# CONFIG_RK_EARLY_PRINTK is not set +CONFIG_RK_DEBUG_UART=0 +# CONFIG_RK_CONSOLE_THREAD is not set +CONFIG_SOC_RK3028=y +CONFIG_MACH_RK3028_FT=y +CONFIG_FIQ_DEBUGGER=y +CONFIG_FIQ_DEBUGGER_NO_SLEEP=y +CONFIG_FIQ_DEBUGGER_CONSOLE=y +CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_SMP=y +# CONFIG_SMP_ON_UP is not set +CONFIG_NR_CPUS=2 +CONFIG_PREEMPT=y +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_HIGHMEM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyFIQ0" +CONFIG_CMDLINE_FORCE=y +CONFIG_CPU_IDLE=y +CONFIG_VFP=y +CONFIG_NEON=y +# CONFIG_BINFMT_ELF is not set +# CONFIG_SUSPEND is not set +# CONFIG_FW_LOADER is not set +# CONFIG_INPUT is not set +# CONFIG_SERIO is not set +# CONFIG_VT is not set +# CONFIG_UNIX98_PTYS is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_DEVMEM is not set +# CONFIG_DEVKMEM is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_ADC is not set +CONFIG_EXPANDED_GPIO_NUM=0 +CONFIG_EXPANDED_GPIO_IRQ_NUM=0 +CONFIG_SPI_FPGA_GPIO_NUM=0 +CONFIG_SPI_FPGA_GPIO_IRQ_NUM=0 +# CONFIG_HWMON is not set +# CONFIG_MFD_SUPPORT is not set +# CONFIG_USB_SUPPORT is not set +# CONFIG_CMMB is not set +# CONFIG_FILE_LOCKING is not set +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +# CONFIG_PROC_FS is not set +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_PRINTK_TIME=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +# CONFIG_FTRACE is not set +CONFIG_OC_ETM=y +# CONFIG_CRC32 is not set diff --git a/arch/arm/mach-rk30/Kconfig b/arch/arm/mach-rk30/Kconfig index c22be2059b3d..f40aa4085b95 100755 --- a/arch/arm/mach-rk30/Kconfig +++ b/arch/arm/mach-rk30/Kconfig @@ -102,6 +102,9 @@ choice config MACH_RK3028_TB bool "RK3028 Top Board" +config MACH_RK3028_FT + bool "RK3028 FT Board" + config MACH_RK3028_86V bool "RK3028 86V Board" endchoice diff --git a/arch/arm/mach-rk30/Makefile b/arch/arm/mach-rk30/Makefile index c337a50312cd..29e4b58980de 100755 --- a/arch/arm/mach-rk30/Makefile +++ b/arch/arm/mach-rk30/Makefile @@ -44,6 +44,7 @@ board-$(CONFIG_MACH_RK30_PHONE_A22) += board-rk30-phone-a22.o board-rk30-phone-a obj-$(CONFIG_SOC_RK3028) += board.o board-$(CONFIG_MACH_RK3028_TB) += board-rk3028-tb.o +board-$(CONFIG_MACH_RK3028_FT) += ../mach-rk3188/board-rk3188-ft.o board-$(CONFIG_MACH_RK3028_86V)+= board-rk3028-86v.o obj-$(CONFIG_SOC_RK3066B) += board.o diff --git a/arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c b/arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c old mode 100644 new mode 100755 index 070684ad2076..7fa1a5b9b79d --- a/arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c +++ b/arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c @@ -64,8 +64,8 @@ REVISION 0.01 #define ft_printk_info(fmt, arg...) \ printk(KERN_WARNING fmt, ##arg) -#define ENABLE_FT_TEST_GPIO // for ft seting 1.6G volt +#define ENABLE_FT_TEST_GPIO // for ft seting 1.6G volt #if defined(CONFIG_ARCH_RK3188) @@ -77,8 +77,10 @@ static unsigned long arm_setup2_rate=1608*1000*1000;//1608*1000*1000; #define STEP2_L1_CNT (5*10) #define STEP2_L2_CPY_CNT (5*2+4) //(5*6) -#else -//for RK3168 && RK3066B +#define FT_CLIENT_READY_PIN RK30_PIN3_PB3 +#define FT_CLIENT_IDLE_PIN RK30_PIN0_PA3 + +#elif defined(CONFIG_SOC_RK3168) static unsigned long arm_setup2_rate=1608*1000*1000;//1608*1000*1000; @@ -88,7 +90,39 @@ static unsigned long arm_setup2_rate=1608*1000*1000;//1608*1000*1000; #define STEP2_L1_CNT (5*10) #define STEP2_L2_CPY_CNT (5*4) //(5*6) +#define FT_CLIENT_READY_PIN RK30_PIN3_PB3 +#define FT_CLIENT_IDLE_PIN RK30_PIN0_PA3 + + +#elif defined(CONFIG_SOC_RK3028) + +static unsigned long arm_setup2_rate=1200*1000*1000;//1608*1000*1000; + +#define STEP1_L1_CNT (5*10) +#define STEP1_L2_CPY_CNT (5*3) + +#define STEP2_L1_CNT (5*10) +#define STEP2_L2_CPY_CNT (5*4) //(5*6) + +#define FT_CLIENT_READY_PIN RK30_PIN1_PA2 +#define FT_CLIENT_IDLE_PIN RK30_PIN3_PD4 + +#else +static unsigned long arm_setup2_rate=1608*1000*1000;//1608*1000*1000; + +#define STEP1_L1_CNT (5*10) +#define STEP1_L2_CPY_CNT (5*1+2) + +#define STEP2_L1_CNT (5*10) +#define STEP2_L2_CPY_CNT (5*2+4) //(5*6) + +#define FT_CLIENT_READY_PIN RK30_PIN3_PB3 +#define FT_CLIENT_IDLE_PIN RK30_PIN0_PA3 + #endif + + + static int setup2_flag=0; //0-15 :test setup1 @@ -104,11 +138,6 @@ static DEFINE_PER_CPU(int, cpu_tst_flags)=(CPU_TST_L1|CPU_TST_L2|CPU_TST_L1_STP2 static struct clk *arm_clk; - -#define FT_CLIENT_READY_PIN RK30_PIN3_PB3 -#define FT_CLIENT_IDLE_PIN RK30_PIN0_PA3 - - static DEFINE_PER_CPU(wait_queue_head_t, wait_rate); /************************************l1 tst***************************************/ @@ -608,7 +637,7 @@ static int rk_ft_tests_over(void) - ft_printk("#END1E*\n"); + ft_printk("#END20*\n"); while(1); -- 2.34.1