From nobody Fri Feb 13 00:14:49 2026 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1BBD19046A; Wed, 5 Jun 2024 06:40:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717569627; cv=none; b=H9Mhihr87Sj7nYMnZUPTc8DjR1MGGF3f0KR5sLdyC3IsP/5F51qHajUZ6advWD83CGKkwZsxUWaRDVy5+Eas1PH6kj3OBRXZ3BfBuKJsi6rFzqwOCQOE+mKiU7LQyBT24aOaHB/Moh1aMTQDwOqr4tSl1zReqG1qeGLLNGYYqsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717569627; c=relaxed/simple; bh=gh9T2JuXEUq+9FLP5NHawmyCjUp/3wTNGcP4jnyuJno=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fg5XbOZyUPE6uv1/lCTzbfJiNrp0KLgnVuhMVrknLceGOjQZ4ZAVrvguEc6GoQmqgoz4ncSQT7xCejq6OUiEKww/i0AW2D7OdMTsCBMF7i4ouTCtjvJfag2yekM4TBlIJA8OSb0ooda4rOUiCjk6z2nfNJitsnB1CNOwYwSpxNw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IpX3MAq/; arc=none smtp.client-ip=209.85.167.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IpX3MAq/" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-52b9dda4906so3205409e87.2; Tue, 04 Jun 2024 23:40:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717569624; x=1718174424; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=D3AHSdXqCM99GcM25H9pmDJhtaZDdOJQN/1p0dZfXZM=; b=IpX3MAq/KPeK5M4YBOlfQUBEDdeXTHLHP+ZvWHLJSMiNX7GmzpA0cjUr2g+PgvzUqL P8RwakAbV3xNwEAHAZM0pcAoL/v3DxoM9oAuuZHNuzJqT/vWG3cNX03TEOZdBOGPx8rh 2hGq1EI5zmTkdS6a+Hkje1Bqhe2hrDIpu+NVMQ1L7oEzaKTEXJXIe0BkVIiZQvvynMo4 tw2fQ6N8bQ2TA3scxZVfz/OfwVDF0sn5KNB/bhrE8KCuzlUv2cPArXlZHWryaGiDM0d8 Yus0zja7i7v9kproveFtlyfnG7wjs/8p+VcXdlidw2SxZnjh04z74bnoS/dPZXlfbaQu VGPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717569624; x=1718174424; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D3AHSdXqCM99GcM25H9pmDJhtaZDdOJQN/1p0dZfXZM=; b=ZYguKXol/7UPxbxTfx5y3UCPShfPrSoWZ1FnUd4UKbC0QKL7nqN9YXTdjlzgIcM+QI EdSVFFIxxqjN6keStbhSB7GdLHzZe7QnFRH+0UT+auhfOQq3QUyNw35FmKHroa7klo+u eZ0TVb3YJ2TDziTE8yjPzje3D91DoTvS/RO3O5KoiL+zS0LkJ93GdUku+L1coXu957+E +KtxLK402JtCAX716z+g6BtMvX7v94hjwsgYQbRUCr1jDpMs8xpEPRUPEMAFaQfexQMI bYNShoElwQMSGd43V0QbQbWOCu8o1RbFChnJPwsW+x6M+N9V+PEPx4lRAzu1DmtPM7Ym IRSA== X-Forwarded-Encrypted: i=1; AJvYcCWblEPm3wHn+kHjp3J8OvpzohiWP8ip1FYt1I84+jftPRkCnajBk4uxVAhR6kLsJhSh85UBgL5LTIXtcf/g1EzgF/aYo5AIhmz44TZrVSAyehf/ZTM8R9uTjPg0pi7veV9OPXyxtlE7gg== X-Gm-Message-State: AOJu0YxmIG4aMBKlNRwk4lS/2tlseU0FetCS9/QTGYvXpdGeTLUd4Et8 djpLCfX+HJ+uIYY0lSmhY0Pf5xvoJKmsPOAZ4xbR7pZ9BvC+HOeG X-Google-Smtp-Source: AGHT+IEpfY5sAFkunQukulbbBhhtaqTviynZT34t5bgBqEeeilrCQzPBzOnCHKlAfbEwRE0vgOwhpg== X-Received: by 2002:ac2:4c28:0:b0:51d:5ffd:efe4 with SMTP id 2adb3069b0e04-52bab4ceb6fmr1125040e87.1.1717569623871; Tue, 04 Jun 2024 23:40:23 -0700 (PDT) Received: from hex.my.domain (83.8.128.191.ipv4.supernova.orange.pl. [83.8.128.191]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57a31b99445sm8665505a12.18.2024.06.04.23.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 23:40:23 -0700 (PDT) From: Artur Weber Date: Wed, 05 Jun 2024 08:40:12 +0200 Subject: [PATCH 1/2] ARM: dts: broadcom: bcm21664: Move chosen node into bcm21664-garnet DTS Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240605-bcm21664-common-v1-1-6386e9141eb6@gmail.com> References: <20240605-bcm21664-common-v1-0-6386e9141eb6@gmail.com> In-Reply-To: <20240605-bcm21664-common-v1-0-6386e9141eb6@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden Cc: Broadcom internal kernel review list , Stanislav Jakubek , ~postmarketos/upstreaming@lists.sr.ht, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Artur Weber X-Mailer: b4 0.14-dev-d4707 X-Developer-Signature: v=1; a=ed25519-sha256; t=1717569621; l=1415; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=gh9T2JuXEUq+9FLP5NHawmyCjUp/3wTNGcP4jnyuJno=; b=75412Pl+dryhZqHgnGfXiKbGo+aYBu1W2CVLUkZDx3R8GEJMJxG3fPwZ8TYgCvcmN4lMOZ42P x8W0/DJUzE/Bx0gYRfzfnA7gkur7jdot1mxriR7hp0uP4XZR3P8qvHK X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= The serial console settings in the chosen node are device-specific, not SoC-specific. Move the chosen node out of bcm21664.dtsi and into the only DTS that uses it, bcm21664-garnet.dts. Signed-off-by: Artur Weber --- arch/arm/boot/dts/broadcom/bcm21664-garnet.dts | 4 ++++ arch/arm/boot/dts/broadcom/bcm21664.dtsi | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/broadcom/bcm21664-garnet.dts b/arch/arm/boot= /dts/broadcom/bcm21664-garnet.dts index 8789fae178bf..4f8ddc1b3ab7 100644 --- a/arch/arm/boot/dts/broadcom/bcm21664-garnet.dts +++ b/arch/arm/boot/dts/broadcom/bcm21664-garnet.dts @@ -11,6 +11,10 @@ / { model =3D "BCM21664 Garnet board"; compatible =3D "brcm,bcm21664-garnet", "brcm,bcm21664"; =20 + chosen { + bootargs =3D "console=3DttyS0,115200n8"; + }; + memory@80000000 { device_type =3D "memory"; reg =3D <0x80000000 0x40000000>; /* 1 GB */ diff --git a/arch/arm/boot/dts/broadcom/bcm21664.dtsi b/arch/arm/boot/dts/b= roadcom/bcm21664.dtsi index fa73600e883e..c1ad5123bad4 100644 --- a/arch/arm/boot/dts/broadcom/bcm21664.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm21664.dtsi @@ -12,10 +12,6 @@ / { compatible =3D "brcm,bcm21664"; interrupt-parent =3D <&gic>; =20 - chosen { - bootargs =3D "console=3DttyS0,115200n8"; - }; - cpus { #address-cells =3D <1>; #size-cells =3D <0>; --=20 2.45.1 From nobody Fri Feb 13 00:14:49 2026 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3874190482; Wed, 5 Jun 2024 06:40:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717569629; cv=none; b=pm/crIqSCmN7AzZHTPg6c+7Hs5R0endFzrNWobhl9NzBdZIfVfeybpPyXlaXMPcN0JSatZG812N8BgVwx4eFnCKPyqlZe79hpXTB83LshniNx9YqAuh2/buDgub5GFGyMd0C2tKgFR/lXpu5vadEoodpYsQalOGwvRnKyH6ciZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717569629; c=relaxed/simple; bh=BQ4tSva1zNrjSygPvKnA9sRhSbYMdlDq5Sn3/8Jdcno=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M90H2G039OakW/5xaqz3ZWy6AkthXdrHnbkSEE5daHLcjSxa6pFrqyb14pBt801JRavNpi5Vmr4h7ivxU2uytOgt4QkbHy2eEGyIIgdxOcaTN+uo9oLOIPQE23kpw/O6Eeth83DsZcoAkwB0MzdVat/KBNr8eU/xf3rwG3+YzU4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Atgna41h; arc=none smtp.client-ip=209.85.208.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Atgna41h" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-572c65cea55so1078222a12.0; Tue, 04 Jun 2024 23:40:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717569625; x=1718174425; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Nd73aXYUVtbFE1Ud3Hq1iCxcPOnVa/Poq92CQVoTAGM=; b=Atgna41hmRE/IrO0z2TPS7tDWfLGMZCXU9v61HCumHgJW8S/BWMiqSy+fZU5TSSIXd jrU8aE+mjsgtlTUXEQa1EPZbbDBjjJ+Oh/psZPtU6ytB21bSJAkhkl3ILne7gicuRjr1 OX+I2E9hKgPu30b4oMwwW6HIGv1IqFtz4diteGueV6LtOGbnS/8cs++yOeeoAP1e8Sh1 Tn8sUj4XdXZX64YeWbX2h2zi9RWSV+lehnU2E8ZBDaUV9oyLXOjQAoZwc9KRiVN1bev8 MST/itx4ZuyDngMOodpaNUt39dbJ8duZPRlSdORLLRn77zUMF1vLCK0iz3riD3lGYrkB bveg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717569625; x=1718174425; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nd73aXYUVtbFE1Ud3Hq1iCxcPOnVa/Poq92CQVoTAGM=; b=hBkPkaEkSAzGFoiyuEU+z8eSjf1AprMIxjiXUW8gEatApDgfxFLIuoLcNAatR01lPC Y/GlEBjb9lbXU5zbX6eT27Ah/xcixMOU3vne47lsP+XTtRivM2U/MIox/WmHCAgYdwS/ i88g+MpI4jqcxlZpHJkOy0jQvRrfHsfgj2izjIgLZN8sYsitGx5kAV7nwMZObBbNEsfr mcEIxHOPWnAb86tU6etwd9OqNWIFZ7W1kfS8UYuADYDkFkabFQsHVZz/zNMGGUFcMyXv T4LOkzqeO71L8p8eD69f8dV2BnxhEhNp0w60Uh6RyLJS5i1frnoa9Fzv72RbKMeBdFe8 RsCQ== X-Forwarded-Encrypted: i=1; AJvYcCWVPi9CUa8DvDJcNjF52QUyAN6C1pIJGn72+JT9WpculugyeEVJOXE+qhspfu87xYetjx3QmXdNTz2DT9FVdwrHOKR4gr+UP4nO09fhlBf7sLWx8mitWhE+tv+ox3Ev7pmVEY4Tg2LCJw== X-Gm-Message-State: AOJu0YylFOiIpr1D7pJiMFr8luOA4BPPuMbDgBLmzjNZPRSlkT4bzohQ B+I+PA9aIFcO/h14rB8b4sOiZZSUgFcN5SYRB+JbK17TWWVRMtiO X-Google-Smtp-Source: AGHT+IGIo9cFQjdf1f7qtQukArYnakMRP43ooxT5jwmp/Zs7v715gCmUJvR1CbRKCMP3Kx9VO/LamA== X-Received: by 2002:a50:cddb:0:b0:578:62f7:2881 with SMTP id 4fb4d7f45d1cf-57a7a52c025mr3793234a12.0.1717569625040; Tue, 04 Jun 2024 23:40:25 -0700 (PDT) Received: from hex.my.domain (83.8.128.191.ipv4.supernova.orange.pl. [83.8.128.191]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57a31b99445sm8665505a12.18.2024.06.04.23.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 23:40:24 -0700 (PDT) From: Artur Weber Date: Wed, 05 Jun 2024 08:40:13 +0200 Subject: [PATCH 2/2] ARM: dts: bcm-mobile: Split out nodes used by both BCM21664 and BCM23550 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240605-bcm21664-common-v1-2-6386e9141eb6@gmail.com> References: <20240605-bcm21664-common-v1-0-6386e9141eb6@gmail.com> In-Reply-To: <20240605-bcm21664-common-v1-0-6386e9141eb6@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden Cc: Broadcom internal kernel review list , Stanislav Jakubek , ~postmarketos/upstreaming@lists.sr.ht, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Artur Weber X-Mailer: b4 0.14-dev-d4707 X-Developer-Signature: v=1; a=ed25519-sha256; t=1717569621; l=30364; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=BQ4tSva1zNrjSygPvKnA9sRhSbYMdlDq5Sn3/8Jdcno=; b=ypCjD3VHm4n8Wvj1VV+abzgbMZ7ks0SIE/orYfMFuQZ2MD1fdfV/9hd2xcwGjoNQV7N3Jt5U1 rWrGfhCWICYBANri02yGn08ICCt7dmGVnSypKCU7CSt/+iJEv5w8nPf X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= The BCM21664 is nearly identical in terms of register layout to the BCM23550. Move the shared nodes into a new file, bcm21664-common.dtsi, and make both bcm21664.dtsi and bcm23550.dtsi include it. This new common file is based on the former bcm23550.dtsi file, and inherits its licensing. Signed-off-by: Artur Weber --- As for other uses - the BCM21654 (not in mainline) appears to be fairly similar in a few ways to the BCM21664 as well; the BCM21855/BCM11531 has a similar layout of registers, but there are much more differences. We could potentially further split more nodes into a single common Broadcom Kona DTSI, then make sub-DTSIs to just change the compatibles, but that's a task for another patch. --- .../{bcm23550.dtsi =3D> bcm21664-common.dtsi} | 109 +---- arch/arm/boot/dts/broadcom/bcm21664.dtsi | 388 ++--------------- arch/arm/boot/dts/broadcom/bcm23550.dtsi | 482 +++--------------= ---- 3 files changed, 131 insertions(+), 848 deletions(-) diff --git a/arch/arm/boot/dts/broadcom/bcm23550.dtsi b/arch/arm/boot/dts/b= roadcom/bcm21664-common.dtsi similarity index 68% copy from arch/arm/boot/dts/broadcom/bcm23550.dtsi copy to arch/arm/boot/dts/broadcom/bcm21664-common.dtsi index 50ebe93d6bd0..44978a459d32 100644 --- a/arch/arm/boot/dts/broadcom/bcm23550.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm21664-common.dtsi @@ -1,36 +1,13 @@ +// SPDX-License-Identifier: BSD-3-Clause /* - * BSD LICENSE + * Common device tree for components shared between the BCM21664 and BCM23= 550 + * SoCs. * - * Copyright(c) 2016 Broadcom. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Broadcom Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (C) 2016 Broadcom */ =20 -/* BCM23550 and BCM21664 have almost identical clocks */ +/dts-v1/; + #include #include #include @@ -38,58 +15,16 @@ / { #address-cells =3D <1>; #size-cells =3D <1>; - model =3D "BCM23550 SoC"; - compatible =3D "brcm,bcm23550"; - interrupt-parent =3D <&gic>; - - cpus { - #address-cells =3D <1>; - #size-cells =3D <0>; - - cpu0: cpu@0 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a7"; - reg =3D <0>; - clock-frequency =3D <1000000000>; - }; - - cpu1: cpu@1 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a7"; - enable-method =3D "brcm,bcm23550"; - secondary-boot-reg =3D <0x35004178>; - reg =3D <1>; - clock-frequency =3D <1000000000>; - }; - - cpu2: cpu@2 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a7"; - enable-method =3D "brcm,bcm23550"; - secondary-boot-reg =3D <0x35004178>; - reg =3D <2>; - clock-frequency =3D <1000000000>; - }; - - cpu3: cpu@3 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a7"; - enable-method =3D "brcm,bcm23550"; - secondary-boot-reg =3D <0x35004178>; - reg =3D <3>; - clock-frequency =3D <1000000000>; - }; - }; =20 /* Hub bus */ - hub@34000000 { + hub: hub-bus@34000000 { compatible =3D "simple-bus"; ranges =3D <0 0x34000000 0x102f83ac>; #address-cells =3D <1>; #size-cells =3D <1>; =20 smc@4e000 { - compatible =3D "brcm,bcm23550-smc", "brcm,kona-smc"; + compatible =3D "brcm,bcm21664-smc", "brcm,kona-smc"; reg =3D <0x0004e000 0x400>; /* 1 KiB in SRAM */ }; =20 @@ -99,7 +34,7 @@ resetmgr: reset-controller@1001f00 { }; =20 gpio: gpio@1003000 { - compatible =3D "brcm,bcm23550-gpio", "brcm,kona-gpio"; + compatible =3D "brcm,bcm21664-gpio", "brcm,kona-gpio"; reg =3D <0x01003000 0x524>; interrupts =3D , , @@ -120,7 +55,7 @@ timer@1006000 { }; =20 /* Slaves bus */ - slaves@3e000000 { + slaves: slaves-bus@3e000000 { compatible =3D "simple-bus"; ranges =3D <0 0x3e000000 0x0001c070>; #address-cells =3D <1>; @@ -157,7 +92,7 @@ uartb3: serial@2000 { }; =20 bsc1: i2c@16000 { - compatible =3D "brcm,bcm23550-i2c", "brcm,kona-i2c"; + compatible =3D "brcm,bcm21664-i2c", "brcm,kona-i2c"; reg =3D <0x00016000 0x70>; interrupts =3D ; #address-cells =3D <1>; @@ -167,7 +102,7 @@ bsc1: i2c@16000 { }; =20 bsc2: i2c@17000 { - compatible =3D "brcm,bcm23550-i2c", "brcm,kona-i2c"; + compatible =3D "brcm,bcm21664-i2c", "brcm,kona-i2c"; reg =3D <0x00017000 0x70>; interrupts =3D ; #address-cells =3D <1>; @@ -177,7 +112,7 @@ bsc2: i2c@17000 { }; =20 bsc3: i2c@18000 { - compatible =3D "brcm,bcm23550-i2c", "brcm,kona-i2c"; + compatible =3D "brcm,bcm21664-i2c", "brcm,kona-i2c"; reg =3D <0x00018000 0x70>; interrupts =3D ; #address-cells =3D <1>; @@ -187,7 +122,7 @@ bsc3: i2c@18000 { }; =20 bsc4: i2c@1c000 { - compatible =3D "brcm,bcm23550-i2c", "brcm,kona-i2c"; + compatible =3D "brcm,bcm21664-i2c", "brcm,kona-i2c"; reg =3D <0x0001c000 0x70>; interrupts =3D ; #address-cells =3D <1>; @@ -198,7 +133,7 @@ bsc4: i2c@1c000 { }; =20 /* Apps bus */ - apps@3e300000 { + apps: apps-bus@3e300000 { compatible =3D "simple-bus"; ranges =3D <0 0x3e300000 0x01b77000>; #address-cells =3D <1>; @@ -253,20 +188,6 @@ sdio4: mmc@eb0000 { clocks =3D <&master_ccu BCM21664_MASTER_CCU_SDIO4>; status =3D "disabled"; }; - - cdc: cdc@1b0e000 { - compatible =3D "brcm,bcm23550-cdc"; - reg =3D <0x01b0e000 0x78>; - }; - - gic: interrupt-controller@1b21000 { - compatible =3D "arm,cortex-a9-gic"; - #interrupt-cells =3D <3>; - #address-cells =3D <0>; - interrupt-controller; - reg =3D <0x01b21000 0x1000>, - <0x01b22000 0x1000>; - }; }; =20 clocks { diff --git a/arch/arm/boot/dts/broadcom/bcm21664.dtsi b/arch/arm/boot/dts/b= roadcom/bcm21664.dtsi dissimilarity index 93% index c1ad5123bad4..a868f09e8930 100644 --- a/arch/arm/boot/dts/broadcom/bcm21664.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm21664.dtsi @@ -1,341 +1,47 @@ -// SPDX-License-Identifier: GPL-2.0-only -// Copyright (C) 2014 Broadcom Corporation - -#include -#include -#include - -/ { - #address-cells =3D <1>; - #size-cells =3D <1>; - model =3D "BCM21664 SoC"; - compatible =3D "brcm,bcm21664"; - interrupt-parent =3D <&gic>; - - cpus { - #address-cells =3D <1>; - #size-cells =3D <0>; - - cpu0: cpu@0 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a9"; - reg =3D <0>; - }; - - cpu1: cpu@1 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a9"; - enable-method =3D "brcm,bcm11351-cpu-method"; - secondary-boot-reg =3D <0x35004178>; - reg =3D <1>; - }; - }; - - gic: interrupt-controller@3ff00100 { - compatible =3D "arm,cortex-a9-gic"; - #interrupt-cells =3D <3>; - #address-cells =3D <0>; - interrupt-controller; - reg =3D <0x3ff01000 0x1000>, - <0x3ff00100 0x100>; - }; - - smc@3404e000 { - compatible =3D "brcm,bcm21664-smc", "brcm,kona-smc"; - reg =3D <0x3404e000 0x400>; /* 1 KiB in SRAM */ - }; - - uartb: serial@3e000000 { - compatible =3D "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart"; - reg =3D <0x3e000000 0x118>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_UARTB>; - interrupts =3D ; - reg-shift =3D <2>; - reg-io-width =3D <4>; - status =3D "disabled"; - }; - - uartb2: serial@3e001000 { - compatible =3D "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart"; - reg =3D <0x3e001000 0x118>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_UARTB2>; - interrupts =3D ; - reg-shift =3D <2>; - reg-io-width =3D <4>; - status =3D "disabled"; - }; - - uartb3: serial@3e002000 { - compatible =3D "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart"; - reg =3D <0x3e002000 0x118>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_UARTB3>; - interrupts =3D ; - reg-shift =3D <2>; - reg-io-width =3D <4>; - status =3D "disabled"; - }; - - L2: cache-controller@3ff20000 { - compatible =3D "arm,pl310-cache"; - reg =3D <0x3ff20000 0x1000>; - cache-unified; - cache-level =3D <2>; - }; - - brcm,resetmgr@35001f00 { - compatible =3D "brcm,bcm21664-resetmgr"; - reg =3D <0x35001f00 0x24>; - }; - - timer@35006000 { - compatible =3D "brcm,kona-timer"; - reg =3D <0x35006000 0x1c>; - interrupts =3D ; - clocks =3D <&aon_ccu BCM21664_AON_CCU_HUB_TIMER>; - }; - - gpio: gpio@35003000 { - compatible =3D "brcm,bcm21664-gpio", "brcm,kona-gpio"; - reg =3D <0x35003000 0x524>; - interrupts =3D , - , - , - ; - #gpio-cells =3D <2>; - #interrupt-cells =3D <2>; - gpio-controller; - interrupt-controller; - }; - - sdio1: mmc@3f180000 { - compatible =3D "brcm,kona-sdhci"; - reg =3D <0x3f180000 0x801c>; - interrupts =3D ; - clocks =3D <&master_ccu BCM21664_MASTER_CCU_SDIO1>; - status =3D "disabled"; - }; - - sdio2: mmc@3f190000 { - compatible =3D "brcm,kona-sdhci"; - reg =3D <0x3f190000 0x801c>; - interrupts =3D ; - clocks =3D <&master_ccu BCM21664_MASTER_CCU_SDIO2>; - status =3D "disabled"; - }; - - sdio3: mmc@3f1a0000 { - compatible =3D "brcm,kona-sdhci"; - reg =3D <0x3f1a0000 0x801c>; - interrupts =3D ; - clocks =3D <&master_ccu BCM21664_MASTER_CCU_SDIO3>; - status =3D "disabled"; - }; - - sdio4: mmc@3f1b0000 { - compatible =3D "brcm,kona-sdhci"; - reg =3D <0x3f1b0000 0x801c>; - interrupts =3D ; - clocks =3D <&master_ccu BCM21664_MASTER_CCU_SDIO4>; - status =3D "disabled"; - }; - - bsc1: i2c@3e016000 { - compatible =3D "brcm,bcm21664-i2c", "brcm,kona-i2c"; - reg =3D <0x3e016000 0x70>; - interrupts =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_BSC1>; - status =3D "disabled"; - }; - - bsc2: i2c@3e017000 { - compatible =3D "brcm,bcm21664-i2c", "brcm,kona-i2c"; - reg =3D <0x3e017000 0x70>; - interrupts =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_BSC2>; - status =3D "disabled"; - }; - - bsc3: i2c@3e018000 { - compatible =3D "brcm,bcm21664-i2c", "brcm,kona-i2c"; - reg =3D <0x3e018000 0x70>; - interrupts =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_BSC3>; - status =3D "disabled"; - }; - - bsc4: i2c@3e01c000 { - compatible =3D "brcm,bcm21664-i2c", "brcm,kona-i2c"; - reg =3D <0x3e01c000 0x70>; - interrupts =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_BSC4>; - status =3D "disabled"; - }; - - clocks { - #address-cells =3D <1>; - #size-cells =3D <1>; - ranges; - - /* - * Fixed clocks are defined before CCUs whose - * clocks may depend on them. - */ - - ref_32k_clk: ref_32k { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <32768>; - }; - - bbl_32k_clk: bbl_32k { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <32768>; - }; - - ref_13m_clk: ref_13m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <13000000>; - }; - - var_13m_clk: var_13m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <13000000>; - }; - - dft_19_5m_clk: dft_19_5m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <19500000>; - }; - - ref_crystal_clk: ref_crystal { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <26000000>; - }; - - ref_52m_clk: ref_52m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <52000000>; - }; - - var_52m_clk: var_52m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <52000000>; - }; - - usb_otg_ahb_clk: usb_otg_ahb { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <52000000>; - }; - - ref_96m_clk: ref_96m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <96000000>; - }; - - var_96m_clk: var_96m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <96000000>; - }; - - ref_104m_clk: ref_104m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <104000000>; - }; - - var_104m_clk: var_104m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <104000000>; - }; - - ref_156m_clk: ref_156m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <156000000>; - }; - - var_156m_clk: var_156m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <156000000>; - }; - - root_ccu: root_ccu@35001000 { - compatible =3D "brcm,bcm21664-root-ccu"; - reg =3D <0x35001000 0x0f00>; - #clock-cells =3D <1>; - clock-output-names =3D "frac_1m"; - }; - - aon_ccu: aon_ccu@35002000 { - compatible =3D "brcm,bcm21664-aon-ccu"; - reg =3D <0x35002000 0x0f00>; - #clock-cells =3D <1>; - clock-output-names =3D "hub_timer"; - }; - - master_ccu: master_ccu@3f001000 { - compatible =3D "brcm,bcm21664-master-ccu"; - reg =3D <0x3f001000 0x0f00>; - #clock-cells =3D <1>; - clock-output-names =3D "sdio1", - "sdio2", - "sdio3", - "sdio4", - "sdio1_sleep", - "sdio2_sleep", - "sdio3_sleep", - "sdio4_sleep"; - }; - - slave_ccu: slave_ccu@3e011000 { - compatible =3D "brcm,bcm21664-slave-ccu"; - reg =3D <0x3e011000 0x0f00>; - #clock-cells =3D <1>; - clock-output-names =3D "uartb", - "uartb2", - "uartb3", - "bsc1", - "bsc2", - "bsc3", - "bsc4"; - }; - }; - - usbotg: usb@3f120000 { - compatible =3D "snps,dwc2"; - reg =3D <0x3f120000 0x10000>; - interrupts =3D ; - clocks =3D <&usb_otg_ahb_clk>; - clock-names =3D "otg"; - phys =3D <&usbphy>; - phy-names =3D "usb2-phy"; - status =3D "disabled"; - }; - - usbphy: usb-phy@3f130000 { - compatible =3D "brcm,kona-usb2-phy"; - reg =3D <0x3f130000 0x28>; - #phy-cells =3D <0>; - status =3D "disabled"; - }; -}; +// SPDX-License-Identifier: GPL-2.0-only +// Copyright (C) 2014 Broadcom Corporation + +#include "bcm21664-common.dtsi" + +/ { + model =3D "BCM21664 SoC"; + compatible =3D "brcm,bcm21664"; + interrupt-parent =3D <&gic>; + + cpus { + #address-cells =3D <1>; + #size-cells =3D <0>; + + cpu0: cpu@0 { + device_type =3D "cpu"; + compatible =3D "arm,cortex-a9"; + reg =3D <0>; + }; + + cpu1: cpu@1 { + device_type =3D "cpu"; + compatible =3D "arm,cortex-a9"; + enable-method =3D "brcm,bcm11351-cpu-method"; + secondary-boot-reg =3D <0x35004178>; + reg =3D <1>; + }; + }; + + apps: apps-bus@3e300000 { + gic: interrupt-controller@1c00100 { + compatible =3D "arm,cortex-a9-gic"; + #interrupt-cells =3D <3>; + #address-cells =3D <0>; + interrupt-controller; + reg =3D <0x01c01000 0x1000>, + <0x01c00100 0x100>; + }; + + L2: cache-controller@1c20000 { + compatible =3D "arm,pl310-cache"; + reg =3D <0x01c20000 0x1000>; + cache-unified; + cache-level =3D <2>; + }; + }; +}; diff --git a/arch/arm/boot/dts/broadcom/bcm23550.dtsi b/arch/arm/boot/dts/b= roadcom/bcm23550.dtsi dissimilarity index 88% index 50ebe93d6bd0..bb5ae970816b 100644 --- a/arch/arm/boot/dts/broadcom/bcm23550.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm23550.dtsi @@ -1,413 +1,69 @@ -/* - * BSD LICENSE - * - * Copyright(c) 2016 Broadcom. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Broadcom Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* BCM23550 and BCM21664 have almost identical clocks */ -#include -#include -#include - -/ { - #address-cells =3D <1>; - #size-cells =3D <1>; - model =3D "BCM23550 SoC"; - compatible =3D "brcm,bcm23550"; - interrupt-parent =3D <&gic>; - - cpus { - #address-cells =3D <1>; - #size-cells =3D <0>; - - cpu0: cpu@0 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a7"; - reg =3D <0>; - clock-frequency =3D <1000000000>; - }; - - cpu1: cpu@1 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a7"; - enable-method =3D "brcm,bcm23550"; - secondary-boot-reg =3D <0x35004178>; - reg =3D <1>; - clock-frequency =3D <1000000000>; - }; - - cpu2: cpu@2 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a7"; - enable-method =3D "brcm,bcm23550"; - secondary-boot-reg =3D <0x35004178>; - reg =3D <2>; - clock-frequency =3D <1000000000>; - }; - - cpu3: cpu@3 { - device_type =3D "cpu"; - compatible =3D "arm,cortex-a7"; - enable-method =3D "brcm,bcm23550"; - secondary-boot-reg =3D <0x35004178>; - reg =3D <3>; - clock-frequency =3D <1000000000>; - }; - }; - - /* Hub bus */ - hub@34000000 { - compatible =3D "simple-bus"; - ranges =3D <0 0x34000000 0x102f83ac>; - #address-cells =3D <1>; - #size-cells =3D <1>; - - smc@4e000 { - compatible =3D "brcm,bcm23550-smc", "brcm,kona-smc"; - reg =3D <0x0004e000 0x400>; /* 1 KiB in SRAM */ - }; - - resetmgr: reset-controller@1001f00 { - compatible =3D "brcm,bcm21664-resetmgr"; - reg =3D <0x01001f00 0x24>; - }; - - gpio: gpio@1003000 { - compatible =3D "brcm,bcm23550-gpio", "brcm,kona-gpio"; - reg =3D <0x01003000 0x524>; - interrupts =3D , - , - , - ; - #gpio-cells =3D <2>; - #interrupt-cells =3D <2>; - gpio-controller; - interrupt-controller; - }; - - timer@1006000 { - compatible =3D "brcm,kona-timer"; - reg =3D <0x01006000 0x1c>; - interrupts =3D ; - clocks =3D <&aon_ccu BCM21664_AON_CCU_HUB_TIMER>; - }; - }; - - /* Slaves bus */ - slaves@3e000000 { - compatible =3D "simple-bus"; - ranges =3D <0 0x3e000000 0x0001c070>; - #address-cells =3D <1>; - #size-cells =3D <1>; - - uartb: serial@0 { - compatible =3D "snps,dw-apb-uart"; - reg =3D <0x00000000 0x118>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_UARTB>; - interrupts =3D ; - reg-shift =3D <2>; - reg-io-width =3D <4>; - status =3D "disabled"; - }; - - uartb2: serial@1000 { - compatible =3D "snps,dw-apb-uart"; - reg =3D <0x00001000 0x118>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_UARTB2>; - interrupts =3D ; - reg-shift =3D <2>; - reg-io-width =3D <4>; - status =3D "disabled"; - }; - - uartb3: serial@2000 { - compatible =3D "snps,dw-apb-uart"; - reg =3D <0x00002000 0x118>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_UARTB3>; - interrupts =3D ; - reg-shift =3D <2>; - reg-io-width =3D <4>; - status =3D "disabled"; - }; - - bsc1: i2c@16000 { - compatible =3D "brcm,bcm23550-i2c", "brcm,kona-i2c"; - reg =3D <0x00016000 0x70>; - interrupts =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_BSC1>; - status =3D "disabled"; - }; - - bsc2: i2c@17000 { - compatible =3D "brcm,bcm23550-i2c", "brcm,kona-i2c"; - reg =3D <0x00017000 0x70>; - interrupts =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_BSC2>; - status =3D "disabled"; - }; - - bsc3: i2c@18000 { - compatible =3D "brcm,bcm23550-i2c", "brcm,kona-i2c"; - reg =3D <0x00018000 0x70>; - interrupts =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_BSC3>; - status =3D "disabled"; - }; - - bsc4: i2c@1c000 { - compatible =3D "brcm,bcm23550-i2c", "brcm,kona-i2c"; - reg =3D <0x0001c000 0x70>; - interrupts =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - clocks =3D <&slave_ccu BCM21664_SLAVE_CCU_BSC4>; - status =3D "disabled"; - }; - }; - - /* Apps bus */ - apps@3e300000 { - compatible =3D "simple-bus"; - ranges =3D <0 0x3e300000 0x01b77000>; - #address-cells =3D <1>; - #size-cells =3D <1>; - - usbotg: usb@e20000 { - compatible =3D "snps,dwc2"; - reg =3D <0x00e20000 0x10000>; - interrupts =3D ; - clocks =3D <&usb_otg_ahb_clk>; - clock-names =3D "otg"; - phys =3D <&usbphy>; - phy-names =3D "usb2-phy"; - status =3D "disabled"; - }; - - usbphy: usb-phy@e30000 { - compatible =3D "brcm,kona-usb2-phy"; - reg =3D <0x00e30000 0x28>; - #phy-cells =3D <0>; - status =3D "disabled"; - }; - - sdio1: mmc@e80000 { - compatible =3D "brcm,kona-sdhci"; - reg =3D <0x00e80000 0x801c>; - interrupts =3D ; - clocks =3D <&master_ccu BCM21664_MASTER_CCU_SDIO1>; - status =3D "disabled"; - }; - - sdio2: mmc@e90000 { - compatible =3D "brcm,kona-sdhci"; - reg =3D <0x00e90000 0x801c>; - interrupts =3D ; - clocks =3D <&master_ccu BCM21664_MASTER_CCU_SDIO2>; - status =3D "disabled"; - }; - - sdio3: mmc@ea0000 { - compatible =3D "brcm,kona-sdhci"; - reg =3D <0x00ea0000 0x801c>; - interrupts =3D ; - clocks =3D <&master_ccu BCM21664_MASTER_CCU_SDIO3>; - status =3D "disabled"; - }; - - sdio4: mmc@eb0000 { - compatible =3D "brcm,kona-sdhci"; - reg =3D <0x00eb0000 0x801c>; - interrupts =3D ; - clocks =3D <&master_ccu BCM21664_MASTER_CCU_SDIO4>; - status =3D "disabled"; - }; - - cdc: cdc@1b0e000 { - compatible =3D "brcm,bcm23550-cdc"; - reg =3D <0x01b0e000 0x78>; - }; - - gic: interrupt-controller@1b21000 { - compatible =3D "arm,cortex-a9-gic"; - #interrupt-cells =3D <3>; - #address-cells =3D <0>; - interrupt-controller; - reg =3D <0x01b21000 0x1000>, - <0x01b22000 0x1000>; - }; - }; - - clocks { - #address-cells =3D <1>; - #size-cells =3D <1>; - ranges; - - /* - * Fixed clocks are defined before CCUs whose - * clocks may depend on them. - */ - - ref_32k_clk: ref_32k { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <32768>; - }; - - bbl_32k_clk: bbl_32k { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <32768>; - }; - - ref_13m_clk: ref_13m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <13000000>; - }; - - var_13m_clk: var_13m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <13000000>; - }; - - dft_19_5m_clk: dft_19_5m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <19500000>; - }; - - ref_crystal_clk: ref_crystal { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <26000000>; - }; - - ref_52m_clk: ref_52m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <52000000>; - }; - - var_52m_clk: var_52m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <52000000>; - }; - - usb_otg_ahb_clk: usb_otg_ahb { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <52000000>; - }; - - ref_96m_clk: ref_96m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <96000000>; - }; - - var_96m_clk: var_96m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <96000000>; - }; - - ref_104m_clk: ref_104m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <104000000>; - }; - - var_104m_clk: var_104m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <104000000>; - }; - - ref_156m_clk: ref_156m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <156000000>; - }; - - var_156m_clk: var_156m { - #clock-cells =3D <0>; - compatible =3D "fixed-clock"; - clock-frequency =3D <156000000>; - }; - - root_ccu: root_ccu@35001000 { - compatible =3D "brcm,bcm21664-root-ccu"; - reg =3D <0x35001000 0x0f00>; - #clock-cells =3D <1>; - clock-output-names =3D "frac_1m"; - }; - - aon_ccu: aon_ccu@35002000 { - compatible =3D "brcm,bcm21664-aon-ccu"; - reg =3D <0x35002000 0x0f00>; - #clock-cells =3D <1>; - clock-output-names =3D "hub_timer"; - }; - - slave_ccu: slave_ccu@3e011000 { - compatible =3D "brcm,bcm21664-slave-ccu"; - reg =3D <0x3e011000 0x0f00>; - #clock-cells =3D <1>; - clock-output-names =3D "uartb", - "uartb2", - "uartb3", - "bsc1", - "bsc2", - "bsc3", - "bsc4"; - }; - - master_ccu: master_ccu@3f001000 { - compatible =3D "brcm,bcm21664-master-ccu"; - reg =3D <0x3f001000 0x0f00>; - #clock-cells =3D <1>; - clock-output-names =3D "sdio1", - "sdio2", - "sdio3", - "sdio4", - "sdio1_sleep", - "sdio2_sleep", - "sdio3_sleep", - "sdio4_sleep"; - }; - }; -}; +// SPDX-License-Identifier: BSD-3-Clause +/* + * Device tree for the BCM23550 SoC. + * + * Copyright (C) 2016 Broadcom + */ + +#include "bcm21664-common.dtsi" + +/ { + model =3D "BCM23550 SoC"; + compatible =3D "brcm,bcm23550"; + interrupt-parent =3D <&gic>; + + cpus { + #address-cells =3D <1>; + #size-cells =3D <0>; + + cpu0: cpu@0 { + device_type =3D "cpu"; + compatible =3D "arm,cortex-a7"; + reg =3D <0>; + clock-frequency =3D <1000000000>; + }; + + cpu1: cpu@1 { + device_type =3D "cpu"; + compatible =3D "arm,cortex-a7"; + enable-method =3D "brcm,bcm23550"; + secondary-boot-reg =3D <0x35004178>; + reg =3D <1>; + clock-frequency =3D <1000000000>; + }; + + cpu2: cpu@2 { + device_type =3D "cpu"; + compatible =3D "arm,cortex-a7"; + enable-method =3D "brcm,bcm23550"; + secondary-boot-reg =3D <0x35004178>; + reg =3D <2>; + clock-frequency =3D <1000000000>; + }; + + cpu3: cpu@3 { + device_type =3D "cpu"; + compatible =3D "arm,cortex-a7"; + enable-method =3D "brcm,bcm23550"; + secondary-boot-reg =3D <0x35004178>; + reg =3D <3>; + clock-frequency =3D <1000000000>; + }; + }; + + apps: apps-bus@3e300000 { + cdc: cdc@1b0e000 { + compatible =3D "brcm,bcm23550-cdc"; + reg =3D <0x01b0e000 0x78>; + }; + + gic: interrupt-controller@1b21000 { + compatible =3D "arm,cortex-a9-gic"; + #interrupt-cells =3D <3>; + #address-cells =3D <0>; + interrupt-controller; + reg =3D <0x01b21000 0x1000>, + <0x01b22000 0x1000>; + }; + }; +}; --=20 2.45.1