From patchwork Thu Dec 24 02:03:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Palmer X-Patchwork-Id: 11989151 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C4F8C433E0 for ; Thu, 24 Dec 2020 02:05:39 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 546662256F for ; Thu, 24 Dec 2020 02:05:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 546662256F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=0x0f.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=GOms52AgEVLB60tq1P3NkHuSr/ECmZlz0uCGbMCD6Lw=; b=jw0UbjecOhDfSAp6ndpNBpayYI ZRhJNnRqN/8wY4OO+odQ0uINQJip2M4lV6WHKoz6ie3ihoi1uS+gEdAfE98ZZcAMxD6MCWqCR3Dxk Hzo01F+PpuWMxaRDzqkajU5vkeEqquRnx3KnevJCNow3APQ/7fvwsIP8r03sq5SJNTSlboYBfnIzh 7B6htLgzF4PxLSCqQesylixldzcA0qBpvf7tk44hbLwNl3fm+YRvyb6VmsY8rrcIBW+WC8lAyxqpd Ei+8JAzZi7smboyJmrQIiLx0V0+jISenhyX1yLXzVIo1SopiXheiFttuopqs6+noaZ4uVFfWS+oIh QoRw4pxg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ksFzE-0008Pk-IH; Thu, 24 Dec 2020 02:04:16 +0000 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ksFzB-0008PH-3f for linux-arm-kernel@lists.infradead.org; Thu, 24 Dec 2020 02:04:14 +0000 Received: by mail-pg1-x52d.google.com with SMTP id n7so711752pgg.2 for ; Wed, 23 Dec 2020 18:04:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=0x0f.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6GGRKwj/V72sgXB5x/GYoZyHZnvC0fUrPze665l1A3Y=; b=n0hC6LYXnsWzYbKJUxRHnkLmYFDvKRNXxUglzhk/S0PU1HnlsbU0Tj1R6EYspQLtvj fkHGIfnqJfjes5EVeGqBQv6JLaYOBrZP8kpzjviWVmRXLF8qTY8n/EzqhzVyninoIUZ/ mEvo3x9HtvCN3mWolnSigCoSADbbJmm9KXhdg= 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:mime-version :content-transfer-encoding; bh=6GGRKwj/V72sgXB5x/GYoZyHZnvC0fUrPze665l1A3Y=; b=bJ/VwNAO3Ub2In+k2GVrvPcf/m6W8c8mba8RRnKt1lhkPECJc7FeEFf+sphxDjeuyg 4DVZrNQcPch328Vt6/ZVQFAJaDXCo6Xazd5Xl/v/sErtTBPbR8Lhr6PQ9cnoFb6byt0s zDtPOfw0sCuHYuAAoq5W5NAo72Ua0uG5B57WKhbNQBQKTfVnTST/jPkeOLGdwRgCkp+S qsrnK9e91Yvlf2GFaXHadWbV679/thSKO4Vy5SCQZ36/0ENNOmJR5RuJ2WTwszDdTFU4 rsjnKeo0HspoSKh9xasGwOK38CR3T+SiG4bzGa9oPfhQi2TI1Ux1EAu2JUiTehnxpYPC gKtA== X-Gm-Message-State: AOAM533s+Q83cqIn9/rhm39lZhHYTE4ia+bt+jxR5vz8nh35pO7mLKs/ tLkC4JfgQ9US1i3gyptiv0ZqeA== X-Google-Smtp-Source: ABdhPJyyxa/q5anc6DBZR2srp741iNm0H7XIBW2Sow3jBUv/Z4CCvkhSAXcwsgVWWhSPbdU3XSb8tg== X-Received: by 2002:a63:8c15:: with SMTP id m21mr11410215pgd.396.1608775448301; Wed, 23 Dec 2020 18:04:08 -0800 (PST) Received: from shiro.work (p1268123-ipngn200803sizuokaden.shizuoka.ocn.ne.jp. [118.13.124.123]) by smtp.googlemail.com with ESMTPSA id t1sm745564pju.43.2020.12.23.18.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Dec 2020 18:04:07 -0800 (PST) From: Daniel Palmer List-Id: To: soc@kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2] ARM: mstar: Unify common parts of BreadBee boards into a dtsi Date: Thu, 24 Dec 2020 11:03:54 +0900 Message-Id: <20201224020354.2212037-1-daniel@0x0f.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201223_210413_343051_FA74BB70 X-CRM114-Status: GOOD ( 16.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arnd@arndb.de, Daniel Palmer , linux-kernel@vger.kernel.org, olof@lixom.net, w@1wt.eu, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The BreadBee and the BreadBee Crust are the same PCB with a different SoC mounted. There are two top level dts to handle this. To avoid deduplicating the parts that are more related to the PCB than the SoC (i.e. the voltage regs and LEDs) add a common dtsi that can be included in both top level dts. Signed-off-by: Daniel Palmer --- .../dts/mstar-infinity-breadbee-common.dtsi | 49 +++++++++++++++++++ .../mstar-infinity-msc313-breadbee_crust.dts | 1 + .../dts/mstar-infinity3-msc313e-breadbee.dts | 1 + 3 files changed, 51 insertions(+) create mode 100644 arch/arm/boot/dts/mstar-infinity-breadbee-common.dtsi diff --git a/arch/arm/boot/dts/mstar-infinity-breadbee-common.dtsi b/arch/arm/boot/dts/mstar-infinity-breadbee-common.dtsi new file mode 100644 index 000000000000..507ff2fba837 --- /dev/null +++ b/arch/arm/boot/dts/mstar-infinity-breadbee-common.dtsi @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2020 thingy.jp. + * Author: Daniel Palmer + */ + +#include + +/ { + vcc_core: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vcc_core"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-boot-on; + }; + + vcc_dram: fixedregulator@1 { + compatible = "regulator-fixed"; + regulator-name = "vcc_dram"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + }; + + vcc_io: fixedregulator@2 { + compatible = "regulator-fixed"; + regulator-name = "vcc_io"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + }; + + leds { + compatible = "gpio-leds"; + red { + gpios = <&gpio MSC313_GPIO_SR_IO16 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "activity"; + }; + yellow { + gpios = <&gpio MSC313_GPIO_SR_IO17 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + }; +}; + +&cpu0 { + cpu-supply = <&vcc_core>; +}; diff --git a/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts b/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts index f9db2ff86f2d..db4910dcb8a7 100644 --- a/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts +++ b/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts @@ -6,6 +6,7 @@ /dts-v1/; #include "mstar-infinity-msc313.dtsi" +#include "mstar-infinity-breadbee-common.dtsi" / { model = "BreadBee Crust"; diff --git a/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts b/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts index f0eda80a95cc..e64ca4ce1830 100644 --- a/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts +++ b/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts @@ -6,6 +6,7 @@ /dts-v1/; #include "mstar-infinity3-msc313e.dtsi" +#include "mstar-infinity-breadbee-common.dtsi" / { model = "BreadBee";