From: 张晴 <zhangqing@rock-chips.com>
Date: Tue, 16 Oct 2012 09:57:28 +0000 (+0800)
Subject: rk2926:move pmic_type and gpio offset addr to board.h
X-Git-Tag: firefly_0821_release~8403
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7c243fc561cdfa04c72e5a7d36b709f1944fa42;p=firefly-linux-kernel-4.4.55.git

rk2926:move pmic_type and gpio offset addr to board.h
---

diff --git a/arch/arm/mach-rk2928/board-rk2926-sdk.c b/arch/arm/mach-rk2928/board-rk2926-sdk.c
index 4e408ef1d73c..9f9a0a21fc3d 100755
--- a/arch/arm/mach-rk2928/board-rk2926-sdk.c
+++ b/arch/arm/mach-rk2928/board-rk2926-sdk.c
@@ -58,16 +58,14 @@
 #include "board-rk2928-sdk-camera.c" 
 #include "board-rk2928-sdk-key.c"
 
-int __sramdata g_pmic_type =  0;
-#define PMIC_TYPE_TPS65910	2
-#define PMIC_TYPE_ACT8931	3
-
 #ifdef  CONFIG_THREE_FB_BUFFER
 #define RK30_FB0_MEM_SIZE 12*SZ_1M
 #else
 #define RK30_FB0_MEM_SIZE 8*SZ_1M
 #endif
 
+int __sramdata g_pmic_type =  0;
+
 static struct spi_board_info board_spi_devices[] = {
 };
 
diff --git a/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c b/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c
index 3433f6ced0dd..18a65824d3fe 100755
--- a/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c
+++ b/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c
@@ -6,13 +6,11 @@
 
 #include <mach/gpio.h>
 #include <mach/iomux.h>
+#include <mach/board.h>
 
 #define gpio_readl(offset)	readl_relaxed(RK2928_GPIO1_BASE + offset)
 #define gpio_writel(v, offset)	do { writel_relaxed(v, RK2928_GPIO1_BASE + offset); dsb(); } while (0)
 
-#define GPIO_SWPORTA_DR  0x0000
-#define GPIO_SWPORTA_DDR 0x0004
-
 #define GPIO1_A1_OUTPUT  (1<<1)
 #define GPIO1_A1_OUTPUT_HIGH  (1<<1)
 #define GPIO1_A1_OUTPUT_LOW  (~(1<<1))
diff --git a/arch/arm/mach-rk2928/board-rk2928-a720.c b/arch/arm/mach-rk2928/board-rk2928-a720.c
index e15707a535d9..3ed19d531741 100755
--- a/arch/arm/mach-rk2928/board-rk2928-a720.c
+++ b/arch/arm/mach-rk2928/board-rk2928-a720.c
@@ -58,16 +58,14 @@
 #include "board-rk2928-a720-camera.c" 
 #include "board-rk2928-a720-key.c"
 
-int __sramdata g_pmic_type =  0;
-#define PMIC_TYPE_TPS65910	2
-#define PMIC_TYPE_ACT8931	3
-
 #ifdef  CONFIG_THREE_FB_BUFFER
 #define RK30_FB0_MEM_SIZE 12*SZ_1M
 #else
 #define RK30_FB0_MEM_SIZE 8*SZ_1M
 #endif
 
+int __sramdata g_pmic_type =  0;
+
 static struct spi_board_info board_spi_devices[] = {
 };
 
diff --git a/arch/arm/mach-rk2928/board-rk2928-sdk-act8931.c b/arch/arm/mach-rk2928/board-rk2928-sdk-act8931.c
index dfcf48910200..6bad7047ec74 100755
--- a/arch/arm/mach-rk2928/board-rk2928-sdk-act8931.c
+++ b/arch/arm/mach-rk2928/board-rk2928-sdk-act8931.c
@@ -5,6 +5,7 @@
 
 #include <mach/gpio.h>
 #include <mach/iomux.h>
+#include <mach/board.h>
 
 #ifdef CONFIG_REGULATOR_ACT8931
 
diff --git a/arch/arm/mach-rk2928/i2c_sram.c b/arch/arm/mach-rk2928/i2c_sram.c
index 3c4789f874df..853105454c90 100755
--- a/arch/arm/mach-rk2928/i2c_sram.c
+++ b/arch/arm/mach-rk2928/i2c_sram.c
@@ -309,8 +309,6 @@ uint8 __sramfunc sram_i2c_read(uint8 I2CSlaveAddr, uint8 regAddr)
 	return data;
 }
 extern int __sramdata g_pmic_type ;
-#define PMIC_TYPE_TPS65910	2
-#define PMIC_TYPE_ACT8931	3
 void __sramfunc rk30_suspend_voltage_set(unsigned int vol)
 {
     uint8 slaveaddr;
diff --git a/arch/arm/mach-rk2928/include/mach/board.h b/arch/arm/mach-rk2928/include/mach/board.h
old mode 100644
new mode 100755
index 2f012fd005d5..7d26b49545b4
--- a/arch/arm/mach-rk2928/include/mach/board.h
+++ b/arch/arm/mach-rk2928/include/mach/board.h
@@ -12,6 +12,12 @@
 #include <mach/sram.h>
 #include <linux/i2c-gpio.h>
 
+#define GPIO_SWPORTA_DR  0x0000
+#define GPIO_SWPORTA_DDR 0x0004
+
+#define PMIC_TYPE_TPS65910	2
+#define PMIC_TYPE_ACT8931	3
+
 extern struct rk29_sdmmc_platform_data default_sdmmc0_data;
 extern struct rk29_sdmmc_platform_data default_sdmmc1_data;