From 76527fd2e753a3baf79a3f75a1fb4206ad7c432d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=94=A1=E6=9E=AB?= Date: Wed, 20 Jul 2011 17:57:11 +0800 Subject: [PATCH] newton:update config and board file --- arch/arm/configs/rk29_newton_defconfig | 25 ++++++++++++------------- arch/arm/mach-rk29/board-rk29-newton.c | 8 +++++++- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/arch/arm/configs/rk29_newton_defconfig b/arch/arm/configs/rk29_newton_defconfig index 5c41a8eda87d..253c204668d2 100755 --- a/arch/arm/configs/rk29_newton_defconfig +++ b/arch/arm/configs/rk29_newton_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.27 -# Fri Jul 15 22:21:45 2011 +# Wed Jul 20 17:52:50 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -35,6 +35,12 @@ CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZO=y +# CONFIG_KERNEL_GZIP is not set +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +CONFIG_KERNEL_LZO=y # CONFIG_SWAP is not set # CONFIG_SYSVIPC is not set # CONFIG_POSIX_MQUEUE is not set @@ -495,8 +501,8 @@ CONFIG_IRDA=y # # IrDA protocols # -CONFIG_IRLAN=y -CONFIG_IRNET=y +# CONFIG_IRLAN is not set +# CONFIG_IRNET is not set # CONFIG_IRCOMM is not set # CONFIG_IRDA_ULTRA is not set @@ -716,7 +722,6 @@ CONFIG_RK29_NEWTON=y # CONFIG_EEPROM_MAX6875 is not set # CONFIG_EEPROM_93CX6 is not set # CONFIG_RK29_SUPPORT_MODEM is not set -# CONFIG_MODEM_ROCKCHIP_DEMO is not set # CONFIG_RK29_GPS is not set # @@ -999,8 +1004,6 @@ CONFIG_RK29_I2C1_CONTROLLER=y CONFIG_I2C2_RK29=y CONFIG_RK29_I2C2_CONTROLLER=y # CONFIG_RK29_I2C2_GPIO is not set -# CONFIG_RK29_I2C3_CONTROLLER is not set -# CONFIG_RK29_I2C3_GPIO is not set CONFIG_I2C_DEV_RK29=y # @@ -1181,8 +1184,6 @@ CONFIG_SOC_CAMERA_OV2655=y # CONFIG_SOC_CAMERA_OV2640 is not set # CONFIG_SOC_CAMERA_OV3640 is not set # CONFIG_SOC_CAMERA_OV5642 is not set -# CONFIG_OV5642_AUTOFOCUS is not set -# CONFIG_OV5642_FIXEDFOCUS is not set # CONFIG_SOC_CAMERA_OV5640 is not set # CONFIG_SOC_CAMERA_S5K6AA is not set # CONFIG_SOC_CAMERA_GT2005 is not set @@ -1347,8 +1348,6 @@ CONFIG_LCD_AT070TN93=y # HDMI # # CONFIG_HDMI is not set -# CONFIG_ANX7150 is not set -# CONFIG_ANX9030 is not set # # Console display driver support @@ -1654,14 +1653,14 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y -# CONFIG_MMC_PARANOID_SD_INIT is not set +CONFIG_MMC_PARANOID_SD_INIT=y # # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_MMC_BLOCK_DEFERRED_RESUME=y +# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set @@ -1673,8 +1672,8 @@ CONFIG_SDMMC_RK29=y # # Now, there are two SDMMC controllers selected, SDMMC0 and SDMMC1. # +# CONFIG_SDMMC_RK29_OLD is not set CONFIG_SDMMC0_RK29=y -# CONFIG_EMMC_RK29 is not set CONFIG_SDMMC1_RK29=y # CONFIG_MMC_SDHCI is not set # CONFIG_MMC_AT91 is not set diff --git a/arch/arm/mach-rk29/board-rk29-newton.c b/arch/arm/mach-rk29/board-rk29-newton.c index 302b8442e9d5..a35b29486fed 100755 --- a/arch/arm/mach-rk29/board-rk29-newton.c +++ b/arch/arm/mach-rk29/board-rk29-newton.c @@ -1368,7 +1368,13 @@ static int rk29_sdmmc0_cfg_gpio(void) rk29_mux_api_set(GPIO1D3_SDMMC0DATA1_NAME, GPIO1H_SDMMC0_DATA1); rk29_mux_api_set(GPIO1D4_SDMMC0DATA2_NAME, GPIO1H_SDMMC0_DATA2); rk29_mux_api_set(GPIO1D5_SDMMC0DATA3_NAME, GPIO1H_SDMMC0_DATA3); + +#ifdef CONFIG_SDMMC_RK29_OLD rk29_mux_api_set(GPIO2A2_SDMMC0DETECTN_NAME, GPIO2L_GPIO2A2); +#else + rk29_mux_api_set(GPIO2A2_SDMMC0DETECTN_NAME, GPIO2L_SDMMC0_DETECT_N);//Modifyed by xbw. +#endif + rk29_mux_api_set(GPIO5D5_SDMMC0PWREN_NAME, GPIO5H_GPIO5D5); ///GPIO5H_SDMMC0_PWR_EN); ///GPIO5H_GPIO5D5); gpio_request(RK29_PIN5_PD5,"sdmmc"); #if 0 @@ -1626,7 +1632,7 @@ static struct platform_device rk29sdk_rfkill = { #ifdef CONFIG_VIVANTE #define GPU_HIGH_CLOCK 552 -#define GPU_LOW_CLOCK 288 /* same as general pll clock rate below */ +#define GPU_LOW_CLOCK (periph_pll_default / 1000000) /* same as general pll clock rate below */ static struct resource resources_gpu[] = { [0] = { .name = "gpu_irq", -- 2.34.1