From 3c734df1e9b61a3e093025ea68ce4fc17bf54d59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=94=A1=E6=9E=AB?= Date: Tue, 28 Jun 2011 16:16:01 +0800 Subject: [PATCH] update config file for newton --- arch/arm/configs/rk29_newton_defconfig | 56 ++++++-------------------- arch/arm/mach-rk29/board-rk29-newton.c | 18 +++++++-- 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/arch/arm/configs/rk29_newton_defconfig b/arch/arm/configs/rk29_newton_defconfig index cfb9c1d944f6..6bf1ecc8b316 100644 --- 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 -# Tue Jun 28 10:17:07 2011 +# Tue Jun 28 16:05:41 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -228,6 +228,8 @@ CONFIG_MACH_RK29_newton=y # CONFIG_DDR_TYPE_DDR3_2133M is not set # CONFIG_DDR_TYPE_DDR3_2133N is not set CONFIG_DDR_TYPE_DDR3_DEFAULT=y +CONFIG_RK29_MEM_SIZE_512M=y +# CONFIG_RK29_MEM_SIZE_1G is not set CONFIG_RK29_MEM_SIZE_M=512 CONFIG_DDR_SDRAM_FREQ=400 @@ -240,8 +242,10 @@ CONFIG_RK29_JTAG=y CONFIG_RK29_LAST_LOG=y # -# The control interface support for RK29 suspend +# support for RK29 power manage # +# CONFIG_RK29_CLK_SWITCH_TO_32K is not set +# CONFIG_RK29_GPIO_SUSPEND is not set CONFIG_RK29_PWM_INSRAM=y # @@ -736,46 +740,7 @@ CONFIG_NETDEVICES=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set -CONFIG_PHYLIB=y - -# -# MII PHY device drivers -# -# CONFIG_MARVELL_PHY is not set -# CONFIG_DAVICOM_PHY is not set -# CONFIG_QSEMI_PHY is not set -# CONFIG_LXT_PHY is not set -# CONFIG_CICADA_PHY is not set -# CONFIG_VITESSE_PHY is not set -# CONFIG_SMSC_PHY is not set -# CONFIG_BROADCOM_PHY is not set -# CONFIG_ICPLUS_PHY is not set -# CONFIG_REALTEK_PHY is not set -# CONFIG_NATIONAL_PHY is not set -# CONFIG_STE10XP is not set -# CONFIG_LSI_ET1011C_PHY is not set -# CONFIG_FIXED_PHY is not set -# CONFIG_MDIO_BITBANG is not set -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_AX88796 is not set -CONFIG_RK29_VMAC=y -# CONFIG_SMC91X is not set -# CONFIG_DM9000 is not set -# CONFIG_ETHOC is not set -# CONFIG_SMC911X is not set -# CONFIG_SMSC911X is not set -# CONFIG_DNET is not set -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -# CONFIG_B44 is not set -# CONFIG_KS8842 is not set -# CONFIG_KS8851_MLL is not set +# CONFIG_NET_ETHERNET is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set CONFIG_WLAN=y @@ -1324,7 +1289,12 @@ CONFIG_LCD_AT070TN93=y # # HDMI # -# CONFIG_HDMI is not set +CONFIG_HDMI=y +CONFIG_HDMI_OLD=y +CONFIG_ANX7150=y +# CONFIG_ANX9030 is not set +# CONFIG_HDMI_NEW is not set +# CONFIG_HDMI_DEBUG is not set # # Console display driver support diff --git a/arch/arm/mach-rk29/board-rk29-newton.c b/arch/arm/mach-rk29/board-rk29-newton.c index 08304f2290f6..190070164d7a 100755 --- a/arch/arm/mach-rk29/board-rk29-newton.c +++ b/arch/arm/mach-rk29/board-rk29-newton.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -107,7 +108,11 @@ #else #define MEM_FBIPP_SIZE 0 #endif -#define PMEM_GPU_BASE ((u32)RK29_SDRAM_PHYS + SDRAM_SIZE - PMEM_GPU_SIZE) +#if SDRAM_SIZE > SZ_512M +#define PMEM_GPU_BASE (RK29_SDRAM_PHYS + SZ_512M - PMEM_GPU_SIZE) +#else +#define PMEM_GPU_BASE (RK29_SDRAM_PHYS + SDRAM_SIZE - PMEM_GPU_SIZE) +#endif #define PMEM_UI_BASE (PMEM_GPU_BASE - PMEM_UI_SIZE) #define PMEM_VPU_BASE (PMEM_UI_BASE - PMEM_VPU_SIZE) #define PMEM_CAM_BASE (PMEM_VPU_BASE - PMEM_CAM_SIZE) @@ -1322,13 +1327,13 @@ static struct resource resources_gpu[] = { [1] = { .name = "gpu_base", .start = RK29_GPU_PHYS, - .end = RK29_GPU_PHYS + RK29_GPU_SIZE, + .end = RK29_GPU_PHYS + RK29_GPU_SIZE - 1, .flags = IORESOURCE_MEM, }, [2] = { .name = "gpu_mem", .start = PMEM_GPU_BASE, - .end = PMEM_GPU_BASE + PMEM_GPU_SIZE, + .end = PMEM_GPU_BASE + PMEM_GPU_SIZE - 1, .flags = IORESOURCE_MEM, }, [3] = { @@ -1690,6 +1695,11 @@ static void __init machine_rk29_fixup(struct machine_desc *desc, struct tag *tag mi->bank[0].start = RK29_SDRAM_PHYS; mi->bank[0].node = PHYS_TO_NID(RK29_SDRAM_PHYS); mi->bank[0].size = LINUX_SIZE; +#if SDRAM_SIZE > SZ_512M + mi->nr_banks = 2; + mi->bank[1].start = RK29_SDRAM_PHYS + SZ_512M; + mi->bank[1].size = SDRAM_SIZE - SZ_512M; +#endif } static void __init machine_rk29_mapio(void) @@ -1704,7 +1714,7 @@ static void __init machine_rk29_mapio(void) MACHINE_START(RK29, "RK29board") /* UART for LL DEBUG */ - .phys_io = RK29_UART1_PHYS, + .phys_io = RK29_UART1_PHYS & 0xfff00000, .io_pg_offst = ((RK29_UART1_BASE) >> 18) & 0xfffc, .boot_params = RK29_SDRAM_PHYS + 0x88000, .fixup = machine_rk29_fixup, -- 2.34.1