ARM: rockchip: ft support GPU test

diff --git a/arch/arm/boot/dts/rk3288-ft.dts b/arch/arm/boot/dts/rk3288-ft.dts
index 7fdbdac6dc4264468182a7037c68249e02b88768..7786e2876fea536a7195205a1df90da1d13d8c86 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-ft.dts
+++ b/arch/arm/boot/dts/rk3288-ft.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 
 #include "rk3288.dtsi"
+#include "lcd-b101ew05.dtsi"
 
 / {
        memory {
@@ -9,13 +10,46 @@
        };
 
        chosen {
-               bootargs = "console=ttyFIQ0 rockchip_jtag";
+               bootargs = "initrd=0x04ff0000,0x2000000 init=/init console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=rk30board rockchip_jtag loglevel=1";
        };
 
        fiq-debugger {
                status = "okay";
        };
-    
+
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               regulator@0 {
+                       compatible = "regulator-fixed";
+                       reg = <0>;
+                       regulator-name = "vdd_arm";
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+                       regulator-always-on;
+               };
+
+               regulator@1 {
+                       compatible = "regulator-fixed";
+                       reg = <1>;
+                       regulator-name = "vdd_gpu";
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+                       regulator-always-on;
+               };
+
+               regulator@2 {
+                       compatible = "regulator-fixed";
+                       reg = <2>;
+                       regulator-name = "vdd_logic";
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+                       regulator-always-on;
+               };
+       };
+
         rockchip_ft_test {            
             // firs rate is setting in rockchip_clocks_init,so it is set 0xfffffffff            
             //rockchip,arm_rate =<0xffffffff 456000000 504000000 552000000>;     
@@ -31,6 +65,10 @@
         };
 };
 
+&lcdc0 {
+       status = "okay";
+};
+
  &rockchip_clocks_init {
                       rockchip,clocks-init-rate =
                        <&clk_core 1704000000>, <&clk_gpll 297000000>,
@@ -51,6 +89,28 @@
                        <&clk_tspout 80000000>, <&clk_mac 125000000>;
 };
 
+&clk_core_dvfs_table {
+       operating-points = <
+               /* KHz    uV */
+               126000 1000000
+               216000 1000000
+               312000 1000000
+               408000 1000000
+               600000 1000000
+               696000 1000000
+               816000 1000000
+               1008000 1000000
+               >;
+       status="okay";
+};
 
-
-
+&clk_gpu_dvfs_table {
+       operating-points = <
+               /* KHz    uV */
+               100000 1000000
+               200000 1000000
+               300000 1000000
+               400000 1000000
+               >;
+       status="okay";
+};

diff --git a/arch/arm/configs/rockchip_ft_defconfig b/arch/arm/configs/rockchip_ft_defconfig
index 808a6864e6570cafdaa870298d9e78d232a26348..fc2952fedbeedc85fcac7347705349c2bcd03c2a 100644 (file)
--- a/arch/arm/configs/rockchip_ft_defconfig
+++ b/arch/arm/configs/rockchip_ft_defconfig
@@ -1,6 +1,9 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_KERNEL_LZO=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=12
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_UID16 is not set
 # CONFIG_BASE_FULL is not set
@@ -13,14 +16,13 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # 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_ROCKCHIP=y
 # CONFIG_RK_LAST_LOG is not set
 # CONFIG_RK_CONSOLE_THREAD is not set
-# CONFIG_DVFS is not set
 # CONFIG_RK_VCODEC is not set
 CONFIG_RK_FT_TEST=y
-# CONFIG_ARM_THUMB is not set
 # CONFIG_SWP_EMULATE is not set
 # CONFIG_KUSER_HELPERS is not set
 CONFIG_SMP=y
@@ -31,46 +33,91 @@ CONFIG_HIGHMEM=y
 # CONFIG_COMPACTION is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_CMA=y
 # CONFIG_ATAGS is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_CMDLINE="console=ttyFIQ0"
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
-# CONFIG_BINFMT_ELF is not set
-# CONFIG_BINFMT_SCRIPT is not set
 # CONFIG_COREDUMP is not set
-# CONFIG_SUSPEND is not set
+CONFIG_PM_RUNTIME=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NET_ACTIVITY_STATS is not set
+# CONFIG_RPS is not set
+# CONFIG_WIRELESS is not set
 # CONFIG_FW_LOADER is not set
+CONFIG_DMA_CMA=y
 CONFIG_SRAM=y
 # CONFIG_5V_EN is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NET_CORE is not set
+# CONFIG_ETHERNET is not set
+# CONFIG_WLAN 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_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_MALI_MIDGARD=y
+CONFIG_MALI_MIDGARD_DVFS=y
+CONFIG_MALI_EXPERT=y
+CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
+CONFIG_FB=y
+CONFIG_FB_ROCKCHIP=y
+CONFIG_LCDC_RK3288=y
+CONFIG_RK_TRSM=y
+CONFIG_RK32_LVDS=y
+CONFIG_RK_HDMI=y
+CONFIG_HDMI_SOURCE_LCDC1=y
 # CONFIG_IEP is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_STAGING=y
 CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_LOGGER=y
 # CONFIG_ANDROID_TIMED_OUTPUT is not set
+CONFIG_SYNC=y
+CONFIG_SW_SYNC=y
+CONFIG_SW_SYNC_USER=y
+CONFIG_ION=y
+CONFIG_ION_ROCKCHIP=y
 CONFIG_FIQ_DEBUGGER=y
-CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
 CONFIG_FIQ_DEBUGGER_CONSOLE=y
 CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
+# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
 # CONFIG_IOMMU_SUPPORT 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_SYSFS is not set
+# CONFIG_PROC_PAGE_MONITOR is not set
 # CONFIG_MISC_FILESYSTEMS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_STACKTRACE is not set