From patchwork Mon Aug 22 22:48:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 74474 Delivered-To: patches@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1800064qga; Mon, 22 Aug 2016 15:48:16 -0700 (PDT) X-Received: by 10.98.95.129 with SMTP id t123mr47421535pfb.148.1471906094985; Mon, 22 Aug 2016 15:48:14 -0700 (PDT) Return-Path: Received: from mail-pf0-x232.google.com (mail-pf0-x232.google.com. [2607:f8b0:400e:c00::232]) by mx.google.com with ESMTPS id u2si281395paw.283.2016.08.22.15.48.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Aug 2016 15:48:14 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::232 as permitted sender) client-ip=2607:f8b0:400e:c00::232; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::232 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x232.google.com with SMTP id p64so36601896pfb.1 for ; Mon, 22 Aug 2016 15:48:14 -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=ijP4PWTS8QKz+u5ASQt8AIvtxrpaGVwLsNeUBuXhIR0=; b=UwhpjjDaVIVq63F8Jhw2OItkpkycMUfpqESisqFa1dLJCCuHw7kzgMTdxcjfkU3XYJ icJVFt/zMRXbv+9xheUmvyG7YrNr+3x/6G0hiPRB4+tjCwolGz9NlKzUdcr9T6rdVI3b F8GYsgQJbczztNqF04ab0SL8cXsRhK6vHjL8Y= 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=ijP4PWTS8QKz+u5ASQt8AIvtxrpaGVwLsNeUBuXhIR0=; b=YYBFP676qkRm8NhyZVlaJQNJj0zj+LAXLI6g6NRcfMnCskF4Iwo3wRI6beL2MjjxB8 v4Z3i1xSsHPpmDPmZiHf7qnAnC9CeosQ7HoqMWDdrOfx6vTMVDM4ElJ9y1ft3vhpvhzf bbBaXNqrkRPeKgcLBpBAVTZNqftq90HtQM9iyE8lcwVlI/dZzEnQpE9a4bNB4/bhhInr 0n4kL6q4z0tFQ5IAGPXU+0ttZAz23IPETrHl1GfMuSwRCzdGHgh84Ns90T4zZXecpGxE YExS8YTRdgZhk3Xow+yE8ejNG9YRn08FHtBedF4R7b3h/VhM02BfX8k5WpGWR0O1dtJc 7iig== X-Gm-Message-State: AEkoousGaCVRH+dvh378HsiYrBq2YX/PkgmKqwoN+5EHlBtU67UTq3mLBV1JZhFqpl3oAqaxv6s= X-Received: by 10.98.56.207 with SMTP id f198mr47121876pfa.83.1471906094711; Mon, 22 Aug 2016 15:48:14 -0700 (PDT) Return-Path: Received: from localhost.localdomain (c-73-67-244-238.hsd1.or.comcast.net. [73.67.244.238]) by smtp.gmail.com with ESMTPSA id uc1sm189946pac.24.2016.08.22.15.48.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Aug 2016 15:48:14 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Andy Yan , Bjorn Andersson , Haojian Zhuang , Guodong Xu , Wei Xu , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 3/4] arm64: dts: hikey: Add hikey support for syscon-reboot-mode Date: Mon, 22 Aug 2016 15:48:04 -0700 Message-Id: <1471906085-16682-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471906085-16682-1-git-send-email-john.stultz@linaro.org> References: <1471906085-16682-1-git-send-email-john.stultz@linaro.org> Add support to hikey dts for the syscon-reboot-mode driver. After trying an approach using a sram driver and node, a number of issues cropped up which would make it so we would be duplicating a lot of extra syscon infrastructure in order to support mfds on sram. After talking with Bjorn, using the syscon driver for this seems like an better choice. Cc: Andy Yan Cc: Bjorn Andersson Cc: Haojian Zhuang Cc: Guodong Xu Cc: Wei Xu Cc: Rob Herring Cc: Mark Rutland Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Acked-by: Bjorn Andersson Signed-off-by: John Stultz --- arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index 8597e9b..4492a15 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -29,6 +29,7 @@ * Reserve below regions from memory node: * * 0x05e0,0000 - 0x05ef,ffff: MCU firmware runtime using + * 0x05f0,1000 - 0x05f0,1fff: Reboot reason * 0x06df,f000 - 0x06df,ffff: Mailbox message data * 0x0740,f000 - 0x0740,ffff: MCU firmware section * 0x3e00,0000 - 0x3fff,ffff: OP-TEE @@ -36,11 +37,26 @@ memory@0 { device_type = "memory"; reg = <0x00000000 0x00000000 0x00000000 0x05e00000>, - <0x00000000 0x05f00000 0x00000000 0x00eff000>, + <0x00000000 0x05f00000 0x00000000 0x00001000>, + <0x00000000 0x05f02000 0x00000000 0x00efd000>, <0x00000000 0x06e00000 0x00000000 0x0060f000>, <0x00000000 0x07410000 0x00000000 0x36bf0000>; }; + reboot-mode-syscon@5f01000 { + compatible = "syscon", "simple-mfd"; + reg = <0x0 0x05f01000 0x0 0x00001000>; + + reboot-mode { + compatible = "syscon-reboot-mode"; + offset = <0x0>; + + mode-normal = <0x77665501>; + mode-bootloader = <0x77665500>; + mode-recovery = <0x77665502>; + }; + }; + soc { spi0: spi@f7106000 { status = "ok";