Merge tag 'v3.13-rockchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes-non-critical

From Heiko Stübner:
Romoval of obsolete (never used) dt properties
and fix for the selection of the TWD.

* tag 'v3.13-rockchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: remove obsolete rockchip,config properties
  ARM: rockchip: fix wrong use of non-existent CONFIG_LOCAL_TIMERS

2 files changed, 1 insertions, 24 deletions

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index 56bfac93d3f6..98f3597a6a35 100644
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -191,17 +191,14 @@
                                 uart0_xfer: uart0-xfer {
                                         rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_default>,
                                                         <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 uart0_cts: uart0-cts {
                                         rockchip,pins = <RK_GPIO1 2 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 uart0_rts: uart0-rts {
                                         rockchip,pins = <RK_GPIO1 3 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
                         };
 
@@ -209,17 +206,14 @@
                                 uart1_xfer: uart1-xfer {
                                         rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_default>,
                                                         <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 uart1_cts: uart1-cts {
                                         rockchip,pins = <RK_GPIO1 6 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 uart1_rts: uart1-rts {
                                         rockchip,pins = <RK_GPIO1 7 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
                         };
 
@@ -227,7 +221,6 @@
                                 uart2_xfer: uart2-xfer {
                                         rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_default>,
                                                         <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
                                 /* no rts / cts for uart2 */
                         };
@@ -236,44 +229,36 @@
                                 uart3_xfer: uart3-xfer {
                                         rockchip,pins = <RK_GPIO3 27 RK_FUNC_1 &pcfg_pull_default>,
                                                         <RK_GPIO3 28 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 uart3_cts: uart3-cts {
                                         rockchip,pins = <RK_GPIO3 29 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 uart3_rts: uart3-rts {
                                         rockchip,pins = <RK_GPIO3 30 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
                         };
 
                         sd0 {
                                 sd0_clk: sd0-clk {
                                         rockchip,pins = <RK_GPIO3 8 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd0_cmd: sd0-cmd {
                                         rockchip,pins = <RK_GPIO3 9 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd0_cd: sd0-cd {
                                         rockchip,pins = <RK_GPIO3 14 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd0_wp: sd0-wp {
                                         rockchip,pins = <RK_GPIO3 15 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd0_bus1: sd0-bus-width1 {
                                         rockchip,pins = <RK_GPIO3 10 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd0_bus4: sd0-bus-width4 {
@@ -281,34 +266,28 @@
                                                         <RK_GPIO3 11 RK_FUNC_1 &pcfg_pull_default>,
                                                         <RK_GPIO3 12 RK_FUNC_1 &pcfg_pull_default>,
                                                         <RK_GPIO3 13 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
                         };
 
                         sd1 {
                                 sd1_clk: sd1-clk {
                                         rockchip,pins = <RK_GPIO3 21 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd1_cmd: sd1-cmd {
                                         rockchip,pins = <RK_GPIO3 16 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd1_cd: sd1-cd {
                                         rockchip,pins = <RK_GPIO3 22 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd1_wp: sd1-wp {
                                         rockchip,pins = <RK_GPIO3 23 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd1_bus1: sd1-bus-width1 {
                                         rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
 
                                 sd1_bus4: sd1-bus-width4 {
@@ -316,7 +295,6 @@
                                                         <RK_GPIO3 18 RK_FUNC_1 &pcfg_pull_default>,
                                                         <RK_GPIO3 19 RK_FUNC_1 &pcfg_pull_default>,
                                                         <RK_GPIO3 20 RK_FUNC_1 &pcfg_pull_default>;
-                                        rockchip,config = <&pcfg_pull_default>;
                                 };
                         };
                 };
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 25ee12b21f01..a8487337344a 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -5,9 +5,8 @@ config ARCH_ROCKCHIP
         select ARCH_REQUIRE_GPIOLIB
         select ARM_GIC
         select CACHE_L2X0
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_SMP
-        select LOCAL_TIMERS if SMP
         select COMMON_CLK
         select GENERIC_CLOCKEVENTS
         select DW_APB_TIMER_OF