Re: [PATCH 06/39] ARM: ux500: Move SDI (MMC) and UART devices under more descriptive heading

[Linus Walleij]

On Mon, Jun 10, 2013 at 11:17 AM, Lee Jones lee.jo...@linaro.org wrote:
 On Wed, 15 May 2013, Linus Walleij wrote:

 On Wed, May 15, 2013 at 11:51 AM, Lee Jones lee.jo...@linaro.org wrote:

  Now DMA DT bindings exist and are in use by he MMC and UART drivers, it
  should be possible to remove them from the auxdata structure. However,
  after doing so the drivers fail. Common clk is still reliant on the
  dev_name() call to do device name matching, which will fail due to the
  fact that Device Tree naming differs somewhat do the more traditional
  conventions.
 
  Reviewed-by: Linus Walleij linus.wall...@linaro.org
  Signed-off-by: Lee Jones lee.jo...@linaro.org

 Cannot be applied due to dependency on 5/39.

 I think this can be applied now (if it hasn't already).

I really need a clean mergebase for this to merge ...
This patch requires both the dma40 and devicetree
branches to land in a common place before it can be
applied.

I want the DMA40 branch to be closed down now as I
have sent all pull requests on it, so pls ping me again on
this when we have something in the ARM SoC tree we
can work on.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 06/39] ARM: ux500: Move SDI (MMC) and UART devices under more descriptive heading

[Lee Jones]

Now DMA DT bindings exist and are in use by he MMC and UART drivers, it
should be possible to remove them from the auxdata structure. However,
after doing so the drivers fail. Common clk is still reliant on the
dev_name() call to do device name matching, which will fail due to the
fact that Device Tree naming differs somewhat do the more traditional
conventions.

Reviewed-by: Linus Walleij linus.wall...@linaro.org
Signed-off-by: Lee Jones lee.jo...@linaro.org
---
 arch/arm/mach-ux500/cpu-db8500.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 96ddbae..b1c9241 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -230,15 +230,15 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] 
__initdata = {
/* Requires call-back bindings. */
OF_DEV_AUXDATA(arm,cortex-a9-pmu, 0, arm-pmu, db8500_pmu_platdata),
/* Requires DMA bindings. */
+   OF_DEV_AUXDATA(arm,pl022, 0x80002000, ssp0,  ssp0_plat),
+   /* Requires clock name bindings. */
OF_DEV_AUXDATA(arm,pl011, 0x8012, uart0, NULL),
OF_DEV_AUXDATA(arm,pl011, 0x80121000, uart1, NULL),
OF_DEV_AUXDATA(arm,pl011, 0x80007000, uart2, NULL),
-   OF_DEV_AUXDATA(arm,pl022, 0x80002000, ssp0,  ssp0_plat),
OF_DEV_AUXDATA(arm,pl18x, 0x80126000, sdi0,  NULL),
OF_DEV_AUXDATA(arm,pl18x, 0x80118000, sdi1,  NULL),
OF_DEV_AUXDATA(arm,pl18x, 0x80005000, sdi2,  NULL),
OF_DEV_AUXDATA(arm,pl18x, 0x80114000, sdi4,  NULL),
-   /* Requires clock name bindings. */
OF_DEV_AUXDATA(st,nomadik-gpio, 0x8012e000, gpio.0, NULL),
OF_DEV_AUXDATA(st,nomadik-gpio, 0x8012e080, gpio.1, NULL),
OF_DEV_AUXDATA(st,nomadik-gpio, 0x8000e000, gpio.2, NULL),
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html