From 0f30d04057a4b22930e74412cd17aea28549803c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Wed, 1 Feb 2012 19:30:57 +0800 Subject: [PATCH] arm: rk: add plat-rk --- arch/arm/Kconfig | 22 +++---- arch/arm/mach-rk29/Kconfig | 117 ------------------------------------- arch/arm/plat-rk/Kconfig | 109 ++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 127 deletions(-) create mode 100644 arch/arm/plat-rk/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8ea3a670f707..ae1fe15b89fa 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -859,23 +859,16 @@ config ARCH_OMAP Support for TI's OMAP platform (OMAP1/2/3/4). config ARCH_RK29 - bool "Rockchip Soc Rk29" + bool "Rockchip RK29xx" + select PLAT_RK select CPU_V7 - select HAVE_CLK - select CLKDEV_LOOKUP - select COMMON_CLKDEV - select HAVE_SCHED_CLOCK - select ARCH_HAS_CPUFREQ - select GENERIC_TIME - select GENERIC_CLOCKEVENTS - select ARCH_REQUIRE_GPIOLIB select ARM_GIC select PL330 select HIGHMEM select ZONE_DMA select ARM_L1_CACHE_SHIFT_6 help - Support for Rockchip RK29 soc. + Support for Rockchip's RK29xx SoCs. config PLAT_SPEAR bool "ST SPEAr" @@ -977,6 +970,7 @@ source "arch/arm/mach-mmp/Kconfig" source "arch/arm/mach-realview/Kconfig" +source "arch/arm/plat-rk/Kconfig" source "arch/arm/mach-rk29/Kconfig" source "arch/arm/mach-sa1100/Kconfig" @@ -1045,6 +1039,14 @@ config PLAT_ORION config PLAT_PXA bool +config PLAT_RK + bool + select CLKDEV_LOOKUP + select HAVE_SCHED_CLOCK + select ARCH_HAS_CPUFREQ + select GENERIC_CLOCKEVENTS + select ARCH_REQUIRE_GPIOLIB + config PLAT_VERSATILE bool diff --git a/arch/arm/mach-rk29/Kconfig b/arch/arm/mach-rk29/Kconfig index 08e6d21a0751..6c3e86d3b459 100644 --- a/arch/arm/mach-rk29/Kconfig +++ b/arch/arm/mach-rk29/Kconfig @@ -73,136 +73,19 @@ config RK29_NEWTON_CLOCK help support for newton 1.2G cpu clock. -choice DDR_TYPE - prompt "DDR Memory Type" - default DDR_TYPE_DDR3_DEFAULT - -config DDR_TYPE_DDRII - bool "DDRII" - help - Support for DDRII memory - -config DDR_TYPE_LPDDR - bool "mobile DDR" - help - Support for mobile DDR, MCP device - -config DDR_TYPE_DDR3_800D - bool "DDR3-800 5-5-5" - -config DDR_TYPE_DDR3_800E - bool "DDR3-800 6-6-6" - -config DDR_TYPE_DDR3_1066E - bool "DDR3-1066 6-6-6" - -config DDR_TYPE_DDR3_1066F - bool "DDR3-1066 7-7-7" - -config DDR_TYPE_DDR3_1066G - bool "DDR3-1066 8-8-8" - -config DDR_TYPE_DDR3_1333F - bool "DDR3-1333 7-7-7" - -config DDR_TYPE_DDR3_1333G - bool "DDR3-1333 8-8-8" - -config DDR_TYPE_DDR3_1333H - bool "DDR3-1333 9-9-9" - -config DDR_TYPE_DDR3_1333J - bool "DDR3-1333 10-10-10" - -config DDR_TYPE_DDR3_1600G - bool "DDR3-1600 8-8-8" - -config DDR_TYPE_DDR3_1600H - bool "DDR3-1600 9-9-9" - -config DDR_TYPE_DDR3_1600J - bool "DDR3-1600 10-10-10" - -config DDR_TYPE_DDR3_1600K - bool "DDR3-1600 11-11-11" - -config DDR_TYPE_DDR3_1866J - bool "DDR3-1866 10-10-10" - -config DDR_TYPE_DDR3_1866K - bool "DDR3-1866 11-11-11" - -config DDR_TYPE_DDR3_1866L - bool "DDR3-1866 12-12-12" - -config DDR_TYPE_DDR3_1866M - bool "DDR3-1866 13-13-13" - -config DDR_TYPE_DDR3_2133K - bool "DDR3-2133 11-11-11" - -config DDR_TYPE_DDR3_2133L - bool "DDR3-2133 12-12-12" - -config DDR_TYPE_DDR3_2133M - bool "DDR3-2133 13-13-13" - -config DDR_TYPE_DDR3_2133N - bool "DDR3-2133 14-14-14" - -config DDR_TYPE_DDR3_DEFAULT - bool "DDR3 (Type default)" - -endchoice - config RK29_MEM_SIZE_M int "DDR Memory size (in MB)" default 512 -config DDR_SDRAM_FREQ - int "DDR SDRAM frequence (in MHz)" - default 400 - -config DDR_FREQ - bool "Enable DDR frequency scaling" - config DDR_RECONFIG bool "Enable dynamic DDR reconfiguration (EXPERIMENTAL)" -config WIFI_CONTROL_FUNC - bool "Enable WiFi control function abstraction" - help - Enables Power/Reset/Carddetect function abstraction - -menu "RK29 VPU (Video Processing Unit) support" - -config RK29_VPU - bool "VPU service driver in kernel" - depends on ARCH_RK29 - default y - -config RK29_VPU_DEBUG - bool "RK29 VPU debugging" - depends on RK29_VPU != n - help - This is an option for the developers; most people should - say N here. This enables RK29 VPU driver debugging. - -endmenu - config RK29_JTAG bool "Enable JTAG support (debug only)" help This is an option for SDK board. Always enable JTAG clock, but consumes more power. -config RK29_LAST_LOG - bool "Save the last kernel log on /proc/last_log" - depends on DEBUG_KERNEL && PRINTK - default y - help - It is only intended for debugging. - menu "support for RK29 power manage " config RK29_WORKING_POWER_MANAGEMENT bool "Support power saving in working" diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig new file mode 100644 index 000000000000..3df471be3408 --- /dev/null +++ b/arch/arm/plat-rk/Kconfig @@ -0,0 +1,109 @@ +if PLAT_RK + +choice DDR_TYPE + prompt "DDR Memory Type" + default DDR_TYPE_DDR3_DEFAULT + +config DDR_TYPE_DDRII + bool "DDRII" + help + Support for DDRII memory + +config DDR_TYPE_LPDDR + bool "mobile DDR" + help + Support for mobile DDR, MCP device + +config DDR_TYPE_DDR3_800D + bool "DDR3-800 5-5-5" + +config DDR_TYPE_DDR3_800E + bool "DDR3-800 6-6-6" + +config DDR_TYPE_DDR3_1066E + bool "DDR3-1066 6-6-6" + +config DDR_TYPE_DDR3_1066F + bool "DDR3-1066 7-7-7" + +config DDR_TYPE_DDR3_1066G + bool "DDR3-1066 8-8-8" + +config DDR_TYPE_DDR3_1333F + bool "DDR3-1333 7-7-7" + +config DDR_TYPE_DDR3_1333G + bool "DDR3-1333 8-8-8" + +config DDR_TYPE_DDR3_1333H + bool "DDR3-1333 9-9-9" + +config DDR_TYPE_DDR3_1333J + bool "DDR3-1333 10-10-10" + +config DDR_TYPE_DDR3_1600G + bool "DDR3-1600 8-8-8" + +config DDR_TYPE_DDR3_1600H + bool "DDR3-1600 9-9-9" + +config DDR_TYPE_DDR3_1600J + bool "DDR3-1600 10-10-10" + +config DDR_TYPE_DDR3_1600K + bool "DDR3-1600 11-11-11" + +config DDR_TYPE_DDR3_1866J + bool "DDR3-1866 10-10-10" + +config DDR_TYPE_DDR3_1866K + bool "DDR3-1866 11-11-11" + +config DDR_TYPE_DDR3_1866L + bool "DDR3-1866 12-12-12" + +config DDR_TYPE_DDR3_1866M + bool "DDR3-1866 13-13-13" + +config DDR_TYPE_DDR3_2133K + bool "DDR3-2133 11-11-11" + +config DDR_TYPE_DDR3_2133L + bool "DDR3-2133 12-12-12" + +config DDR_TYPE_DDR3_2133M + bool "DDR3-2133 13-13-13" + +config DDR_TYPE_DDR3_2133N + bool "DDR3-2133 14-14-14" + +config DDR_TYPE_DDR3_DEFAULT + bool "DDR3 (Type default)" + +endchoice + +config DDR_SDRAM_FREQ + int "DDR SDRAM frequence (in MHz)" + default 400 + +config DDR_FREQ + bool "Enable DDR frequency scaling" + +config WIFI_CONTROL_FUNC + bool "Enable WiFi control function abstraction" + help + Enables Power/Reset/Carddetect function abstraction + +config RK29_VPU + bool "VPU (Video Processing Unit) service driver in kernel" + depends on ARCH_RK29 || ARCH_RK30 + default y + +config RK29_LAST_LOG + bool "Save the last kernel log on /proc/last_log" + depends on DEBUG_KERNEL && PRINTK + default y + help + It is only intended for debugging. + +endif -- 2.34.1