From mboxrd@z Thu Jan 1 00:00:00 1970 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,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 5770CC2B9F4 for ; Thu, 17 Jun 2021 09:02:55 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A7891613CB for ; Thu, 17 Jun 2021 09:02:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7891613CB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sancloud.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A8E0282A01; Thu, 17 Jun 2021 11:02:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sancloud.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=sancloud.onmicrosoft.com header.i=@sancloud.onmicrosoft.com header.b="Ha9IIoWE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 07F2F829F9; Thu, 17 Jun 2021 11:02:36 +0200 (CEST) Received: from GBR01-LO2-obe.outbound.protection.outlook.com (mail-lo2gbr01on0701.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe15::701]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4AF9C801D7 for ; Thu, 17 Jun 2021 11:02:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sancloud.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=paul.barker@sancloud.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b8ynm+OjZqpANx6nRtDBXL4CFDCo1/hsmImzwP8AL0K763aw837JUWyVd9RpLpEwHc0LH126sHjzfjCFnplmuDNwLp2h9dB7KVRY64UegTfzBohxTq2wL+7zVPkU/HwqSjm0QeFD4mkaoH4lPfvJNaACWoXH1kyMAhVWOtMB22CParWcPalRSFso8ZGWJxi7d7cCczE2rUUThl9hcnnhtYIUuv4xj+MPuK7XKTE2I03DjuaVkTW6qTDCHS1w/E8fkhJnX99cYfbh0vIgX/PgneQnOj+zo2hLTPbp4PWjqvGHUaaYzAkEAYRBWfHACYTue2/pu/TxaYGD50lQhyPNtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/5GaSIsfVYF2KcPLfmbxVSgeJs7it45ao11Af5IN0ek=; b=Y7zL+DLSww1dB/4HzGX5DidHReewL4Fa/COA6apPMiYflAfcqHRsS2tlnYFk5jnqcwQv0LgOB6GVNCCOVIOcbHjDjUJNGhhU9r1UzQDLjOWz8wn6kRNBjmNvblfYG1TR9lkTIfxVONCc+0W3ou6RUufeM88efageyFqZLgpoE0q+yHv1fAR6rKQZn5hAiLKqbN5T4auGxtnRvSZ5QcP1PS0k4KWTfFJkdZJlifVe274lhCr+7CcehNx4uMiVAbVHjLbL9yPzXp/MfAP5nt4nb1tjNvGWhUrabb+AIPo3/gRQRwH35REEdvDOPmWFYJaUAMCDoWjy5bDZWir4R8wkmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sancloud.com; dmarc=pass action=none header.from=sancloud.com; dkim=pass header.d=sancloud.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sancloud.onmicrosoft.com; s=selector2-sancloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/5GaSIsfVYF2KcPLfmbxVSgeJs7it45ao11Af5IN0ek=; b=Ha9IIoWE6RSea3NeC5Mgjk70ilw3p6St1GKYaEoLDLmEw36SaUsHHKVHH8zUh4j9PfksAGN2d21jH8unMkHnaoMFdpFuRucCpuR6ZEe4y5KTCVi2l3ZvzkQlgiYjjecpyAaUYaTE3CtiKV+i+d4qJNEQPMj/npFlPRhGbXc6Zn0= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; dmarc=none action=none header.from=sancloud.com; Received: from CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:61::19) by CWLP123MB3299.GBRP123.PROD.OUTLOOK.COM (2603:10a6:400:64::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Thu, 17 Jun 2021 09:02:30 +0000 Received: from CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM ([fe80::c84c:4809:6da7:ecf5]) by CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM ([fe80::c84c:4809:6da7:ecf5%6]) with mapi id 15.20.4242.019; Thu, 17 Jun 2021 09:02:29 +0000 From: Paul Barker To: u-boot@lists.denx.de, Tom Rini Cc: Paul Barker Subject: [PATCH 1/4] arm: dts: am335x-boneblack: Extract common config Date: Thu, 17 Jun 2021 10:02:19 +0100 Message-Id: <20210617090222.7516-1-paul.barker@sancloud.com> X-Mailer: git-send-email 2.26.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [80.7.160.81] X-ClientProxiedBy: LO4P123CA0353.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18d::16) To CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:61::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from owl.home.b5net.uk (80.7.160.81) by LO4P123CA0353.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19 via Frontend Transport; Thu, 17 Jun 2021 09:02:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37c073bc-079e-484b-4afc-08d9316ea2d0 X-MS-TrafficTypeDiagnostic: CWLP123MB3299: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wm0NOLcav/j4JtPP/zDnNRIq5YcXVMc/oEeRKhud/ui5Wfn/h2XrlhmDqvrZCPhoxpRe1q0AeYBVHCaycVinmfRnw2fxSqvXZa9G1Xj+wIeJtYedSJlMjwD/VOWp/C2sHt5zqyCKHH/OuBKMcdbjE5/uGHUCGy5tCTInI9Q0bYJTV3qWgFhAEAuy3nHIJ4NFV92uzQOwdRc/OoEAUMOtsz64X/sn6u8swN2fK53orQ+AcIN0A/c+ID3Y/CKjaLUx71xVXygj34kivy5s/X8r0uwtTbr5r2vetXJ+OMsP+uA8MMHv26QS4Op2uT8UyRHQqk9y66IAcDkx9w1yHniB35ia3TGvAFK+Ye/3w9uI4J97QMT5k7TrebmMQi9trNd4Q5KJ8P6he+nxoMeqex/P7UFfi38AvtGSxtn/WrokypA86fH038czbW0P6rMUa3y2le0tvbtrEzRr/BwWXSzKq9YlK5AwU+OPdcDQ49fABGKQFVxb6QaP4E8XQa414U9npqIEN0l0h7dxz414FN/jKHWQ7k7WE0ph4skdZT1kbWE18mytw0sle8sdOuxqXbRAHScYAsk5cL4XOaUv2M2bndfsIG3oUfdrVSTgTUwCFCvtiv+37sEwdz48Ji96xApL3fqHmFNJK29OpTHF11HIINDss0KPkjlVjfBI3NIP4yH1L1hMppM8Bz+GFiyFySLr X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(396003)(136003)(376002)(366004)(39830400003)(346002)(83380400001)(16526019)(38350700002)(38100700002)(2906002)(52116002)(6916009)(6506007)(1076003)(107886003)(8936002)(186003)(6486002)(6512007)(8676002)(6666004)(66946007)(26005)(44832011)(36756003)(478600001)(86362001)(316002)(2616005)(4326008)(5660300002)(956004)(66556008)(66476007)(2004002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pUvh0dVGrVa3D0pQBDJN8Da0B5kb9nUbYHyR5AoGek057TOTFuJtVWysZFhw?= =?us-ascii?Q?jvVjsZ4cBydfAA5D9TcbsLkN5jb/nYrcXgzkO3rK05uahkr78PHTe6tmvFSU?= =?us-ascii?Q?fE+s0knQdwv2urFexBkgDaC4u4n0R+DcyLR6CM7HoaNhrzgqV2ft+AwMuQrl?= =?us-ascii?Q?vpdDlSdaHi8sevQms/dX7fLOa6/XfGShDecEe4LCfZaLhZrqgBV5rj4devNf?= =?us-ascii?Q?lR1+gUnIs0debV3PcTfFpQawzZgoIV0cK2S2+coTtU/xeowdMqQbVKWX9/E5?= =?us-ascii?Q?zopNZf2wPmc0N+K/xwQlSOfzP6n6quTxaBDFYSc5LFA3f6UNcaDacnucvsuh?= =?us-ascii?Q?lFVmhyripv9lyELjCDmDaXghugK+LRf1aI8S8I9fCgsSZK951Jz46gjwvwLT?= =?us-ascii?Q?7dWxroqjfoIlPNNkZBMZrbIa18cXHFwH6d0o2jBlwZjTcFfpz00VKXohapOw?= =?us-ascii?Q?Brb8v5FjuzoINMQ5z/Oe5PDsygh3SpolTBHHRBEg1NYyW1ZHbICZmnWlW4sO?= =?us-ascii?Q?66VA7I3dG72FcjleYrZeLssclxpqSHmRD5aMh5f0OE9O3hgl/2G/Hu9eQl0W?= =?us-ascii?Q?T9pZcm9k3Oxv8MAdf37vhcrYIuXiKcniW18Eu9VQMWNUYVkmTeBSdZXjgWXl?= =?us-ascii?Q?072V0+5ofgcxpMMiqbOr7Gt37SErRtDvKYPq3Tllm+MPo3GXyQG+US8gVZs3?= =?us-ascii?Q?ci4LvsFZLWFwXZgcGFxIF3A2ganIQriVF3eq7xd2xppjApn+ocj0EVtIRNjp?= =?us-ascii?Q?1ji1RFilFEhDkgLTtFA6m5MlBObk/DOWDjuqy+h7ppaV07Iv68H2cBhw2tpT?= =?us-ascii?Q?ZRwh5vj2j2+bEY9oLmRoR4ypMYyXg4YZA6TjkEsqh7k/mDYWqqYXPnLJ2M+j?= =?us-ascii?Q?7v2x24GlCHAVk9LLiqFA31ZY4I9QUmzha62L6OzVXagqV6yyoItNkNC3hfrV?= =?us-ascii?Q?9v2r82zd/diJztJkhLwu/dOiro5MVUGgrdoHoY49ijhVw5J7WhfeKaGyX6iC?= =?us-ascii?Q?HuzCoBcFms3shS4MctteNht+c79IfBPzBCo9B/Qb/GxHVxZW1TqPeK381PHZ?= =?us-ascii?Q?N5GajMpNDF2zRHD8QB1HdF83hzhkmyjyJLOVC2k55wjC5o/qIVvysJ6w2/vZ?= =?us-ascii?Q?0L9GsrcIqlcNwZ+fiFZ9BSs+zzcPz4OX+YdTbT0mDwrwAmcyvSvB2o21ety6?= =?us-ascii?Q?PqtiASTb0Cfqkr/wLwMEdcqrlgkUSV9zVQhUqyIr62j0Q7tQnufgdlUzH203?= =?us-ascii?Q?JltUHsujsir1ELtXXHtYvjx8sr11S5TP+KnNVkW/sx7eg+3wtokQwgDVJShK?= =?us-ascii?Q?zLsJTlIOuTtcb1z8JfsOYNET?= X-OriginatorOrg: sancloud.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37c073bc-079e-484b-4afc-08d9316ea2d0 X-MS-Exchange-CrossTenant-AuthSource: CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 09:02:29.8858 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 840be37c-244a-450e-9bcc-2064862de1f4 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WdLJtP6ZInbVU0zMP2XZdh0TpKrrxSTmRWI82iS0AV29l6+u717TvoZCk/wIn4K6aFxVMeVrOMi12lt0x1tJOLx87NzcdQD7SUtPyNm5gso= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CWLP123MB3299 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Configuration which is shared between the BeagleBone Black and derivative boards like the Sancloud BeagleBone Enhanced (BBE) is moved to a common dtsi file to prevent duplication. Signed-off-by: Paul Barker --- ...black.dts => am335x-boneblack-common.dtsi} | 26 +++---- arch/arm/dts/am335x-boneblack.dts | 75 +------------------ 2 files changed, 10 insertions(+), 91 deletions(-) copy arch/arm/dts/{am335x-boneblack.dts => am335x-boneblack-common.dtsi} (94%) diff --git a/arch/arm/dts/am335x-boneblack.dts b/arch/arm/dts/am335x-boneblack-common.dtsi similarity index 94% copy from arch/arm/dts/am335x-boneblack.dts copy to arch/arm/dts/am335x-boneblack-common.dtsi index 27ebe4a65d..9d31fda17b 100644 --- a/arch/arm/dts/am335x-boneblack.dts +++ b/arch/arm/dts/am335x-boneblack-common.dtsi @@ -5,18 +5,21 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -/dts-v1/; - -#include "am33xx.dtsi" -#include "am335x-bone-common.dtsi" / { - model = "TI AM335x BeagleBone Black"; - compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; chosen { stdout-path = &uart0; tick-timer = &timer2; }; + + hdmi { + compatible = "ti,tilcdc,slave"; + i2c = <&i2c0>; + pinctrl-names = "default", "off"; + pinctrl-0 = <&nxp_hdmi_bonelt_pins>; + pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; + status = "okay"; + }; }; &ldo3_reg { @@ -74,17 +77,6 @@ status = "okay"; }; -/ { - hdmi { - compatible = "ti,tilcdc,slave"; - i2c = <&i2c0>; - pinctrl-names = "default", "off"; - pinctrl-0 = <&nxp_hdmi_bonelt_pins>; - pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; - status = "okay"; - }; -}; - &rtc { system-power-controller; }; diff --git a/arch/arm/dts/am335x-boneblack.dts b/arch/arm/dts/am335x-boneblack.dts index 27ebe4a65d..77273df1a0 100644 --- a/arch/arm/dts/am335x-boneblack.dts +++ b/arch/arm/dts/am335x-boneblack.dts @@ -9,82 +9,9 @@ #include "am33xx.dtsi" #include "am335x-bone-common.dtsi" +#include "am335x-boneblack-common.dtsi" / { model = "TI AM335x BeagleBone Black"; compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; - chosen { - stdout-path = &uart0; - tick-timer = &timer2; - }; -}; - -&ldo3_reg { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; -}; - -&mmc1 { - vmmc-supply = <&vmmcsd_fixed>; -}; - -&mmc2 { - vmmc-supply = <&vmmcsd_fixed>; - pinctrl-names = "default"; - pinctrl-0 = <&emmc_pins>; - bus-width = <8>; - status = "okay"; -}; - -&am33xx_pinmux { - nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins { - pinctrl-single,pins = < - 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ - 0xa0 0x08 /* lcd_data0.lcd_data0, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xa4 0x08 /* lcd_data1.lcd_data1, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xa8 0x08 /* lcd_data2.lcd_data2, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xac 0x08 /* lcd_data3.lcd_data3, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xb0 0x08 /* lcd_data4.lcd_data4, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xb4 0x08 /* lcd_data5.lcd_data5, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xb8 0x08 /* lcd_data6.lcd_data6, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xbc 0x08 /* lcd_data7.lcd_data7, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xc0 0x08 /* lcd_data8.lcd_data8, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xc4 0x08 /* lcd_data9.lcd_data9, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xc8 0x08 /* lcd_data10.lcd_data10, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xcc 0x08 /* lcd_data11.lcd_data11, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xd0 0x08 /* lcd_data12.lcd_data12, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xd4 0x08 /* lcd_data13.lcd_data13, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xd8 0x08 /* lcd_data14.lcd_data14, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xdc 0x08 /* lcd_data15.lcd_data15, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xe0 0x00 /* lcd_vsync.lcd_vsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ - 0xe4 0x00 /* lcd_hsync.lcd_hsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ - 0xe8 0x00 /* lcd_pclk.lcd_pclk, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ - 0xec 0x00 /* lcd_ac_bias_en.lcd_ac_bias_en, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ - >; - }; - nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins { - pinctrl-single,pins = < - 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ - >; - }; -}; - -&lcdc { - status = "okay"; -}; - -/ { - hdmi { - compatible = "ti,tilcdc,slave"; - i2c = <&i2c0>; - pinctrl-names = "default", "off"; - pinctrl-0 = <&nxp_hdmi_bonelt_pins>; - pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; - status = "okay"; - }; -}; - -&rtc { - system-power-controller; }; -- 2.26.2