From 8ba17d0cbc285bd7c61bd511c826569129704418 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Tue, 19 Mar 2013 12:05:53 +0800 Subject: [PATCH] rk3028: rename from rk2928b --- arch/arm/Kconfig | 5 ++- arch/arm/Makefile | 2 +- ...2928b_tb_defconfig => rk3028_tb_defconfig} | 2 +- arch/arm/mach-rk2928b/Kconfig | 8 ----- arch/arm/mach-rk2928b/Makefile | 2 -- arch/arm/mach-rk30/Kconfig | 35 ++++++++++++------- arch/arm/mach-rk30/Makefile | 8 +++-- .../board-rk3028-tb-sdmmc-conifg.c} | 0 .../board-rk3028-tb.c} | 4 +-- arch/arm/plat-rk/include/plat/cpu.h | 2 +- drivers/usb/dwc_otg/usbdev_rk30.c | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-) rename arch/arm/configs/{rk2928b_tb_defconfig => rk3028_tb_defconfig} (99%) delete mode 100644 arch/arm/mach-rk2928b/Kconfig delete mode 100644 arch/arm/mach-rk2928b/Makefile rename arch/arm/{mach-rk2928b/board-rk2928b-tb-sdmmc-conifg.c => mach-rk30/board-rk3028-tb-sdmmc-conifg.c} (100%) rename arch/arm/{mach-rk2928b/board-rk2928b-tb.c => mach-rk30/board-rk3028-tb.c} (99%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6c4808b0be4d..d6a248a2e4d9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -884,7 +884,7 @@ config ARCH_RK2928 Support for Rockchip's RK2928 SoCs. config ARCH_RK30 - bool "Rockchip RK2928B/RK30xx/RK3108/RK3168" + bool "Rockchip RK30xx/RK3108/RK3168" select PLAT_RK select CPU_V7 select ARM_GIC @@ -895,7 +895,7 @@ config ARCH_RK30 select ARM_ERRATA_754322 select ARM_ERRATA_775420 help - Support for Rockchip's RK2928B/RK30xx/RK3108/RK3168 SoCs. + Support for Rockchip's RK30xx/RK3108/RK3168 SoCs. config ARCH_RK3188 bool "Rockchip RK3188" @@ -1016,7 +1016,6 @@ source "arch/arm/plat-rk/Kconfig" source "arch/arm/mach-rk29/Kconfig" source "arch/arm/mach-rk2928/Kconfig" source "arch/arm/mach-rk30/Kconfig" -source "arch/arm/mach-rk2928b/Kconfig" source "arch/arm/mach-rk3188/Kconfig" source "arch/arm/mach-sa1100/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 15b7be3551c7..a159d5d84244 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_PXA) := pxa machine-$(CONFIG_ARCH_REALVIEW) := realview machine-$(CONFIG_ARCH_RK29) := rk29 machine-$(CONFIG_ARCH_RK2928) := rk2928 -machine-$(CONFIG_ARCH_RK30) := rk30 rk2928b +machine-$(CONFIG_ARCH_RK30) := rk30 machine-$(CONFIG_ARCH_RK3188) := rk3188 machine-$(CONFIG_ARCH_RPC) := rpc machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443 diff --git a/arch/arm/configs/rk2928b_tb_defconfig b/arch/arm/configs/rk3028_tb_defconfig similarity index 99% rename from arch/arm/configs/rk2928b_tb_defconfig rename to arch/arm/configs/rk3028_tb_defconfig index a0abfc29bb2e..23783d65daa3 100755 --- a/arch/arm/configs/rk2928b_tb_defconfig +++ b/arch/arm/configs/rk3028_tb_defconfig @@ -28,7 +28,7 @@ CONFIG_DDR_SDRAM_FREQ=300 CONFIG_RK_CLOCK_PROC=y CONFIG_CLK_SWITCH_TO_32K=y CONFIG_RK30_I2C_INSRAM=y -CONFIG_SOC_RK2928B=y +CONFIG_SOC_RK3028=y CONFIG_FIQ_DEBUGGER=y CONFIG_FIQ_DEBUGGER_NO_SLEEP=y CONFIG_FIQ_DEBUGGER_CONSOLE=y diff --git a/arch/arm/mach-rk2928b/Kconfig b/arch/arm/mach-rk2928b/Kconfig deleted file mode 100644 index e4ab2d0e1a1d..000000000000 --- a/arch/arm/mach-rk2928b/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -choice - prompt "RK2928B Board Type" - depends on SOC_RK2928B - -config MACH_RK2928B_TB - bool "RK2928B Top Board" - -endchoice diff --git a/arch/arm/mach-rk2928b/Makefile b/arch/arm/mach-rk2928b/Makefile deleted file mode 100644 index 0ca1f281b4b0..000000000000 --- a/arch/arm/mach-rk2928b/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_SOC_RK2928B) += board.o -board-$(CONFIG_MACH_RK2928B_TB) += board-rk2928b-tb.o diff --git a/arch/arm/mach-rk30/Kconfig b/arch/arm/mach-rk30/Kconfig index 5041f8f0e10d..fa860a3b7ab0 100755 --- a/arch/arm/mach-rk30/Kconfig +++ b/arch/arm/mach-rk30/Kconfig @@ -11,14 +11,14 @@ choice depends on ARCH_RK30 default SOC_RK3066 -config SOC_RK2928B - bool "RK2928B" - select ARCH_RK3066B - config SOC_RK3000 bool "RK3000" select ARCH_RK30XX +config SOC_RK3028 + bool "RK3028" + select ARCH_RK3066B + config SOC_RK3066 bool "RK3066" select ARCH_RK30XX @@ -96,6 +96,15 @@ choice endchoice +choice + prompt "RK3028 Board Type" + depends on SOC_RK3028 + +config MACH_RK3028_TB + bool "RK3028 Top Board" + +endchoice + choice prompt "RK3066B Board Type" depends on SOC_RK3066B @@ -112,15 +121,6 @@ config MACH_RK3066B_M701 endchoice -choice - prompt "RK3168M Board Type" - depends on SOC_RK3168M - -config MACH_RK3168M_TB - bool "RK3168M Top Board" - -endchoice - choice prompt "RK3108 Board Type" depends on SOC_RK3108 @@ -149,3 +149,12 @@ config MACH_RK3168_86V config MACH_RK3168_86V_OLD bool "RK3168 86V Old Board" endchoice + +choice + prompt "RK3168M Board Type" + depends on SOC_RK3168M + +config MACH_RK3168M_TB + bool "RK3168M Top Board" + +endchoice diff --git a/arch/arm/mach-rk30/Makefile b/arch/arm/mach-rk30/Makefile index 178d474071de..004f995a7eb5 100755 --- a/arch/arm/mach-rk30/Makefile +++ b/arch/arm/mach-rk30/Makefile @@ -38,14 +38,14 @@ obj-$(CONFIG_MACH_RK30_PHONE_LOQUAT) += board-rk30-phone-loquat.o board-rk30-pho obj-$(CONFIG_MACH_RK30_DS1001B) += board-rk30-ds1001b.o board-rk30-ds1001b-key.o board-rk30-ds1001b-rfkill.o obj-$(CONFIG_MACH_RK30_PHONE_A22) += board-rk30-phone-a22.o board-rk30-phone-a22-key.o +obj-$(CONFIG_SOC_RK3028) += board.o +board-$(CONFIG_MACH_RK3028_TB) += board-rk3028-tb.o + obj-$(CONFIG_SOC_RK3066B) += board.o board-$(CONFIG_MACH_RK3066B_FPGA) += board-rk3066b-fpga.o board-$(CONFIG_MACH_RK3066B_SDK) += board-rk3066b-sdk.o board-$(CONFIG_MACH_RK3066B_M701) += board-rk3066b-m701.o -obj-$(CONFIG_SOC_RK3168M) += board.o -board-$(CONFIG_MACH_RK3168M_TB) += board-rk3168m-tb.o - obj-$(CONFIG_SOC_RK3108) += board.o board-$(CONFIG_MACH_RK3108_TB) += board-rk3108-tb.o @@ -56,3 +56,5 @@ board-$(CONFIG_MACH_RK3168_DS1006H) += board-rk3168-ds1006h.o board-$(CONFIG_MACH_RK3168_86V) += board-rk3168-86v.o board-$(CONFIG_MACH_RK3168_86V_OLD) += board-rk3168-86v-old.o +obj-$(CONFIG_SOC_RK3168M) += board.o +board-$(CONFIG_MACH_RK3168M_TB) += board-rk3168m-tb.o diff --git a/arch/arm/mach-rk2928b/board-rk2928b-tb-sdmmc-conifg.c b/arch/arm/mach-rk30/board-rk3028-tb-sdmmc-conifg.c similarity index 100% rename from arch/arm/mach-rk2928b/board-rk2928b-tb-sdmmc-conifg.c rename to arch/arm/mach-rk30/board-rk3028-tb-sdmmc-conifg.c diff --git a/arch/arm/mach-rk2928b/board-rk2928b-tb.c b/arch/arm/mach-rk30/board-rk3028-tb.c similarity index 99% rename from arch/arm/mach-rk2928b/board-rk2928b-tb.c rename to arch/arm/mach-rk30/board-rk3028-tb.c index 85b3171651ef..61e880afc4d1 100755 --- a/arch/arm/mach-rk2928b/board-rk2928b-tb.c +++ b/arch/arm/mach-rk30/board-rk3028-tb.c @@ -829,7 +829,7 @@ static struct platform_device device_ion = { * SDMMC devices, include the module of SD,MMC,and sdio.noted by xbw at 2012-03-05 **************************************************************************************************/ #ifdef CONFIG_SDMMC_RK29 -#include "board-rk2928b-tb-sdmmc-conifg.c" +#include "board-rk3028-tb-sdmmc-conifg.c" #include "../plat-rk/rk-sdmmc-ops.c" #include "../plat-rk/rk-sdmmc-wifi.c" #endif //endif ---#ifdef CONFIG_SDMMC_RK29 @@ -1090,7 +1090,7 @@ struct regulator_init_data pwm_regulator_init_dcdc[1] = static struct pwm_platform_data pwm_regulator_info[1] = { { - #if defined (CONFIG_MACH_RK2928B_TB) + #if defined (CONFIG_MACH_RK3028_TB) .pwm_id = 2, .pwm_gpio = RK30_PIN3_PD5, .pwm_iomux_pwm = PWM2, diff --git a/arch/arm/plat-rk/include/plat/cpu.h b/arch/arm/plat-rk/include/plat/cpu.h index 68999144519c..238dca0afd7b 100644 --- a/arch/arm/plat-rk/include/plat/cpu.h +++ b/arch/arm/plat-rk/include/plat/cpu.h @@ -84,7 +84,7 @@ static inline bool soc_is_rk3066b(void) { return false; } static inline bool soc_is_rk3108(void) { return false; } static inline bool soc_is_rk3168m(void) { return false; } #endif +static inline bool soc_is_rk3028(void) { return soc_is_rk3168m(); } static inline bool soc_is_rk3168(void) { return soc_is_rk3108(); } -static inline bool soc_is_rk2928b(void) { return soc_is_rk3168m(); } #endif diff --git a/drivers/usb/dwc_otg/usbdev_rk30.c b/drivers/usb/dwc_otg/usbdev_rk30.c index c00e790efb8d..3d19f1a5b360 100755 --- a/drivers/usb/dwc_otg/usbdev_rk30.c +++ b/drivers/usb/dwc_otg/usbdev_rk30.c @@ -30,7 +30,7 @@ #elif defined(CONFIG_SOC_RK3168) || defined(CONFIG_SOC_RK3188) || defined(CONFIG_SOC_RK3168M) #define RK3066B_HOST_DRV_VBUS RK30_PIN0_PC0 #define RK3066B_OTG_DRV_VBUS RK30_PIN3_PD5 -#elif defined(CONFIG_SOC_RK2928B) +#elif defined(CONFIG_SOC_RK3028) #define RK3066B_HOST_DRV_VBUS RK30_PIN1_PA4 #define RK3066B_OTG_DRV_VBUS RK30_PIN3_PD7 #endif -- 2.34.1