Merge branches 'intel_pstate', 'pm-cpufreq' and 'pm-cpufreq-sched'

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / vf610-zii-dev-rev-b.dts

diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
index 7940408838df6c10e086e1246b8ee944bd42fef9..37f95427616f28697f7bbbedd5ef8ba758d3e514 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
@@ -239,7 +239,7 @@
                        #size-cells = <0>;
                        reg = <4>;
 
-                       switch2: switch2@0 {
+                       switch2: switch@0 {
                                compatible = "marvell,mv88e6085";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -459,18 +459,6 @@
                >;
        };
 
-       pinctrl_gpio_switch0: pinctrl-gpio-switch0 {
-               fsl,pins = <
-                       VF610_PAD_PTB5__GPIO_27         0x219d
-               >;
-       };
-
-       pinctrl_gpio_switch1: pinctrl-gpio-switch1 {
-               fsl,pins = <
-                       VF610_PAD_PTB4__GPIO_26         0x219d
-               >;
-       };
-
        pinctrl_mdio_mux: pinctrl-mdio-mux {
                fsl,pins = <
                        VF610_PAD_PTA18__GPIO_8         0x31c2