From patchwork Fri Jun 7 10:05:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 2686261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id EB87DDFB78 for ; Fri, 7 Jun 2013 10:39:31 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UktZq-0006yC-G3; Fri, 07 Jun 2013 10:07:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UktYl-00082B-WF; Fri, 07 Jun 2013 10:06:16 +0000 Received: from bear.ext.ti.com ([192.94.94.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UktYf-00081Y-Rm for linux-arm-kernel@lists.infradead.org; Fri, 07 Jun 2013 10:06:13 +0000 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r57A5j7M032149; Fri, 7 Jun 2013 05:05:45 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r57A5jJH007734; Fri, 7 Jun 2013 05:05:45 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Fri, 7 Jun 2013 05:05:45 -0500 Received: from [172.24.68.3] (h68-3.vpn.ti.com [172.24.68.3]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r57A5iVQ003425; Fri, 7 Jun 2013 05:05:44 -0500 Message-ID: <51B1B078.9000401@ti.com> Date: Fri, 7 Jun 2013 13:05:44 +0300 From: Tomi Valkeinen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Tony Lindgren Subject: Re: [PATCH 0/6] Drop legacy booting for omap4 for v3.11, boot with device tree only References: <20130517191304.468.73487.stgit@localhost> In-Reply-To: <20130517191304.468.73487.stgit@localhost> X-Enigmail-Version: 1.5.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130607_060609_985281_06400045 X-CRM114-Status: GOOD ( 24.19 ) X-Spam-Score: -7.4 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [192.94.94.41 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi, On 17/05/13 22:17, Tony Lindgren wrote: > Hi all, > > Here are patches against v3.10-rc1 to drop omap4 legacy booting as > things are now working well enough for booting omap4 with device > tree. > > We already have am33xx and omap5 booting with device tree only, > and converting omap4 is relatively easy with just two board-*.c > files merged as we have not accepted any new board-*.c files for > quite some time now. > > By working "well enough" I mean that I can use my omap4 panda-es > with device tree with a Motorola LapDock with HDMI, DVI, HID, USB > and WLAN using v3.10-rc1 and the patches in this series plus some > extra patches that are driver related. > > Of course some things will need more work, like PM. But that > has not yet been fully working for omap4 anyways, and that > work can now be combined with omap5 PM work to some extent. You can also add the one below to this series. Tomi From d22837262b59ad381feb215496fafe3fe399972f Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 7 Jun 2013 13:01:05 +0300 Subject: [PATCH] ARM: OMAP2+: Remove legacy DSS initialization for omap4 This is no longer needed as omap4 is now booted using device tree. Signed-off-by: Tomi Valkeinen --- arch/arm/mach-omap2/dss-common.c | 47 ---------------------------------------- arch/arm/mach-omap2/dss-common.h | 2 -- 2 files changed, 49 deletions(-) diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c index 393aeef..43ec787 100644 --- a/arch/arm/mach-omap2/dss-common.c +++ b/arch/arm/mach-omap2/dss-common.c @@ -80,24 +80,6 @@ static struct omap_dss_board_info omap4_panda_dss_data = { .default_device = &omap4_panda_dvi_device, }; -void __init omap4_panda_display_init(void) -{ - omap_display_init(&omap4_panda_dss_data); - - /* - * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and - * later have external pull up on the HDMI I2C lines - */ - if (cpu_is_omap446x() || omap_rev() > OMAP4430_REV_ES2_2) - omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP); - else - omap_hdmi_init(0); - - omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT); - omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT); - omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN); -} - void __init omap4_panda_display_init_of(void) { omap_display_init(&omap4_panda_dss_data); @@ -204,35 +186,6 @@ static struct omap_dss_board_info sdp4430_dss_data = { * used by picodlp on the 4430sdp platform. Keep this gpio disabled as LCD2 is * selected by default */ -void __init omap_4430sdp_display_init(void) -{ - int r; - - r = gpio_request_one(DISPLAY_SEL_GPIO, GPIOF_OUT_INIT_HIGH, - "display_sel"); - if (r) - pr_err("%s: Could not get display_sel GPIO\n", __func__); - - r = gpio_request_one(DLP_POWER_ON_GPIO, GPIOF_OUT_INIT_LOW, - "DLP POWER ON"); - if (r) - pr_err("%s: Could not get DLP POWER ON GPIO\n", __func__); - - omap_display_init(&sdp4430_dss_data); - /* - * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and - * later have external pull up on the HDMI I2C lines - */ - if (cpu_is_omap446x() || omap_rev() > OMAP4430_REV_ES2_2) - omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP); - else - omap_hdmi_init(0); - - omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT); - omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT); - omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN); -} - void __init omap_4430sdp_display_init_of(void) { int r; diff --git a/arch/arm/mach-omap2/dss-common.h b/arch/arm/mach-omap2/dss-common.h index 915f6ff..c28fe3c 100644 --- a/arch/arm/mach-omap2/dss-common.h +++ b/arch/arm/mach-omap2/dss-common.h @@ -6,9 +6,7 @@ * This file will be removed when DSS supports DT. */ -void __init omap4_panda_display_init(void); void __init omap4_panda_display_init_of(void); -void __init omap_4430sdp_display_init(void); void __init omap_4430sdp_display_init_of(void); #endif