omap device tree changes for v3.15, part 3

Hi,

Resending these two, looks like my updated scripts have some issues hitting the mailing lists..

The following changes since commit 18c49af3ee9e32a535413a949672bea726699f04:

ARM: dts: am335x-evmsk: enable dual_emac mode (2014-03-05 11:53:36 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-part3

for you to fetch changes up to e1902bbe44844597a38c8cbae30ca895f6e126ee:

ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530 (2014-03-12 10:40:37 -0700)

----------------------------------------------------------------
Device tree related changes to the omap iommu driver as that is finally getting updated. Also few trivial board related .dts updates to add more devices.

----------------------------------------------------------------
Florian Vaussard (4):
ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2
ARM: dts: OMAP3: Update ISP IOMMU node
ARM: dts: OMAP3: Add IVA IOMMU node
ARM: dts: OMAP4: Add IOMMU nodes

Stefan Roese (1):
ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530

Suman Anna (6):
ARM: OMAP3: fix iva mmu programming issues
ARM: OMAP2+: change the ISP device archdata MMU name for DT
ARM: OMAP2+: use pdata quirks for iommu reset lines
ARM: OMAP5: hwmod data: add mmu data for ipu & dsp
ARM: OMAP2+: extend iommu pdata-quirks to OMAP5
ARM: dts: OMAP5: Add IOMMU nodes

Yegor Yefremov (1):
ARM: dts: am335x-evmsk: enable DMA controller for USB

 arch/arm/boot/dts/am335x-evmsk.dts          |  4 ++
 arch/arm/boot/dts/omap3-cm-t3530.dts        | 36 +++++++++++++
 arch/arm/boot/dts/omap3.dtsi                | 15 ++++--
 arch/arm/boot/dts/omap4.dtsi                | 15 ++++++
 arch/arm/boot/dts/omap5.dtsi                | 15 ++++++
 arch/arm/mach-omap2/clockdomains3xxx_data.c |  2 +-
 arch/arm/mach-omap2/devices.c               |  3 ++
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c  | 12 ++---
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c  | 83 +++++++++++++++++++++++++++++
 arch/arm/mach-omap2/pdata-quirks.c          | 24 +++++++++
 arch/arm/plat-omap/Kconfig                  |  3 --
 11 files changed, 197 insertions(+), 15 deletions(-)

The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691:

Linux 3.14-rc4 (2014-02-23 17:40:03 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-overo-signed

for you to fetch changes up to 28b191118c11719bb27db621425a70be28a40e08:

ARM: dts: Add support for the Overo Summit (2014-03-12 10:21:16 -0700)

----------------------------------------------------------------
Updates to the .dts files to support more Gumstix boards.

These are sent separately from the rest of the .dts changes as these depend on the fixes merged into v3.14-rc4, and needed a bit more time to get updated on the fixes.

----------------------------------------------------------------
Florian Vaussard (16):
ARM: dts: overo: reorganize include files
ARM: dts: omap3-tobi: Add missing pinctrl
ARM: dts: omap3-overo: Add missing pinctrl
ARM: dts: omap3-overo: Enable WiFi/BT combo
ARM: dts: omap3-overo: Add HSUSB PHY
ARM: dts: omap: Add common file for SMSC9221
ARM: dts: omap3-tobi: Use include file omap-gpmc-smsc9221
ARM: dts: omap3-tobi: Add AT24C01 EEPROM
ARM: dts: overo: Push uart3 pinmux down to expansion board
ARM: dts: overo: Create a file for common Gumstix peripherals
ARM: dts: overo: Add LIS33DE accelerometer
ARM: dts: Add support for the Overo Palo43
ARM: dts: Add support for the Overo Gallop43
ARM: dts: Add support for the Overo Alto35
ARM: dts: Add support for the Overo Chestnut43
ARM: dts: Add support for the Overo Summit

 arch/arm/boot/dts/Makefile                         |  10 +
 arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi          |  58 ++++++
 arch/arm/boot/dts/omap3-overo-alto35-common.dtsi   |  77 +++++++
 arch/arm/boot/dts/omap3-overo-alto35.dts           |  22 ++
 arch/arm/boot/dts/omap3-overo-base.dtsi            | 221 +++++++++++++++++++++
 .../boot/dts/omap3-overo-chestnut43-common.dtsi    |  69 +++++++
 arch/arm/boot/dts/omap3-overo-chestnut43.dts       |  38 ++++
 .../boot/dts/omap3-overo-common-peripherals.dtsi   |  94 +++++++++
 arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi |  57 ++++++
 arch/arm/boot/dts/omap3-overo-gallop43.dts         |  38 ++++
 arch/arm/boot/dts/omap3-overo-palo43-common.dtsi   |  53 +++++
 arch/arm/boot/dts/omap3-overo-palo43.dts           |  38 ++++
 arch/arm/boot/dts/omap3-overo-storm-alto35.dts     |  21 ++
 arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts |  38 ++++
 arch/arm/boot/dts/omap3-overo-storm-gallop43.dts   |  38 ++++
 arch/arm/boot/dts/omap3-overo-storm-palo43.dts     |  38 ++++
 arch/arm/boot/dts/omap3-overo-storm-summit.dts     |  30 +++
 arch/arm/boot/dts/omap3-overo-storm-tobi.dts       |   2 +-
 arch/arm/boot/dts/omap3-overo-storm.dtsi           |  35 ++++
 arch/arm/boot/dts/omap3-overo-summit-common.dtsi   |  31 +++
 arch/arm/boot/dts/omap3-overo-summit.dts           |  30 +++
 arch/arm/boot/dts/omap3-overo-tobi-common.dtsi     |  51 +----
 arch/arm/boot/dts/omap3-overo-tobi.dts             |   2 +-
 arch/arm/boot/dts/omap3-overo.dtsi                 |  97 ++-------
 24 files changed, 1063 insertions(+), 125 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-overo-alto35.dts
 create mode 100644 arch/arm/boot/dts/omap3-overo-base.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-overo-chestnut43.dts
 create mode 100644 arch/arm/boot/dts/omap3-overo-common-peripherals.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-overo-gallop43.dts
 create mode 100644 arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-overo-palo43.dts
 create mode 100644 arch/arm/boot/dts/omap3-overo-storm-alto35.dts
 create mode 100644 arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts
 create mode 100644 arch/arm/boot/dts/omap3-overo-storm-gallop43.dts
 create mode 100644 arch/arm/boot/dts/omap3-overo-storm-palo43.dts
 create mode 100644 arch/arm/boot/dts/omap3-overo-storm-summit.dts
 create mode 100644 arch/arm/boot/dts/omap3-overo-storm.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-overo-summit-common.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-overo-summit.dts

Pulled into next/dt, thanks!

I had a trivial merge conflict in omap3-overo.dtsi that I resolved as below.

Arnd

diff --cc arch/arm/boot/dts/omap3-overo.dtsi
index b08142f,c37b130..69ca7c4
@@@ -91,11 -33,3 +33,6 @@@
        };
  };
  
- &uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart3_pins>;
- };
- 
 +&mcbsp2 {
 +      status = "okay";
 +};

Pulled into next/dt, thanks!

I haven't really been following the iommu discussions, so I have to trust you are doing the right thing here. What is the status on iommu support through DT? Do we have or require a generic binding for iommus? Are you following that, or will you have to do incompatible changes to do that?

Arnd

Thanks, looks like the merge ddf071148934047b1e87bf89e823e74f267f0b84 introduces a build failure though:

@@@ -22,8 -23,7 +23,7 @@@
#include "common-board-devices.h"
#include "dss-common.h"
#include "control.h"
- #include "omap-secure.h"
-#include "omap_device.h"
+#include "soc.h"

  struct pdata_init {
        const char *compatible;

Those need to be added back to keep things building.

There are certainly various things that could be improved in the drivers/iommu, just doing grep EXPORT_SYMBOL drivers/iommu shows quite a few things that should probably be implemented in a generic way.

Currently the bindings don't do much, but could probably be simplified further. Things like ti,#tlb-entries and ti,iommu-bus-err-back may not even be needed and could be set by the driver match .data based on the compatible flag alone.

This set contains the independent SoC related changes related to get things moving for the drivers/iommu changes as discussed here:

http://www.spinics.net/lists/arm-kernel/msg312144.html

Some things like reset are still being done using platform_data with a promise of future patches:

http://www.spinics.net/lists/linux-omap/msg104328.html

I'm not following too closely on the drivers/iommu parts, mostly following just the moving away from platform data part at this point. Suman can probably describe what needs to be done more accurately.

Regards,

Tony

Hi Arnd, Tony,

Yes, Laurent is working towards removing omap-iovmm.c completely and started a discussion/cleanup series towards thats[1]. I expect some of the other export symbols for OMAP to also vanish slowly once iovmm is removed.

Yeah, I was in fact looking for feedback on exactly these properties [2]. I haven't removed this as the only feedback I got was positive for the changes [3].

I am not expecting any changes to bindings as this series is mainly adding the OMAP iommu DT nodes and having the OMAP IOMMU driver functional with the DT-based IOMMU devices. We are yet to add any DTS client devices use IOMMU.

regards
Suman

[1] http://marc.info/?l=linux-omap&m=139423949120188&w=2
[2] http://marc.info/?l=linux-omap&m=139231544416973&w=2
[3] http://marc.info/?l=linux-omap&m=139338074931831&w=2