From: hjc Date: Tue, 20 Aug 2013 09:21:31 +0000 (+0800) Subject: rk3026_86v: X-Git-Tag: firefly_0821_release~6715 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ad4fd57acb018d66e6855925cfe7d1a6f1fe3395;p=firefly-linux-kernel-4.4.55.git rk3026_86v: 1.fix sdmmc card pwr_en config error; 2.fix lcd splash; --- diff --git a/arch/arm/mach-rk30/board-rk3028-86v-sdmmc-conifg.c b/arch/arm/mach-rk30/board-rk3028-86v-sdmmc-conifg.c index 473d0ab8cb3d..8c0dbbd21307 100755 --- a/arch/arm/mach-rk30/board-rk3028-86v-sdmmc-conifg.c +++ b/arch/arm/mach-rk30/board-rk3028-86v-sdmmc-conifg.c @@ -36,7 +36,7 @@ /* * define sdcard PowerEn-pin */ -#define RK29SDK_SD_CARD_PWR_EN RK30_PIN3_PA1 +#define RK29SDK_SD_CARD_PWR_EN INVALID_GPIO #define RK29SDK_SD_CARD_PWR_EN_LEVEL GPIO_LOW int rk31sdk_get_sdmmc0_pin_io_voltage(void) { @@ -57,7 +57,7 @@ int rk31sdk_get_sdmmc0_pin_io_voltage(void) /* * define the card-detect-pin. */ -#define RK29SDK_SD_CARD_DETECT_N RK30_PIN3_PB0 //According to your own project to set the value of card-detect-pin. +#define RK29SDK_SD_CARD_DETECT_N RK30_PIN1_PC1 //According to your own project to set the value of card-detect-pin. #define RK29SDK_SD_CARD_INSERT_LEVEL GPIO_LOW // set the voltage of insert-card. Please pay attention to the default setting. /* diff --git a/arch/arm/mach-rk3026/board-rk3026-86v-sdmmc-config.c b/arch/arm/mach-rk3026/board-rk3026-86v-sdmmc-config.c index ae50c1e6f8b8..19cdf2d35fb2 100755 --- a/arch/arm/mach-rk3026/board-rk3026-86v-sdmmc-config.c +++ b/arch/arm/mach-rk3026/board-rk3026-86v-sdmmc-config.c @@ -36,7 +36,7 @@ /* * define sdcard PowerEn-pin */ -#define RK29SDK_SD_CARD_PWR_EN RK30_PIN3_PA1 +#define RK29SDK_SD_CARD_PWR_EN INVALID_GPIO #define RK29SDK_SD_CARD_PWR_EN_LEVEL GPIO_LOW int rk31sdk_get_sdmmc0_pin_io_voltage(void) { diff --git a/drivers/video/rockchip/screen/lcd_YQ70CPT9160_v86.c b/drivers/video/rockchip/screen/lcd_YQ70CPT9160_v86.c index 530133e821e2..083ba593bf8e 100644 --- a/drivers/video/rockchip/screen/lcd_YQ70CPT9160_v86.c +++ b/drivers/video/rockchip/screen/lcd_YQ70CPT9160_v86.c @@ -7,7 +7,7 @@ #define SCREEN_TYPE SCREEN_RGB #define LVDS_FORMAT LVDS_8BIT_1 #define OUT_FACE OUT_P666 -#define DCLK 33000000 +#define DCLK 50000000 #define LCDC_ACLK 50000000 //29 lcdc axi DMA ƵÂÊ /* Timing */