From patchwork Thu May 17 09:45:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 915279 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aP567PCz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40mmfr3KPCz9s1B for ; Thu, 17 May 2018 19:47:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0F050C21EC2; Thu, 17 May 2018 09:46:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E1929C21E3E; Thu, 17 May 2018 09:46:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 91AFFC21E49; Thu, 17 May 2018 09:46:31 +0000 (UTC) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by lists.denx.de (Postfix) with ESMTPS id AEAA0C21DF8 for ; Thu, 17 May 2018 09:46:26 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id az12-v6so2211350plb.8 for ; Thu, 17 May 2018 02:46:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VNlXoulPFx/HKhZTDDk/qHa7Tw4NdtuyPLRAHpxnSA0=; b=aP567PCzpJJxF+i0MwnNksI1PSHSN2iY3Ew9e+onlRyjieZn7UvPRW67SzjhhXpLLI 0CYFYQH4DniFR5NYLGAc628rtyuManEl+jBEu6Eb8aJZayRfwLzW1DtfySAW67Irk31Z w2IO7akvsk0+uLjwuOMSuq4WoY7BN+gI86LwzTjKUywiT+pC5XZ5FMtqW6FdyxFonsWe NH49P7R1hyv/APJg1PolQPiyLJIBU/sXvKTUbuKuNdu/JS9QXJJu/1r2H9HObRx8fyNz 9x3iBVNaEtYJTpjztmU60PENymqWnno4cetCWku585Cd4l5NFArA0xUPfFkNcktaZOle MxFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VNlXoulPFx/HKhZTDDk/qHa7Tw4NdtuyPLRAHpxnSA0=; b=V1BsswjHBFQnTGO2qYvf6aFr76SGdc6+iTr5Q4aqnfJodHUAKY9FZpIj4oOuy27So2 eLUudAyhHf+c+ZGywczTduRrJXXDBSqKCv4GGd2tcJlApxY/PtqIbM8ga7HV3A5e9ISz AIhva1L7jHsNI26nAM/vTjULipKSgYG6RfmIrmyejrRZkmIfkzHlPENNSj9g62utsZ9N ZYRd4a/vPFVi8k2rdrtsJAvKX2ia0sP3RyG09Htfoke94pgXymICvzLnlzUVJ0FSYzVD lyE0z0wd+ltfhI7zrY0dugAqduw28j9eR5Bnhgm0DHUDA03ZiI5s4JjFlK63mTzh+oRq ABmA== X-Gm-Message-State: ALKqPweufGd9QA3yJikQXj/omM2WMqRo4GCPSYGiAyak8SLRdZyzvhgf Ph2XT7QWxQJLiaok2YtuMaI9WyHD X-Google-Smtp-Source: AB8JxZrfUKbeTmhJ9Hn/+Vuq1fidsQ1NYD1h54zzRB0MAx7x3gV+ogahBhrPWXBZrX+Bt8otgM4OOA== X-Received: by 2002:a17:902:7883:: with SMTP id q3-v6mr4569931pll.71.1526550385054; Thu, 17 May 2018 02:46:25 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id u16-v6sm9495759pfl.39.2018.05.17.02.46.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 May 2018 02:46:24 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Thu, 17 May 2018 21:45:57 +1200 Message-Id: <20180517094601.4816-3-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517094601.4816-1-judge.packham@gmail.com> References: <20180517094601.4816-1-judge.packham@gmail.com> Cc: Luka Perkov , Prafulla Wadaskar , Chris Packham , Jason Cooper , Tom Rini Subject: [U-Boot] [PATCH 2/6] ARM: kirkwood: Add device-tree for dreamplug X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Import the dts file from Linux 4.17 and enable CONFIG_OF_CONTROL. Signed-off-by: Chris Packham --- arch/arm/dts/kirkwood-dreamplug.dts | 127 ++++++++++++++++++++++++++++ configs/dreamplug_defconfig | 3 +- 2 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/kirkwood-dreamplug.dts diff --git a/arch/arm/dts/kirkwood-dreamplug.dts b/arch/arm/dts/kirkwood-dreamplug.dts new file mode 100644 index 000000000000..a647a65c20a0 --- /dev/null +++ b/arch/arm/dts/kirkwood-dreamplug.dts @@ -0,0 +1,127 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; + +#include "kirkwood.dtsi" +#include "kirkwood-6281.dtsi" + +/ { + model = "Globalscale Technologies Dreamplug"; + compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + + memory { + device_type = "memory"; + reg = <0x00000000 0x20000000>; + }; + + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + stdout-path = &uart0; + }; + + ocp@f1000000 { + pinctrl: pin-controller@10000 { + pmx_led_bluetooth: pmx-led-bluetooth { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; + pmx_led_wifi: pmx-led-wifi { + marvell,pins = "mpp48"; + marvell,function = "gpio"; + }; + pmx_led_wifi_ap: pmx-led-wifi-ap { + marvell,pins = "mpp49"; + marvell,function = "gpio"; + }; + }; + serial@12000 { + status = "ok"; + }; + + spi@10600 { + status = "okay"; + + m25p40@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "mxicy,mx25l1606e", "jedec,spi-nor", "spi-flash"; + reg = <0>; + spi-max-frequency = <50000000>; + mode = <0>; + + partition@0 { + reg = <0x0 0x80000>; + label = "u-boot"; + }; + + partition@100000 { + reg = <0x100000 0x10000>; + label = "u-boot env"; + }; + + partition@180000 { + reg = <0x180000 0x10000>; + label = "dtb"; + }; + }; + }; + + sata@80000 { + status = "okay"; + nr-ports = <1>; + }; + + mvsdio@90000 { + pinctrl-0 = <&pmx_sdio>; + pinctrl-names = "default"; + status = "okay"; + /* No CD or WP GPIOs */ + broken-cd; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + pinctrl-0 = <&pmx_led_bluetooth &pmx_led_wifi + &pmx_led_wifi_ap >; + pinctrl-names = "default"; + + bluetooth { + label = "dreamplug:blue:bluetooth"; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + }; + wifi { + label = "dreamplug:green:wifi"; + gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; + }; + wifi-ap { + label = "dreamplug:green:wifi_ap"; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy0: ethernet-phy@0 { + reg = <0>; + }; + + ethphy1: ethernet-phy@1 { + reg = <1>; + }; +}; + +ð0 { + status = "okay"; + ethernet0-port@0 { + phy-handle = <ðphy0>; + }; +}; + +ð1 { + status = "okay"; + ethernet1-port@0 { + phy-handle = <ðphy1>; + }; +}; diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index cbd2fb68ad92..8090c9a37793 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DREAMPLUG=y CONFIG_IDENT_STRING="\nMarvell-DreamPlug" +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y @@ -19,6 +20,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_ISO_PARTITION=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set @@ -32,4 +34,3 @@ CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_OF_LIBFDT=y