Merge commit 'kumar/kumar-for-2.6.28'

diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index de4063cb4fdc0ad6abea29d766cae78616837311..02ea9a971b8e5a7b0b33ebcf7e8f56be7c36ac1c 100644 (file)
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -1917,6 +1917,8 @@ platforms are moved over to use the flattened-device-tree model.
                        inverse clock polarity (CPOL) mode
     - spi-cpha        - (optional) Empty property indicating device requires
                        shifted clock phase (CPHA) mode
+    - spi-cs-high     - (optional) Empty property indicating device requires
+                       chip select active high
 
     SPI example for an MPC5200 SPI bus:
                spi@f00 {

diff --git a/Documentation/powerpc/dts-bindings/fsl/board.txt b/Documentation/powerpc/dts-bindings/fsl/board.txt
index 74ae6f1cd2d6e3cdb313295f9d0fc55124583ec2..81a917ef96e9afbeb609fd6984f8f0eaa1b316d2 100644 (file)
--- a/Documentation/powerpc/dts-bindings/fsl/board.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/board.txt
@@ -2,13 +2,13 @@
 
 Required properties:
 
- - device_type : Should be "board-control"
+ - compatible : Should be "fsl,<board>-bcsr"
  - reg : Offset and length of the register set for the device
 
 Example:
 
        bcsr@f8000000 {
-               device_type = "board-control";
+               compatible = "fsl,mpc8360mds-bcsr";
                reg = <f8000000 8000>;
        };
 

diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index 7449e54c1a908d46e780aa5815c4ef83b71551bb..6b850670de1df9da01b043dac83dea9c3afa550d 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -121,6 +121,14 @@
                                compatible = "dallas,ds1339";
                                reg = <0x68>;
                        };
+
+                       mcu_pio: mcu@a {
+                               #gpio-cells = <2>;
+                               compatible = "fsl,mc9s08qg8-mpc8315erdb",
+                                            "fsl,mcu-mpc8349emitx";
+                               reg = <0x0a>;
+                               gpio-controller;
+                       };
                };
 
                spi@7000 {

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index e4cc1768f24165b56446ce5b06a0d4d422f64bbf..57c595bf10717f23036a9d292b6025c26f273afa 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -60,7 +60,7 @@
        };
 
        bcsr@f8000000 {
-               device_type = "board-control";
+               compatible = "fsl,mpc8323mds-bcsr";
                reg = <0xf8000000 0x8000>;
        };
 

diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 5cedf373a1d802e39aba5c21e232b49db2ed71a6..2c9d54a35bc312e8286812a67507e7a71e9f9141 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -83,6 +83,14 @@
                        interrupts = <15 0x8>;
                        interrupt-parent = <&ipic>;
                        dfsrr;
+
+                       rtc@68 {
+                               device_type = "rtc";
+                               compatible = "dallas,ds1339";
+                               reg = <0x68>;
+                               interrupts = <18 0x8>;
+                               interrupt-parent = <&ipic>;
+                       };
                };
 
                spi@7000 {
@@ -131,6 +139,14 @@
                                interrupt-parent = <&ipic>;
                                interrupts = <71 8>;
                        };
+
+                       mcu_pio: mcu@a {
+                               #gpio-cells = <2>;
+                               compatible = "fsl,mc9s08qg8-mpc8349emitx",
+                                            "fsl,mcu-mpc8349emitx";
+                               reg = <0x0a>;
+                               gpio-controller;
+                       };
                };
 
                usb@22000 {

diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index 81ae1d3e9440ad06be3e14eeb9cb10ce544ae659..fa40647ee62e9bb74ef363ff6c2c9962b8a6dac2 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -81,6 +81,14 @@
                        interrupts = <15 0x8>;
                        interrupt-parent = <&ipic>;
                        dfsrr;
+
+                       rtc@68 {
+                               device_type = "rtc";
+                               compatible = "dallas,ds1339";
+                               reg = <0x68>;
+                               interrupts = <18 0x8>;
+                               interrupt-parent = <&ipic>;
+                       };
                };
 
                spi@7000 {

diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 04bfde3ea605b2ec64cc528c0e64341e89ff8c33..c986c541e9bba8b9d013ede8db8e2017dc9ee6ee 100644 (file)
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -49,7 +49,7 @@
        };
 
        bcsr@e2400000 {
-               device_type = "board-control";
+               compatible = "fsl,mpc8349mds-bcsr";
                reg = <0xe2400000 0x8000>;
        };
 

diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 66a12d2631fbd4e39b93e3d6c351ed820703d6c9..14534d04e4db1cf1e9709184754e9278011c0531 100644 (file)
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -69,7 +69,7 @@
                };
 
                bcsr@1,0 {
-                       device_type = "board-control";
+                       compatible = "fsl,mpc8360mds-bcsr";
                        reg = <1 0 0x8000>;
                };
        };

diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
index 53191ba67aaa3a1d2493fb8a251b0f437efff167..435ef3dd022d0f3614f85e7bbcffced5c0102cd7 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -121,6 +121,14 @@
                                compatible = "dallas,ds1339";
                                reg = <0x68>;
                        };
+
+                       mcu_pio: mcu@a {
+                               #gpio-cells = <2>;
+                               compatible = "fsl,mc9s08qg8-mpc8377erdb",
+                                            "fsl,mcu-mpc8349emitx";
+                               reg = <0x0a>;
+                               gpio-controller;
+                       };
                };
 
                i2c@3100 {

diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 4a09153d160c90967b5b27a0bcfe52cc49561251..b11e68f56a0612d302ce61bee6d2c56f03f01f3b 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -121,6 +121,14 @@
                                compatible = "dallas,ds1339";
                                reg = <0x68>;
                        };
+
+                       mcu_pio: mcu@a {
+                               #gpio-cells = <2>;
+                               compatible = "fsl,mc9s08qg8-mpc8378erdb",
+                                            "fsl,mcu-mpc8349emitx";
+                               reg = <0x0a>;
+                               gpio-controller;
+                       };
                };
 
                i2c@3100 {

diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index bbd884ac9dc0e3f84a487f2edb6277416b008cd8..337af6ea26d3817247543fa94ddddba9ee135ee9 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -121,6 +121,14 @@
                                compatible = "dallas,ds1339";
                                reg = <0x68>;
                        };
+
+                       mcu_pio: mcu@a {
+                               #gpio-cells = <2>;
+                               compatible = "fsl,mc9s08qg8-mpc8379erdb",
+                                            "fsl,mcu-mpc8349emitx";
+                               reg = <0x0a>;
+                               gpio-controller;
+                       };
                };
 
                i2c@3100 {

diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
index 93fdd99901b6e61c9909542ec30338df5b0d8cd8..35db1e5440c7631928562337ac2f043f82e6f55a 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8536ds.dts
+++ b/arch/powerpc/boot/dts/mpc8536ds.dts
@@ -109,7 +109,7 @@
                                reg = <0x0 0x80>;
                                cell-index = <0>;
                                interrupt-parent = <&mpic>;
-                               interrupts = <14 0x2>;
+                               interrupts = <20 2>;
                        };
                        dma-channel@80 {
                                compatible = "fsl,mpc8536-dma-channel",
@@ -117,7 +117,7 @@
                                reg = <0x80 0x80>;
                                cell-index = <1>;
                                interrupt-parent = <&mpic>;
-                               interrupts = <15 0x2>;
+                               interrupts = <21 2>;
                        };
                        dma-channel@100 {
                                compatible = "fsl,mpc8536-dma-channel",
@@ -125,7 +125,7 @@
                                reg = <0x100 0x80>;
                                cell-index = <2>;
                                interrupt-parent = <&mpic>;
-                               interrupts = <16 0x2>;
+                               interrupts = <22 2>;
                        };
                        dma-channel@180 {
                                compatible = "fsl,mpc8536-dma-channel",
@@ -133,7 +133,7 @@
                                reg = <0x180 0x80>;
                                cell-index = <3>;
                                interrupt-parent = <&mpic>;
-                               interrupts = <17 0x2>;
+                               interrupts = <23 2>;
                        };
                };
 
@@ -180,7 +180,7 @@
                enet0: ethernet@24000 {
                        cell-index = <0>;
                        device_type = "network";
-                       model = "TSEC";
+                       model = "eTSEC";
                        compatible = "gianfar";
                        reg = <0x24000 0x1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
@@ -193,7 +193,7 @@
                enet1: ethernet@26000 {
                        cell-index = <1>;
                        device_type = "network";
-                       model = "TSEC";
+                       model = "eTSEC";
                        compatible = "gianfar";
                        reg = <0x26000 0x1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index a15f10343f53fa4238b9e0d9d4169a4e9388450d..c80158f7741db22f93c3f969492c10c706e18bb1 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -52,7 +52,7 @@
        };
 
        bcsr@f8000000 {
-               device_type = "board-control";
+               compatible = "fsl,mpc8568mds-bcsr";
                reg = <0xf8000000 0x8000>;
        };
 

diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index e124dd18fb5aec09d5d26074e1887729d491e1aa..cadd4652a69556a8eb496449b3d3f15e0d4928fb 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -13,8 +13,8 @@
 / {
        model = "fsl,MPC8572DS";
        compatible = "fsl,MPC8572DS";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       #address-cells = <2>;
+       #size-cells = <2>;
 
        aliases {
                ethernet0 = &enet0;
@@ -61,7 +61,6 @@
 
        memory {
                device_type = "memory";
-               reg = <0x0 0x0>;        // Filled by U-Boot
        };
 
        soc8572@ffe00000 {
@@ -69,8 +68,8 @@
                #size-cells = <1>;
                device_type = "soc";
                compatible = "simple-bus";
-               ranges = <0x0 0xffe00000 0x100000>;
-               reg = <0xffe00000 0x1000>;      // CCSRBAR & soc regs, remove once parse code for immrbase fixed
+               ranges = <0x0 0 0xffe00000 0x100000>;
+               reg = <0 0xffe00000 0 0x1000>;  // CCSRBAR & soc regs, remove once parse code for immrbase fixed
                bus-frequency = <0>;            // Filled out by uboot.
 
                memory-controller@2000 {
@@ -351,10 +350,10 @@
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
-               reg = <0xffe08000 0x1000>;
+               reg = <0 0xffe08000 0 0x1000>;
                bus-range = <0 255>;
-               ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-                         0x1000000 0x0 0x0 0xffc00000 0x0 0x10000>;
+               ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
+                         0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x00010000>;
                clock-frequency = <33333333>;
                interrupt-parent = <&mpic>;
                interrupts = <24 2>;
@@ -561,10 +560,10 @@
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
-               reg = <0xffe09000 0x1000>;
+               reg = <0 0xffe09000 0 0x1000>;
                bus-range = <0 255>;
-               ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-                         0x1000000 0x0 0x0 0xffc10000 0x0 0x10000>;
+               ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
+                         0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x00010000>;
                clock-frequency = <33333333>;
                interrupt-parent = <&mpic>;
                interrupts = <26 2>;
@@ -598,10 +597,10 @@
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
-               reg = <0xffe0a000 0x1000>;
+               reg = <0 0xffe0a000 0 0x1000>;
                bus-range = <0 255>;
-               ranges = <0x2000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000
-                         0x1000000 0x0 0x0 0xffc20000 0x0 0x10000>;
+               ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000
+                         0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x00010000>;
                clock-frequency = <33333333>;
                interrupt-parent = <&mpic>;
                interrupts = <27 2>;

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 8164de1f4d72aba3a411f88f5d187e6d0c137f16..228f75723063968c4e77fbb374e5421e5c87e393 100644 (file)
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -423,7 +423,6 @@ static const struct i2c_adapter cpm_ops = {
        .owner          = THIS_MODULE,
        .name           = "i2c-cpm",
        .algo           = &cpm_i2c_algo,
-       .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
 };
 
 static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm)

diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c
index b01eec026f68b3f8765bd50d35070757b1795785..bed0ed6dcdc1329259c58a72e2b697bfbd72e091 100644 (file)
--- a/drivers/of/of_spi.c
+++ b/drivers/of/of_spi.c
@@ -61,6 +61,8 @@ void of_register_spi_devices(struct spi_master *master, struct device_node *np)
                        spi->mode |= SPI_CPHA;
                if (of_find_property(nc, "spi-cpol", NULL))
                        spi->mode |= SPI_CPOL;
+               if (of_find_property(nc, "spi-cs-high", NULL))
+                       spi->mode |= SPI_CS_HIGH;
 
                /* Device speed */
                prop = of_get_property(nc, "spi-max-frequency", &len);