Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759612Ab3EOQsP (ORCPT ); Wed, 15 May 2013 12:48:15 -0400 Received: from mail-ie0-f171.google.com ([209.85.223.171]:63356 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758912Ab3EOQsM (ORCPT ); Wed, 15 May 2013 12:48:12 -0400 MIME-Version: 1.0 In-Reply-To: <1368611522-9984-5-git-send-email-lee.jones@linaro.org> References: <1368611522-9984-1-git-send-email-lee.jones@linaro.org> <1368611522-9984-5-git-send-email-lee.jones@linaro.org> Date: Wed, 15 May 2013 18:48:12 +0200 Message-ID: Subject: Re: [PATCH 04/39] ARM: ux500: Stop passing UART's platform data for Device Tree boots From: Linus Walleij To: Lee Jones Cc: "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Felipe Balbi , "linux-usb@vger.kernel.org" , "linux-crypto@vger.kernel.org" , "David S. Miller" , Herbert Xu , Vinod Koul , Arnd Bergmann , Linus WALLEIJ , Srinidhi KASAGAR Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1941 Lines: 40 On Wed, May 15, 2013 at 11:51 AM, Lee Jones wrote: > It was required to pass DMA channel configuration information to the > UART driver before the new DMA API was in place. Now that it is, and > is fully compatible with Device Tree we can stop doing that. > > Reviewed-by: Linus Walleij > Signed-off-by: Lee Jones > --- > arch/arm/mach-ux500/cpu-db8500.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c > index 38ebf2b..9b26fe2 100644 > --- a/arch/arm/mach-ux500/cpu-db8500.c > +++ b/arch/arm/mach-ux500/cpu-db8500.c > @@ -230,9 +230,9 @@ 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,pl011", 0x80120000, "uart0", &uart0_plat), > - OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", &uart1_plat), > - OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", &uart2_plat), > + OF_DEV_AUXDATA("arm,pl011", 0x80120000, "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", &mop500_sdi0_data), > OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", &mop500_sdi1_data), OK dma_request_slave_channel() is upstream in the PL011 driver, so applied! Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/