| commit | b01928a41f73f4c020892ff36c7d2a47cd9f8704 | |
| author | Olof Johansson <olof@lixom.net> | |
| Tue, 29 Oct 2013 19:41:43 +0000 (29 12:41 -0700) | ||
| committer | Olof Johansson <olof@lixom.net> | |
| Tue, 29 Oct 2013 19:41:43 +0000 (29 12:41 -0700) | ||
| tree | 0eae1822139d6b9f1f03150a2f7f531c8c7e0d45 | treesnapshot (tar.gz zip) |
| parent | 5f55c317e4a8cd5c0a70a896886914e1b09d8bd7 | commitdiff |
| parent | 7a54a4baf0a319ccf7796f54f7848d207b84c553 | commitdiff |
Merge branch 'sirf/dt' into next/dt
From Barry Song:
Some missed dt nodes for sirf dts for 3.13. Among them:
- add missed chhifbg node in prima2 and atlas6 dts
- add missed cell, cs and dma channel for SPI nodes
- add missed graphics2d iobg in atlas6 dts
- add missed address-cells and size-cells for prima2 I2C
- add missed memcontrol-monitor node in prima2 and atlas6 dts
* sirf/dt:
ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
Signed-off-by: Olof Johansson <olof@lixom.net>
From Barry Song:
Some missed dt nodes for sirf dts for 3.13. Among them:
- add missed chhifbg node in prima2 and atlas6 dts
- add missed cell, cs and dma channel for SPI nodes
- add missed graphics2d iobg in atlas6 dts
- add missed address-cells and size-cells for prima2 I2C
- add missed memcontrol-monitor node in prima2 and atlas6 dts
* sirf/dt:
ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
Signed-off-by: Olof Johansson <olof@lixom.net>