slim down DTs more

diff --git a/arch/arm/dts/pxa1908-samsung-coreprimevelte.dts b/arch/arm/dts/pxa1908-samsung-coreprimevelte.dts
index 8519b7dae2bbb5cf5007299f5bb9b7e9100c8af4..207a08b08946ddfe0fd5f5585a66b6308f349c92 100644 (file)
--- a/arch/arm/dts/pxa1908-samsung-coreprimevelte.dts
+++ b/arch/arm/dts/pxa1908-samsung-coreprimevelte.dts
@@ -74,331 +74,3 @@
                };
        };
 };
-
-&pmx {
-       pinctrl-single,gpio-range = <&range 55 55 0>,
-                                   <&range 110 32 0>,
-                                   <&range 52 1 0>;
-
-       pinctrl-names = "default";
-       pinctrl-0 = <&board_pins_1 &board_pins_2 &board_pins_3>;
-
-       board_pins_1: pinmux-board-1 {
-               pinctrl-single,pins = <
-                       0x160 0
-                       0x164 0
-                       0x168 0
-                       0x16c 0
-               >;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0x8000 0x8000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0x8000 0x8000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0x288 0x388>;
-       };
-
-       board_pins_2: pinmux-board-2 {
-               pinctrl-single,pins = <
-                       0x44 1
-                       0x48 1
-                       0x20 1
-                       0x18 1
-                       0x14 1
-                       0x10 1
-                       0xc 1
-                       0x8 1
-                       0x68 1
-                       0x58 0
-                       0x54 0
-                       0x7c 0
-                       0x6c 0
-                       0x70 0
-                       0x4c 1
-                       0x50 1
-                       0xac 0
-                       0x90 0
-                       0x8c 0
-                       0x88 0
-                       0x84 0
-                       0xc8 0
-                       0x128 0
-                       0x190 0
-                       0x194 0
-                       0x1a0 0
-                       0x114 0
-                       0x118 0
-                       0x1d8 0
-                       0x1e4 0
-                       0xe8 0
-                       0x100 0
-                       0x204 0
-                       0x210 0
-                       0x218 0
-               >;
-               pinctrl-single,bias-pullup = <0xc000 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0x8000 0xa000 0x8000 0xc000>;
-               pinctrl-single,low-power-mode = <0x288 0x388>;
-       };
-
-       board_pins_3: pinmux-board-3 {
-               pinctrl-single,pins = <
-                       0x260 0
-                       0x264 0
-                       0x268 0
-                       0x26c 0
-                       0x270 0
-                       0x274 0
-                       0x78 0
-                       0x74 0
-                       0xb0 1
-               >;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       uart0_pins: pinmux-uart0 {
-               pinctrl-single,pins = <
-                       0x198 6
-                       0x19c 6
-               >;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       gpio_keys_pins: pinmux-gpio-keys {
-               pinctrl-single,pins = <
-                       0x11c 0
-                       0x120 0
-                       0x1a4 0
-               >;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0xc000 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0x8000 0xa0000 0x8000 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       i2c_muic_pins: pinmux-i2c-muic {
-               pinctrl-single,pins = <
-                       0x154 0
-                       0x150 0
-               >;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0x288 0x388>;
-       };
-
-       sdh0_pins_1: pinmux-sdh0-1 {
-               pinctrl-single,pins = <
-                       0x108 0
-               >;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0xc000 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0x8000 0xa000 0x8000 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       sdh0_pins_2: pinmux-sdh0-2 {
-               pinctrl-single,pins = <
-                       0x94 0
-                       0x98 0
-                       0x9c 0
-                       0xa0 0
-                       0xa4 0
-               >;
-               pinctrl-single,drive-strength = <0x800 0x1800>;
-               pinctrl-single,bias-pullup = <0xc000 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0x8000 0xa000 0x8000 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       sdh0_pins_3: pinmux-sdh0-3 {
-               pinctrl-single,pins = <
-                       0xa8 0
-               >;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0x208 0x388>;
-       };
-
-       sdh1_pins_1: pinmux-sdh1-1 {
-               pinctrl-single,pins = <
-                       0x170 1
-                       0x174 1
-                       0x178 1
-                       0x17c 1
-                       0x180 1>;
-                       pinctrl-single,drive-strength = <0x1000 0x1800>;
-                       pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-                       pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-                       pinctrl-single,input-schmitt = <0 0x30>;
-                       pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-                       pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       sdh1_pins_2: pinmux-sdh1-2 {
-               pinctrl-single,pins = <0x184 1>;
-               pinctrl-single,drive-strength = <0x800 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0x208 0x388>;
-       };
-
-       sdh1_pins_3: pinmux-sdh1-3 {
-               pinctrl-single,pins = <0xec 0>;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0x8000 0x8000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0x8000 0x8000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       sdh1_edge_wakeup: pinmux-sdh1-edge-wakeup {
-               pinctrl-single,pins = <0x178 1>;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0x8000 0x8000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0x8000 0x8000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0x30 0x30>;
-               pinctrl-single,input-schmitt-enable = <0 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       sdh1_pins_1_fast: pinmux-sdh1-1-fast {
-               pinctrl-single,pins = <
-                       0x170 1
-                       0x174 1
-                       0x178 1
-                       0x17c 1
-                       0x180 1
-               >;
-               pinctrl-single,drive-strength = <0x1800 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       sdh1_pins_2_fast: pinmux-sdh1-2-fast {
-               pinctrl-single,pins = <
-                       0x184 1
-               >;
-               pinctrl-single,drive-strength = <0x1800 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0x208 0x388>;
-       };
-
-       sdh2_pins_1: pinmux-sdh2-1 {
-               pinctrl-single,pins = <
-                       0x24 1
-                       0x28 1
-                       0x2c 1
-                       0x30 1
-                       0x34 1
-                       0x38 1
-                       0x3c 1
-                       0x40 1
-               >;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       sdh2_pins_2: pinmux-sdh2-2 {
-               pinctrl-single,pins = <0x64 1>;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0x208 0x388>;
-       };
-
-       sdh2_pins_3: pinmux-sdh2-3 {
-               pinctrl-single,pins = <0x5c 1>;
-               pinctrl-single,bias-pullup = <0xc000 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0x8000 0xa000 0x8000 0xa000>;
-               pinctrl-single,low-power-mode = <0x288 0x388>;
-       };
-
-       sdh2_pins_1_fast: pinmux-sdh2-1-fast {
-               pinctrl-single,pins = <
-                       0x24 1
-                       0x28 1
-                       0x2c 1
-                       0x30 1
-                       0x34 1
-                       0x38 1
-                       0x3c 1
-                       0x40 1
-               >;
-               pinctrl-single,drive-strength = <0x1800 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-
-       sdh2_pins_2_fast: pinmux-sdh2-2-fast {
-               pinctrl-single,pins = <0x64 1>;
-               pinctrl-single,drive-strength = <0x1800 0x1800>;
-               pinctrl-single,bias-pullup = <0 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0x208 0x388>;
-       };
-
-       sdh2_pins_3_fast: pinmux-sdh2-3-fast {
-               pinctrl-single,pins = <0x5c 1>;
-               pinctrl-single,drive-strength = <0x1800 0x1800>;
-               pinctrl-single,bias-pullup = <0xc000 0xc000 0 0xc000>;
-               pinctrl-single,bias-pulldown = <0x8000 0xa000 0x8000 0xa000>;
-               pinctrl-single,low-power-mode = <0x288 0x388>;
-       };
-
-       vibrator_pins: pinmux-vibrator {
-               pinctrl-single,pins = <0x12c 0>;
-               pinctrl-single,drive-strength = <0x1000 0x1800>;
-               pinctrl-single,bias-pullup = <0x8000 0xc000 0x8000 0xc000>;
-               pinctrl-single,bias-pulldown = <0xa000 0xa000 0 0xa000>;
-               pinctrl-single,input-schmitt = <0 0x30>;
-               pinctrl-single,input-schmitt-enable = <0x40 0 0x40 0x40>;
-               pinctrl-single,low-power-mode = <0 0x388>;
-       };
-};
-
-&uart0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart0_pins>;
-};

diff --git a/arch/arm/dts/pxa1908.dtsi b/arch/arm/dts/pxa1908.dtsi
index bb19cae30d79aa43860e7d20163ed468997d1386..8aeb40436b7018e996fd7f86c03cd3201a5aec53 100644 (file)
--- a/arch/arm/dts/pxa1908.dtsi
+++ b/arch/arm/dts/pxa1908.dtsi
@@ -96,41 +96,12 @@
                                reg-shift = <2>;
                        };
 
-                       pmx: pinmux@1e000 {
-                               compatible = "marvell,pxa1908-padconf", "pinconf-single";
-                               reg = <0x1e000 0x330>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-range-cells = <3>;
-                               ranges;
-
-                               #pinctrl-cells = <1>;
-                               pinctrl-single,register-width = <32>;
-                               pinctrl-single,function-mask = <7>;
-
-                               range: gpio-range {
-                                       #pinctrl-single,gpio-range-cells = <3>;
-                               };
-                       };
-
                        uart2: serial@36000 {
                                compatible = "ns16550";
                                reg = <0x36000 0x1000>;
                                clock-frequency = <117000000>;
                                reg-shift = <2>;
                        };
-
-                       apbcp: clock-controller@3b000 {
-                               compatible = "marvell,pxa1908-apbcp";
-                               reg = <0x3b000 0x1000>;
-                               #clock-cells = <1>;
-                       };
-
-                       mpmu: clock-controller@50000 {
-                               compatible = "marvell,pxa1908-mpmu";
-                               reg = <0x50000 0x1000>;
-                               #clock-cells = <1>;
-                       };
                };
        };
 };