From patchwork Fri Jan 11 09:24:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 13970 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3526323E27 for ; Fri, 11 Jan 2013 09:17:42 +0000 (UTC) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by fiordland.canonical.com (Postfix) with ESMTP id B66C6A189F5 for ; Fri, 11 Jan 2013 09:17:41 +0000 (UTC) Received: by mail-vc0-f171.google.com with SMTP id n11so1216930vch.16 for ; Fri, 11 Jan 2013 01:17:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-auditid:from:to:cc:subject:date:message-id:x-mailer :dlp-filter:x-mtr:x-brightmail-tracker:x-brightmail-tracker :x-cfilter-loop:x-gm-message-state; bh=HKdsLCJEvWUUx6hhGlYaOyufr7oB6t059BxTJxwp0iU=; b=P/7PQ2Ht3OGjAkwTt/BHDX/Y2g+GcdcBk9T6cscxz8qA7ij+JxXs4H6YgOd6EFNZtz 2vjk5M69MDA/NGqBFmK4O/UB21Lw2/v6o4oVYU9/X7zSI3WU02OBZQ2iIZrHLnZNgBqT fdA3ZOlJlRRyn3cK9Y5TZ654YWUHOjrksMOTEVT5K7IpQbBMc+CbvYl6QYIIFxTRp612 Cm/YqPs0qSmWCch7+HpgcJKjdG9BXpcLXLKlk+5K3zhWJj+1IVt3FxUetV6amr1HRpKI 3n3X2WLMcyHbekbFwSd9M9wiKZYEaLCsk1QYj4Zi8QuNGtjz81pw62iqQUuIbRWaOOQg VBaQ== X-Received: by 10.52.176.6 with SMTP id ce6mr81552707vdc.57.1357895861237; Fri, 11 Jan 2013 01:17:41 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp102867veb; Fri, 11 Jan 2013 01:17:40 -0800 (PST) X-Received: by 10.68.138.229 with SMTP id qt5mr223928948pbb.122.1357895859860; Fri, 11 Jan 2013 01:17:39 -0800 (PST) Received: from mailout4.samsung.com (mailout4.samsung.com. [203.254.224.34]) by mx.google.com with ESMTP id j9si4619055pay.202.2013.01.11.01.17.39; Fri, 11 Jan 2013 01:17:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of gautam.vivek@samsung.com designates 203.254.224.34 as permitted sender) client-ip=203.254.224.34; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of gautam.vivek@samsung.com designates 203.254.224.34 as permitted sender) smtp.mail=gautam.vivek@samsung.com Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MGG00EGHF3YM1X0@mailout4.samsung.com> for patches@linaro.org; Fri, 11 Jan 2013 18:17:38 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id A4.CD.12699.1B8DFE05; Fri, 11 Jan 2013 18:17:38 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-24-50efd8b1e0b3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 03.CD.12699.1B8DFE05; Fri, 11 Jan 2013 18:17:37 +0900 (KST) Received: from vivekkumarg-linuxpc.sisodomain.com ([107.108.73.134]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MGG00LKQF58X760@mmp2.samsung.com> for patches@linaro.org; Fri, 11 Jan 2013 18:17:37 +0900 (KST) From: Vivek Gautam To: u-boot@lists.denx.de Cc: patches@linaro.org, marex@denx.de, mk7.kang@samsung.com, sjg@chromium.org, kmpark@infradead.org, rajeshwari.s@samsung.com Subject: [PATCH] usb: ehci: exynos: Enable non-dt path Date: Fri, 11 Jan 2013 14:54:29 +0530 Message-id: <1357896269-4091-1-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.6.5 DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrELMWRmVeSWpSXmKPExsWyRsSkVnfTjfcBBmsmM1lMOfyFxYHR4861 PWwBjFFcNimpOZllqUX6dglcGTd3trEU3OaqeL7IvoHxJ0cXIyeHhICJxMPpB9kgbDGJC/fW A9lcHEICSxkljp1bywZTNKNpMgtEYjqjxIxt+6CqVjFJLH+7khWkik1AV6Lp7S5GEFtEQELi V/9VMJtZoF5iwf17zCC2sICZRP+uXqBmDg4WAVWJLyc4QExeAXeJ7YucIXYpSLy5/QysmkVA QOLb5EMsICUSArISmw4wg2yVENjCJrHn82FGiHpJiYMrbrBMYBRcwMiwilE0tSC5oDgpPddI rzgxt7g0L10vOT93EyMwoE7/eya9g3FVg8UhRgEORiUe3krN9wFCrIllxZW5hxglOJiVRHhr aoFCvCmJlVWpRfnxRaU5qcWHGH2ALpnILCWanA8M9rySeENjE3NTY1NLIyMzU1McwkrivIyn ngQICaQnlqRmp6YWpBbBjGPi4JRqYLQ/9vYh64asS/7zLgeKXmufXvQhz7n09+zFRhI5bTvE 6jPY5304PuXQvN4YZvUer3cKfGsF+rqbrf0zA/OW3GApY/fRji5b/iffcb7AyudHDqR9Wvyz OMqBN0Cte0pRvuKOqLO7M+ZdUbvgdipcUdEiIu/hntemZizZNvuW//1aPGeW6+01h5VYijMS DbWYi4oTAX4kizlVAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrILMWRmVeSWpSXmKPExsVy+t9jQd2NN94HGLz5qWsx5fAXFgdGjzvX 9rAFMEY1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXm AI1VUihLzCkFCgUkFhcr6dthmhAa4qZrAdMYoesbEgTXY2SABhLWMGbc3NnGUnCbq+L5IvsG xp8cXYycHBICJhIzmiazQNhiEhfurWfrYuTiEBKYzigxY9s+KGcVk8TytytZQarYBHQlmt7u YgSxRQQkJH71XwWzmQXqJRbcv8cMYgsLmEn07+oFaubgYBFQlfhyggPE5BVwl9i+yBlil4LE m9vPmCcwci9gZFjFKJpakFxQnJSea6RXnJhbXJqXrpecn7uJERyuz6R3MK5qsDjEKMDBqMTD W6n5PkCINbGsuDL3EKMEB7OSCG9NLVCINyWxsiq1KD++qDQntfgQow/Q7onMUqLJ+cBYyiuJ NzQ2MTc1NrU0sTAxs8QhrCTOy3jqSYCQQHpiSWp2ampBahHMOCYOTqkGxgm7Q6cu+9K5oTxI 6P4fPoctFQ7bIm47lvbFSh7Qujrx2eX2Tyx+vnZc1TL5Nk/99x82ydl+06z80IUAEfu2HvP5 Lf2ivufOBjQoBN/bqH6kuu79YvFj0wsXWHg1nMzcdGfytlU1bO2r1i3c0r2u2vfIZ7dOMe+r B3TSz6z6Nle4egZTi8Gd2UosxRmJhlrMRcWJAOaVdvmEAgAA X-CFilter-Loop: Reflected X-Gm-Message-State: ALoCoQkRU9gZj0mcOE/fMpp2kxnAYHbRrUvqshaQ1Y0GZc0VJNCbUBrxYd/xFczncXbNzygAkbvR Enabling the non-dt path for the driver so that we don't get any build errors for non-dt configuration. Signed-off-by: Vivek Gautam Acked-by: Simon Glass --- Earlier we had moved to fdt support for ehci-exynos driver, but missed out the non-dt path. Although this driver serves for exysno5 onward only but better to keep the non-dt path also available. drivers/usb/host/ehci-exynos.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 3ca4c5c..6f0c6c3 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -153,7 +153,12 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) return -ENOMEM; } +#ifdef CONFIG_OF_CONTROL exynos_usb_parse_dt(gd->fdt_blob, exynos); +#else + exynos->usb = (struct exynos_usb_phy *)samsung_get_base_usb_phy(); + exynos->hcd = samsung_get_base_usb_ehci(); +#endif setup_usb_phy(exynos->usb); @@ -185,7 +190,12 @@ int ehci_hcd_stop(int index) return -ENOMEM; } +#ifdef CONFIG_OF_CONTROL exynos_usb_parse_dt(gd->fdt_blob, exynos); +#else + exynos->usb = (struct exynos_usb_phy *)samsung_get_base_usb_phy(); + exynos->hcd = samsung_get_base_usb_ehci(); +#endif reset_usb_phy(exynos->usb);