From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934076AbcA0Ri7 (ORCPT ); Wed, 27 Jan 2016 12:38:59 -0500 Received: from mail.kernel.org ([198.145.29.136]:38567 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933080AbcA0Riv convert rfc822-to-8bit (ORCPT ); Wed, 27 Jan 2016 12:38:51 -0500 MIME-Version: 1.0 In-Reply-To: <1453855080-17760-4-git-send-email-john.stultz@linaro.org> References: <1453855080-17760-1-git-send-email-john.stultz@linaro.org> <1453855080-17760-4-git-send-email-john.stultz@linaro.org> From: Rob Herring Date: Wed, 27 Jan 2016 11:38:28 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [RFC][PATCH 3/3] dts: hikey: Add hikey support for sram-reboot-mode To: John Stultz Cc: lkml , Andy Yan , Arnd Bergmann , Thierry Reding , =?UTF-8?Q?Heiko_St=C3=BCbner?= , Caesar Wang , Kees Cook , Guodong Xu , Haojian Zhuang , Vishal Bhoj , Bjorn Andersson , "devicetree@vger.kernel.org" , Android Kernel Team Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 26, 2016 at 6:38 PM, John Stultz wrote: > Add support to hikey dts and defconfig for the > sram-reboot-mode driver. > > The dts entries added here should really be generated > by the UEFI firmware, and not be static in the dts, > since one may be using different firmware on HiKey. > But this patch provides an example of how the > sram-reboot-mode entry would otherwise look. > > Cc: Andy Yan > Cc: Rob Herring > Cc: Arnd Bergmann > Cc: Thierry Reding > Cc: Heiko Stübner > Cc: Caesar Wang > Cc: Kees Cook > Cc: Guodong Xu > Cc: Haojian Zhuang > Cc: Vishal Bhoj > Cc: Bjorn Andersson > Cc: devicetree@vger.kernel.org > Cc: Android Kernel Team > Signed-off-by: John Stultz > --- > arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 36 ++++++++++++++++++++++++++ > arch/arm64/configs/hikey_defconfig | 3 +++ > 2 files changed, 39 insertions(+) > > diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > index 92f1704..67d12d0 100644 > --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > @@ -52,6 +52,11 @@ > <0x0 0x0740f000 0x0 0x00001000>; /* MCU firmware section */ > }; > > + reboot-reason@05f01000 { > + no-map; > + reg = <0x0 0x05f01000 0x0 0x00001000>; > + }; > + This hunk should be dropped. These regions are for main memory. > mbox-buf@06dff000 { > no-map; > reg = <0x0 0x06dff000 0x0 0x00001000>; /* Mailbox message buf */ > @@ -71,6 +76,37 @@ > ftrace-size = <0x0 0x00020000>; > }; > > + > + /* This entry should really be provided by the UEFI firmware */ > + sram@5f01000 { > + compatible = "mmio-sram", "simple-bus"; The suggestion to put "simple-bus" here was really just for debugging. Really, the mmio-sram driver should call of_platform_default_populate to probe it's children. > + reg = <0x0 0x05f01000 0x0 0x00001000>; > + ranges = <0x0 0x0 0x05f01000 0x00001000>; > + > + #address-cells = <1>; > + #size-cells = <1>; > + > + reboot-mode@0 { > + compatible = "sram-reboot-mode"; > + reg = <0x0 0x4>; > + > + none { > + linux,mode = "none"; > + loader,magic = <0x77665501>; > + }; > + > + bootloader { > + linux,mode = "bootloader"; > + loader,magic = <0x77665500>; > + }; > + > + recovery { > + linux,mode = "recovery"; > + loader,magic = <0x77665502>; > + }; > + }; > + }; > + > smb { > uart0: uart@f8015000 { /* console */ > status = "ok"; > diff --git a/arch/arm64/configs/hikey_defconfig b/arch/arm64/configs/hikey_defconfig > index a8375aa..e9db588 100644 > --- a/arch/arm64/configs/hikey_defconfig > +++ b/arch/arm64/configs/hikey_defconfig > @@ -201,6 +201,7 @@ CONFIG_BLK_DEV_LOOP=y > CONFIG_BLK_DEV_RAM=y > CONFIG_BLK_DEV_RAM_SIZE=16384 > CONFIG_VIRTIO_BLK=y > +CONFIG_SRAM=y > CONFIG_TI_ST=y > CONFIG_ST_HCI=y > # CONFIG_SCSI_PROC_FS is not set > @@ -266,6 +267,8 @@ CONFIG_SPI_PL022=y > CONFIG_GPIO_SYSFS=y > CONFIG_GPIO_XGENE=y > CONFIG_POWER_RESET_SYSCON=y > +CONFIG_SYSCON_REBOOT_MODE=y > +CONFIG_SRAM_REBOOT_MODE=y > CONFIG_THERMAL=y > CONFIG_THERMAL_WRITABLE_TRIPS=y > CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y > -- > 1.9.1 >