From patchwork Wed Apr 20 16:13:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 66221 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2540622qge; Wed, 20 Apr 2016 09:14:13 -0700 (PDT) X-Received: by 10.194.94.231 with SMTP id df7mr10266262wjb.10.1461168853414; Wed, 20 Apr 2016 09:14:13 -0700 (PDT) Return-Path: Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com. [2a00:1450:400c:c09::230]) by mx.google.com with ESMTPS id gb1si6807937wjb.45.2016.04.20.09.14.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Apr 2016 09:14:13 -0700 (PDT) Received-SPF: pass (google.com: domain of peter.griffin@linaro.org designates 2a00:1450:400c:c09::230 as permitted sender) client-ip=2a00:1450:400c:c09::230; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of peter.griffin@linaro.org designates 2a00:1450:400c:c09::230 as permitted sender) smtp.mailfrom=peter.griffin@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x230.google.com with SMTP id v188so210240483wme.1 for ; Wed, 20 Apr 2016 09:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jYecKWyWHtTElBySx4LLCDK92q31VRFV31ftP8B3yBo=; b=BSnnfjugxYMrASFsNAtTfCX/HYN97WzcZexRwpxERH8qbnbYAhKda9BwNmX/k6dCX8 MJNX9EI0nHe1HLaDbFmNlJQwn3YPfRIZMrsg4q5/GfQeqpYo3JfN1IV8+pSIGVTnNa6Y Or/SedWTNrxfksB4MAzX1Cxgq8Me7Xx7raWlU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jYecKWyWHtTElBySx4LLCDK92q31VRFV31ftP8B3yBo=; b=C88M6pIllqj0WQd0VGHbjhCPKBwlP3cZ52+rE5YqeMZvfU7zV4VeKOjKAKU1bE45iP SkT0PZ1p43uayVCz7f31tJmpUB7yJv7oJDviLdXpsLKJK1gAP1lxHk6fd4RPeepsZ3te z/WIKNLzrDqdsIvtkesUfHDpPsnkmHjDos5PB0SkAMk5K+n8L4Rs7js5G3ocO/kM74lY i1bQ4wVeqG1qqBslnmL49W3aAIxvUwHq4OHU/JpNx3pSoryEwNIQRNzjPxfCg0Dyzk5H e8QI3bHdwn6hx6AiMYcibbs5hdxe8wbMANagVchJkp/m3A2t3ylIBP7k6tQfiAhBfK1O kwGg== X-Gm-Message-State: AOPr4FXhsh7xRALRCXyj2ikfi5k+K0+gsaT2PgCS/P/P288Q5e+kkgZHseLNwklLolJiHARBcIw= X-Received: by 10.28.152.210 with SMTP id a201mr31746486wme.95.1461168853166; Wed, 20 Apr 2016 09:14:13 -0700 (PDT) Return-Path: Received: from localhost.localdomain (cpc84787-aztw28-2-0-cust15.18-1.cable.virginm.net. [82.37.140.16]) by smtp.gmail.com with ESMTPSA id da5sm6353845wjb.25.2016.04.20.09.14.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Apr 2016 09:14:12 -0700 (PDT) From: Peter Griffin To: u-boot@lists.denx.de, albert.u.boot@aribaud.net, sjg@chromium.org, agraf@suse.de, trini@konsulko.com, liming.wang@canonical.com Cc: Peter Griffin Subject: [PATCH 3/7] ARM: hisilicon: hikey: Enable OF_CONTROL for hikey board. Date: Wed, 20 Apr 2016 17:13:59 +0100 Message-Id: <1461168843-15610-4-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461168843-15610-1-git-send-email-peter.griffin@linaro.org> References: <1461168843-15610-1-git-send-email-peter.griffin@linaro.org> Currently only the serial pl01x driver is using DT, and the other drivers still use platform data but as more DT lands in the upstream kernel the aim is to migrate the other drivers over to DT as well to have a fully DT configured hikey u-boot. Signed-off-by: Peter Griffin --- arch/arm/Kconfig | 1 + arch/arm/dts/Makefile | 2 ++ board/hisilicon/hikey/hikey.c | 3 +++ configs/hikey_defconfig | 1 + 4 files changed, 7 insertions(+) -- 1.9.1 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bf5e18a..fa506bb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -668,6 +668,7 @@ config TARGET_HIKEY select DM select DM_GPIO select DM_SERIAL + select OF_CONTROL help Support for HiKey 96boards platform. It features a HI6220 SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM. diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0da9e3b..4d1981c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -11,6 +11,8 @@ dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \ exynos4412-trats2.dtb \ exynos4412-odroid.dtb +dtb-$(CONFIG_TARGET_HIKEY) += hi6220-hikey.dtb + dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ exynos5250-snow.dtb \ exynos5250-spring.dtb \ diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 3b484a9..3f0a0cc 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -71,6 +71,8 @@ U_BOOT_DEVICES(hi6220_gpios) = { DECLARE_GLOBAL_DATA_PTR; +#if !CONFIG_IS_ENABLED(OF_CONTROL) + static const struct pl01x_serial_platdata serial_platdata = { #if CONFIG_CONS_INDEX == 1 .base = HI6220_UART0_BASE, @@ -87,6 +89,7 @@ U_BOOT_DEVICE(hikey_seriala) = { .name = "serial_pl01x", .platdata = &serial_platdata, }; +#endif static struct mm_region hikey_mem_map[] = { { diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig index 8b75642..e7b7496 100644 --- a/configs/hikey_defconfig +++ b/configs/hikey_defconfig @@ -3,3 +3,4 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPIO=y CONFIG_OF_LIBFDT=y +CONFIG_DEFAULT_DEVICE_TREE="hi6220-hikey"