From nobody Sun Feb 8 15:07:52 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 C970125A2A1 for ; Mon, 10 Feb 2025 22:57:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739228239; cv=none; b=Y6TX7n+m76+70N7r0+K+Q/+HFcg42ngyHC+0EcZtMrQeIz1XplPc24qX2ILuxV6J2bsnRackgwMoizbZQzGblze4uZPRISZyY5/Mvt6KfVrQ22bb36TcTUo9cPJfgXvNkXP6dPR4+5gt2pQQ1oEpVAiXtEkicBhDLgCGWtZy9h8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739228239; c=relaxed/simple; bh=TigOjWjByS/qOxFStuN4jxQdOoIMiI/Kd8fVikyy1TM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XbDfAVDyjLnwhKKVrDZnTo77QC7niTLun7Feezytd/2RDfNAtTIbGxI62tFI4gbiWRVNCTYUOSBBBCuch4zCsL9KGp6SQDMpD7IxRs00e1Uz6JyeHUcr87XjW58d2eJ1HbRFR5u2d6HqCp4sblxd92V+G7MPCfgjANGgAn50das= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=IB0jmWQw; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="IB0jmWQw" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2fa44590eebso4986707a91.3 for ; Mon, 10 Feb 2025 14:57:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739228237; x=1739833037; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CZJsAaQGNn6Yx+uv7DpUfzz85gmu7DiYTeAAhcXBbX4=; b=IB0jmWQwT2FxQhF10tXeQW9PjWfvwL4KYJYDG6AcTELx5gdjyaGsaNQ4ZGfinwm+vP J/MJBU7VybBzzn6T5h+k3G2R6DYUAE1hUYmSgxg1N8PJ73mMN1qFdTI5CzB5bWljZ/Sx faxvvE9KyFsjSvPK4JVK4ItwsSM+tl/+YdGHQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739228237; x=1739833037; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CZJsAaQGNn6Yx+uv7DpUfzz85gmu7DiYTeAAhcXBbX4=; b=AP9QpkYON5EPgkn9Hfp/lsIuxQ4ltGotTZO9Pdv9Q20pcbn0PckWva1KXsux3wvX8r aaLQ0bO4RCwVh5deY2cqmdF0iWgy6qjlcGE1tEqCmoP8by9D3KBtlFsZYitbfxXMA+at FaiCfoYePbssa7q2DP9SUw/4nFI+nE4FAoCx0aLEATqrUgezL9PHFLWL/bKxVLxtqlt7 7/yRc8zRSIN+lvGS8oNG7BJpCtMKWqllfgr0/q8hFNT3tPYvbIYkH8hBZj/JWWUTdwz6 MZ+L/cIcI2emvYy+x+esE1cMKAVBfMeYSrvP0GB+VQhZ2tj1fOJNqvnAXhpVFUzMy/5Q PgTA== X-Gm-Message-State: AOJu0YzjrDi0/x5bPaHkJgjbXWoJc2CXBWFvI88ZxNn7j/p2ANe3YhbV wM1VaV5uaaz13dXNWGGKmJw96hT6iz2hAELfLxYIk1LsOYaVD0OYQbHDPF31oA== X-Gm-Gg: ASbGncvOB2w0HAYm3c3ekCT3mnPh7AbIvw9wPvZdjuuX1duxYQZwGN5mTUscvCdBAAJ sbhohHuCqCy1hb3skv14dwTilZH60F6YwhA4eDU6gt5aTny+Vfx0/A6tBq3M495DHgNvd/9qBhe DtlzHbzE5HEeZSM19P5iHnxV2bhcgPQRRrHwpQkfqa4+mcErGtsoPoJvnDXZF3//1lQIdpn2k91 bUk5oTB6h+Sr5LRz6GBPbVvT/GZJLUJE12+3r/FQiKIbidVnfdUKW40G4J5/HJwiGixRjn0KIH+ 63Vyxkfi9ZqIFADzmHODkug1aADHGdKf9X8nDJYwbRQd/96n4iqyT7Q= X-Google-Smtp-Source: AGHT+IGZ3N+kY02h1wIak+gBqbJaa+gpVr6uo4aUlKJT3x7EaQ/2I7u1jOu0/8aGMau+q+PMMuwGiA== X-Received: by 2002:a05:6a00:1798:b0:730:8e97:bd74 with SMTP id d2e1a72fcca58-7308e97c379mr8317065b3a.2.1739228236978; Mon, 10 Feb 2025 14:57:16 -0800 (PST) Received: from localhost (222.246.125.34.bc.googleusercontent.com. [34.125.246.222]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-730840e842bsm3436416b3a.88.2025.02.10.14.57.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Feb 2025 14:57:16 -0800 (PST) From: Stephen Boyd To: Konrad Dybcio , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, patches@lists.linux.dev, Rob Herring , Krzysztof Kozlowski , Conor Dooley , Benson Leung , devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Pin-yen Lin Subject: [PATCH v3 1/2] dt-bindings: usb: Add binding for ChromeOS Pogo pin keyboard connector Date: Mon, 10 Feb 2025 14:57:11 -0800 Message-ID: <20250210225714.1073618-2-swboyd@chromium.org> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog In-Reply-To: <20250210225714.1073618-1-swboyd@chromium.org> References: <20250210225714.1073618-1-swboyd@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Describe the set of pins used to connect the detachable keyboard on detachable ChromeOS devices. The set of pins is called the "pogo pins". It's basically USB 2.0 with an extra pin for base detection. We expect to find a keyboard on the other side of this connector with a specific vid/pid, so describe that as a child device at the port of the usb device connected upstream. Cc: Rob Herring Cc: Krzysztof Kozlowski Cc: Conor Dooley Cc: Benson Leung Cc: Cc: Cc: Pin-yen Lin Signed-off-by: Stephen Boyd --- .../usb/google,usb-pogo-keyboard.yaml | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/google,usb-pogo-k= eyboard.yaml diff --git a/Documentation/devicetree/bindings/usb/google,usb-pogo-keyboard= .yaml b/Documentation/devicetree/bindings/usb/google,usb-pogo-keyboard.yaml new file mode 100644 index 000000000000..e1b3b2c1711e --- /dev/null +++ b/Documentation/devicetree/bindings/usb/google,usb-pogo-keyboard.yaml @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/usb/google,usb-pogo-keyboard.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Google USB Pogo Pin Keyboard + +maintainers: + - Stephen Boyd + +description: + ChromeOS devices with a detachable keyboard have a set of five pogo pins= that + are the typical four pins for USB (D+/D-, VBUS, GND) and an extra pin for + base detection. The detachable keyboard is a USB device that connects to= the + four USB pogo pins. + +properties: + compatible: + const: google,usb-pogo-keyboard + + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + port: + $ref: /schemas/graph.yaml#/properties/port + description: Connection to USB2 port providing USB HS signals + required: + - endpoint + +patternProperties: + "^keyboard@[0-9a-f]{1,2}$": + description: The detachable keyboard + type: object + $ref: /schemas/usb/usb-device.yaml + unevaluatedProperties: false + +required: + - compatible + - '#address-cells' + - '#size-cells' + - port + +additionalProperties: false + +examples: + - | + connector { + compatible =3D "google,usb-pogo-keyboard"; + #address-cells =3D <1>; + #size-cells =3D <0>; + + keyboard@2 { + compatible =3D "usb18d1,504c"; + reg =3D <2>; + }; + + port { + pogo_connector_in: endpoint { + remote-endpoint =3D <&usb_hub_dsp3_hs>; + }; + }; + }; + +... --=20 https://chromeos.dev From nobody Sun Feb 8 15:07:52 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 4BB2325A2AD for ; Mon, 10 Feb 2025 22:57:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739228241; cv=none; b=hhKn6m6qvli78c3weTRRtVCPyw4UGCc2LHuEacXkTc10t4D3slv7ayzsyn4LkZTdysDBCtOalrykeodiJYCQwEMZ8uTIJreyi4wX8Wtm30CXuSGYZVM78ZwrQWSGVOcseO1dRlRxp9idk+yxiAyk8qRXwBiAeNkTZdqXVLBwd4U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739228241; c=relaxed/simple; bh=cVBuTyyxHtoHv82ibjHY39xAQ/a7ov6kzLJy9X3iJ1w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qNSXSyUFfEUpHN0hUZRfpC2LzJ6j1hrAoDyYZtBSfzKW48LV/MMozFyLRJIwNuFDUoz84sIL/um50IjDrKHDkktiaE2aQkBjyccj6wI95hMX1ScH3Ko6wM/X6/CnykpBe0CLmN2iL4m2wzs54Yz2wHhU8o9ED2za0NI9SBxYWxI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=AFWUD8ZC; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="AFWUD8ZC" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21f6f18b474so34704015ad.1 for ; Mon, 10 Feb 2025 14:57:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739228238; x=1739833038; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B2TMWQZOU48p3apEenIg9cWRNKsU3G8uFbxEYjoTKz4=; b=AFWUD8ZCzmrRnQTmWfZLykFTTSabwaDbK/WFuXl7BMqxz1qXK/0iuTz9SisMdVTa95 lMkdkol/azwEzO5EdNeYIJvUPxfpPtD3Znf1p+jN3xignCa4pJV315acXLsHT6JB5ESn q37kJ1BNjP9soosIl8K+jQ8CidQtnismYW7Rs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739228238; x=1739833038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B2TMWQZOU48p3apEenIg9cWRNKsU3G8uFbxEYjoTKz4=; b=oNwaEYibKAo6Isi9Da6GFKJVlvIWc5XHPrsX+JaZj6U91msP1Rhilylz9JM968cn8Z U+zZK5ncQpe9TlBHZrcfomQIaCUUNSFPeXuUUm7Syq7nIzmqBYzJnSigm4GXQnM9oMf1 ewZMNJv6Wd0qyJY8928eEYPEjUHEXzS4nVc5+5uDIL+VyC5KXwF0WNR/lzWfzKZbP6ub aRPvDrHeDx44ULtT5mfuOJPNNdN4UGj6IcEYVDxlC7phhixAo2uQzF/rfwAeaR9BF6tu Rd2ulMRRWbzy+Fm4/cTnF59DjdcsL41ayrtxE+eaWcyaIYgiBGgn/n3XVkswm1Nxq2s7 sH9w== X-Gm-Message-State: AOJu0YxGT1QSshc0ppIxP+mhZNI1wAvUZgTRnnUWP2ddi9CEDX2c41wI 3O1O94ixDeF23tJKGPG+MBgvt1ZWrbMABRd1FvbX/jaMhGfaMSgPYo1EFCrokw== X-Gm-Gg: ASbGnctIssAD5QTRwiypo+oT+3o6rCflz80dfJmHDNK1uw9LKWYuwsQ4w3EyiN4jltC D/m/HMQTa6cgozAB3CWKoyie+0Zs47lojAqVfsEfmGfX0itjbalQAtjoY09tNmQghhHQdxyt+1x MzSi8ZO6UWrFo6ncCRy/j9GarzC8FTVKoX8OhHAGY3CYtk34K7RFL+vw+XYg1sYSTciuhIRoZhw oSsJ6ytBclHo6Hc1+LCNIzY4aht8sPEajKj3neVPVwVIQdWiC2L0Qy8CGwM5itBQhWUwJI8Xq0B N4pd9Zd3EsEFd0HhIWLp1Sh4+n6jQmLEOSVQEWfaXlG3t9zyz+Z1Nk8= X-Google-Smtp-Source: AGHT+IGdwPxvUX1GWCk8KWoZjeQmrh4Z6x0ZXSTeFhG0SP9E8wT2IvFLk9vTpJ3Y5FNrVgw+cJ1Omw== X-Received: by 2002:a17:902:e802:b0:21f:db8:262d with SMTP id d9443c01a7336-21f4e7636c0mr281455855ad.35.1739228238416; Mon, 10 Feb 2025 14:57:18 -0800 (PST) Received: from localhost (222.246.125.34.bc.googleusercontent.com. [34.125.246.222]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-ad51af7a22dsm8277473a12.69.2025.02.10.14.57.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Feb 2025 14:57:18 -0800 (PST) From: Stephen Boyd To: Konrad Dybcio , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, patches@lists.linux.dev, cros-qcom-dts-watchers@chromium.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Pin-yen Lin Subject: [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Wire up USB to usb-c-connectors Date: Mon, 10 Feb 2025 14:57:12 -0800 Message-ID: <20250210225714.1073618-3-swboyd@chromium.org> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog In-Reply-To: <20250210225714.1073618-1-swboyd@chromium.org> References: <20250210225714.1073618-1-swboyd@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fully describe the USB type-c on sc7180 Trogdor devices. Most Trogdor devices have two USB type-c ports (i.e. usb-c-connector nodes), but Quackingstick only has one. Also, clamshell devices such as Lazor have a USB webcam connected to the USB hub, while detachable devices such as Wormdingler don't have a webcam, or a USB type-a connector. Instead they have the pogo pins for the detachable keyboard. Fully describing the topology like this will let us expose information about what devices are connected to which physical USB connector (type-A or type-C). Cc: Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: Rob Herring Cc: Krzysztof Kozlowski Cc: Conor Dooley Cc: Cc: Cc: Pin-yen Lin Signed-off-by: Stephen Boyd --- .../dts/qcom/sc7180-trogdor-clamshell.dtsi | 21 ++++ .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 47 ++++++++ .../dts/qcom/sc7180-trogdor-detachable.dtsi | 15 +++ .../dts/qcom/sc7180-trogdor-homestar.dtsi | 47 ++++++++ .../dts/qcom/sc7180-trogdor-kingoftown.dts | 55 +++++++++ .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 55 +++++++++ .../boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 55 +++++++++ .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 44 +++++++ .../qcom/sc7180-trogdor-quackingstick.dtsi | 31 +++++ .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 56 ++++++++- .../dts/qcom/sc7180-trogdor-wormdingler.dtsi | 47 ++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 109 ++++++++++++++++++ 12 files changed, 580 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi b/arch/= arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi index d91533b80e76..4e4f0b239f3c 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi @@ -7,3 +7,24 @@ =20 /* This file must be included after sc7180-trogdor.dtsi to modify cros_ec = */ #include + +/ { + usb-a-connector { + compatible =3D "usb-a-connector"; + + port { + #address-cells =3D <1>; + #size-cells =3D <0>; + + usb_a0_hs: endpoint@0 { + reg =3D <0>; + /* Endpoint filled in by board */ + }; + + usb_a0_ss: endpoint@1 { + reg =3D <1>; + /* Endpoint filled in by board */ + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm= 64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index 25b17b0425f2..548d6c1ee050 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -134,6 +134,17 @@ skin-temp-thermistor@1 { }; }; =20 +&pogo_pins { + keyboard@4 { + compatible =3D "usb18d1,504c"; + reg =3D <4>; + }; +}; + +&pogo_pins_in { + remote-endpoint =3D <&usb_hub_dfp4_hs>; +}; + &pp1800_uf_cam { status =3D "okay"; }; @@ -175,6 +186,42 @@ &sound_multimedia0_codec { sound-dai =3D <&adau7002>; }; =20 +&usb_c0_hs { + remote-endpoint =3D <&usb_hub_dfp1_hs>; +}; + +&usb_c0_ss { + remote-endpoint =3D <&usb_hub_dfp1_ss>; +}; + +&usb_c1_hs { + remote-endpoint =3D <&usb_hub_dfp2_hs>; +}; + +&usb_c1_ss { + remote-endpoint =3D <&usb_hub_dfp2_ss>; +}; + +&usb_hub_dfp1_hs { + remote-endpoint =3D <&usb_c0_hs>; +}; + +&usb_hub_dfp1_ss { + remote-endpoint =3D <&usb_c0_ss>; +}; + +&usb_hub_dfp2_hs { + remote-endpoint =3D <&usb_c1_hs>; +}; + +&usb_hub_dfp2_ss { + remote-endpoint =3D <&usb_c1_ss>; +}; + +&usb_hub_dfp4_hs { + remote-endpoint =3D <&pogo_pins_in>; +}; + /* PINCTRL - modifications to sc7180-trogdor.dtsi */ =20 &en_pp3300_dx_edp { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi b/arch= /arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi index 7c5d8a57ef7f..d33c73f4bac4 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi @@ -6,6 +6,21 @@ */ =20 /* This file must be included after sc7180-trogdor.dtsi to modify cros_ec = */ + +/ { + pogo_pins: keyboard-connector { + compatible =3D "google,usb-pogo-keyboard"; + #address-cells =3D <1>; + #size-cells =3D <0>; + /* Detachable keyboard filled in by board */ + port { + pogo_pins_in: endpoint { + /* Endpoint filled in by board */ + }; + }; + }; +}; + &cros_ec { keyboard-controller { compatible =3D "google,cros-ec-keyb-switches"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/a= rm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index f57976906d63..09c4a30d96ef 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -159,6 +159,17 @@ skin-temp-thermistor@1 { }; }; =20 +&pogo_pins { + keyboard@3 { + compatible =3D "usb18d1,5052"; + reg =3D <3>; + }; +}; + +&pogo_pins_in { + remote-endpoint =3D <&usb_hub_dfp3_hs>; +}; + &pp1800_uf_cam { status =3D "okay"; }; @@ -187,6 +198,42 @@ &sound_multimedia1_codec { sound-dai =3D <&max98360a>, <&max98360a_1>, <&max98360a_2>, <&max98360a_3= > ; }; =20 +&usb_c0_hs { + remote-endpoint =3D <&usb_hub_dfp2_hs>; +}; + +&usb_c0_ss { + remote-endpoint =3D <&usb_hub_dfp2_ss>; +}; + +&usb_c1_hs { + remote-endpoint =3D <&usb_hub_dfp4_hs>; +}; + +&usb_c1_ss { + remote-endpoint =3D <&usb_hub_dfp4_ss>; +}; + +&usb_hub_dfp2_hs { + remote-endpoint =3D <&usb_c0_hs>; +}; + +&usb_hub_dfp2_ss { + remote-endpoint =3D <&usb_c0_ss>; +}; + +&usb_hub_dfp3_hs { + remote-endpoint =3D <&pogo_pins_in>; +}; + +&usb_hub_dfp4_hs { + remote-endpoint =3D <&usb_c1_hs>; +}; + +&usb_hub_dfp4_ss { + remote-endpoint =3D <&usb_c1_ss>; +}; + &wifi { qcom,ath10k-calibration-variant =3D "GO_HOMESTAR"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts b/arch/= arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts index 655bea928e52..d4ff26fba3be 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts @@ -78,6 +78,61 @@ &pp3300_dx_edp { gpio =3D <&tlmm 67 GPIO_ACTIVE_HIGH>; }; =20 +&usb_a0_hs { + remote-endpoint =3D <&usb_hub_dfp3_hs>; +}; + +&usb_a0_ss { + remote-endpoint =3D <&usb_hub_dfp3_ss>; +}; + +&usb_c0_hs { + remote-endpoint =3D <&usb_hub_dfp1_hs>; +}; + +&usb_c0_ss { + remote-endpoint =3D <&usb_hub_dfp1_ss>; +}; + +&usb_c1_hs { + remote-endpoint =3D <&usb_hub_dfp2_hs>; +}; + +&usb_c1_ss { + remote-endpoint =3D <&usb_hub_dfp2_ss>; +}; + +&usb_hub_2_x { + camera@4 { + compatible =3D "usb4f2,b75a"; + reg =3D <4>; + }; +}; + +&usb_hub_dfp1_hs { + remote-endpoint =3D <&usb_c0_hs>; +}; + +&usb_hub_dfp1_ss { + remote-endpoint =3D <&usb_c0_ss>; +}; + +&usb_hub_dfp2_hs { + remote-endpoint =3D <&usb_c1_hs>; +}; + +&usb_hub_dfp2_ss { + remote-endpoint =3D <&usb_c1_ss>; +}; + +&usb_hub_dfp3_hs { + remote-endpoint =3D <&usb_a0_hs>; +}; + +&usb_hub_dfp3_ss { + remote-endpoint =3D <&usb_a0_ss>; +}; + &wifi { qcom,ath10k-calibration-variant =3D "GO_KINGOFTOWN"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm6= 4/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index c3fd6760de7a..7b545ae5791b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -68,6 +68,61 @@ &trackpad { interrupts =3D <58 IRQ_TYPE_EDGE_FALLING>; }; =20 +&usb_a0_hs { + remote-endpoint =3D <&usb_hub_dfp3_hs>; +}; + +&usb_a0_ss { + remote-endpoint =3D <&usb_hub_dfp3_ss>; +}; + +&usb_c0_hs { + remote-endpoint =3D <&usb_hub_dfp2_hs>; +}; + +&usb_c0_ss { + remote-endpoint =3D <&usb_hub_dfp2_ss>; +}; + +&usb_c1_hs { + remote-endpoint =3D <&usb_hub_dfp4_hs>; +}; + +&usb_c1_ss { + remote-endpoint =3D <&usb_hub_dfp4_ss>; +}; + +&usb_hub_2_x { + camera@1 { + compatible =3D "usb408,a092"; + reg =3D <1>; + }; +}; + +&usb_hub_dfp2_hs { + remote-endpoint =3D <&usb_c0_hs>; +}; + +&usb_hub_dfp2_ss { + remote-endpoint =3D <&usb_c0_ss>; +}; + +&usb_hub_dfp3_hs { + remote-endpoint =3D <&usb_a0_hs>; +}; + +&usb_hub_dfp3_ss { + remote-endpoint =3D <&usb_a0_ss>; +}; + +&usb_hub_dfp4_hs { + remote-endpoint =3D <&usb_c1_hs>; +}; + +&usb_hub_dfp4_ss { + remote-endpoint =3D <&usb_c1_ss>; +}; + &wifi { qcom,ath10k-calibration-variant =3D "GO_LAZOR"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi b/arch/ar= m64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi index cc2c5610a279..9523843f06ab 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi @@ -82,6 +82,61 @@ &pp3300_dx_edp { gpio =3D <&tlmm 67 GPIO_ACTIVE_HIGH>; }; =20 +&usb_a0_hs { + remote-endpoint =3D <&usb_hub_dfp3_hs>; +}; + +&usb_a0_ss { + remote-endpoint =3D <&usb_hub_dfp3_ss>; +}; + +&usb_c0_hs { + remote-endpoint =3D <&usb_hub_dfp1_hs>; +}; + +&usb_c0_ss { + remote-endpoint =3D <&usb_hub_dfp1_ss>; +}; + +&usb_c1_hs { + remote-endpoint =3D <&usb_hub_dfp2_hs>; +}; + +&usb_c1_ss { + remote-endpoint =3D <&usb_hub_dfp2_ss>; +}; + +&usb_hub_2_x { + camera@4 { + compatible =3D "usb5c8,b03"; + reg =3D <4>; + }; +}; + +&usb_hub_dfp1_hs { + remote-endpoint =3D <&usb_c0_hs>; +}; + +&usb_hub_dfp1_ss { + remote-endpoint =3D <&usb_c0_ss>; +}; + +&usb_hub_dfp2_hs { + remote-endpoint =3D <&usb_c1_hs>; +}; + +&usb_hub_dfp2_ss { + remote-endpoint =3D <&usb_c1_ss>; +}; + +&usb_hub_dfp3_hs { + remote-endpoint =3D <&usb_a0_hs>; +}; + +&usb_hub_dfp3_ss { + remote-endpoint =3D <&usb_a0_ss>; +}; + /* PINCTRL - modifications to sc7180-trogdor.dtsi */ =20 &en_pp3300_dx_edp { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm= 64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi index f7300ffbb451..4cc1a155d999 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi @@ -176,10 +176,54 @@ &sound { dmic-gpios =3D <&tlmm 86 GPIO_ACTIVE_HIGH>; }; =20 +&usb_a0_hs { + remote-endpoint =3D <&usb_hub_dfp4_hs>; +}; + +&usb_a0_ss { + remote-endpoint =3D <&usb_hub_dfp4_ss>; +}; + +&usb_c0_hs { + remote-endpoint =3D <&usb_hub_dfp3_hs>; +}; + +&usb_c0_ss { + remote-endpoint =3D <&usb_hub_dfp3_ss>; +}; + &usb_c1 { status =3D "disabled"; }; =20 +&usb_hub_2_x { + camera@1 { + compatible =3D "usb4f2,b718"; + reg =3D <1>; + }; + + camera@2 { + compatible =3D "usb13d3,56e9"; + reg =3D <2>; + }; +}; + +&usb_hub_dfp3_hs { + remote-endpoint =3D <&usb_c0_hs>; +}; + +&usb_hub_dfp3_ss { + remote-endpoint =3D <&usb_c0_ss>; +}; + +&usb_hub_dfp4_hs { + remote-endpoint =3D <&usb_a0_hs>; +}; + +&usb_hub_dfp4_ss { + remote-endpoint =3D <&usb_a0_ss>; +}; + &wifi { qcom,ath10k-calibration-variant =3D "GO_POMPOM"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/a= rch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi index ff8996b4de4e..174efd3abfa5 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi @@ -105,6 +105,17 @@ &sdhc_2 { status =3D "okay"; }; =20 +&pogo_pins { + keyboard@1 { + compatible =3D "usb18d1,505b"; + reg =3D <1>; + }; +}; + +&pogo_pins_in { + remote-endpoint =3D <&usb_hub_dfp1_hs>; +}; + &pp1800_uf_cam { status =3D "okay"; }; @@ -129,11 +140,31 @@ pp3300_disp_on: &pp3300_dx_edp { gpio =3D <&tlmm 67 GPIO_ACTIVE_HIGH>; }; =20 +&usb_c0_hs { + remote-endpoint =3D <&usb_hub_dfp2_hs>; +}; + +&usb_c0_ss { + remote-endpoint =3D <&usb_hub_dfp2_ss>; +}; + /* This board only has 1 USB Type-C port. */ &usb_c1 { status =3D "disabled"; }; =20 +&usb_hub_dfp2_hs { + remote-endpoint =3D <&usb_c0_hs>; +}; + +&usb_hub_dfp2_ss { + remote-endpoint =3D <&usb_c0_ss>; +}; + +&usb_hub_dfp1_hs { + remote-endpoint =3D <&pogo_pins_in>; +}; + /* PINCTRL - modifications to sc7180-trogdor.dtsi */ =20 /* diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/bo= ot/dts/qcom/sc7180-trogdor-r1.dts index d393a2712ce6..dddf92c04c4d 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -52,12 +52,64 @@ &trackpad { interrupts =3D <58 IRQ_TYPE_EDGE_FALLING>; }; =20 +&usb_a0_hs { + remote-endpoint =3D <&usb_hub_dfp3_hs>; +}; + +&usb_a0_ss { + remote-endpoint =3D <&usb_hub_dfp3_ss>; +}; + +&usb_c0_hs { + remote-endpoint =3D <&usb_hub_dfp2_hs>; +}; + +&usb_c0_ss { + remote-endpoint =3D <&usb_hub_dfp2_ss>; +}; + +&usb_c1_hs { + remote-endpoint =3D <&usb_hub_dfp4_hs>; +}; + +&usb_c1_ss { + remote-endpoint =3D <&usb_hub_dfp4_ss>; +}; + &usb_hub_2_x { - vdd-supply =3D <&pp3300_l7c>; + vdd-supply =3D <&pp3300_l7c>; + camera@1 { + compatible =3D "usb4f2,b567"; + reg =3D <1>; + }; }; =20 &usb_hub_3_x { - vdd-supply =3D <&pp3300_l7c>; + vdd-supply =3D <&pp3300_l7c>; +}; + +&usb_hub_dfp2_hs { + remote-endpoint =3D <&usb_c0_hs>; +}; + +&usb_hub_dfp2_ss { + remote-endpoint =3D <&usb_c0_ss>; +}; + +&usb_hub_dfp3_hs { + remote-endpoint =3D <&usb_a0_hs>; +}; + +&usb_hub_dfp3_ss { + remote-endpoint =3D <&usb_a0_ss>; +}; + +&usb_hub_dfp4_hs { + remote-endpoint =3D <&usb_c1_hs>; +}; + +&usb_hub_dfp4_ss { + remote-endpoint =3D <&usb_c1_ss>; }; =20 /* PINCTRL - modifications to sc7180-trogdor.dtsi */ diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arc= h/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi index d4925be3b1fc..59cdf8eea647 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi @@ -179,6 +179,17 @@ skin-temp-thermistor@1 { }; }; =20 +&pogo_pins { + keyboard@3 { + compatible =3D "usb18d1,5057"; + reg =3D <3>; + }; +}; + +&pogo_pins_in { + remote-endpoint =3D <&usb_hub_dfp3_hs>; +}; + &pp1800_uf_cam { status =3D "okay"; }; @@ -195,6 +206,42 @@ &pp2800_wf_cam { status =3D "okay"; }; =20 +&usb_c0_hs { + remote-endpoint =3D <&usb_hub_dfp2_hs>; +}; + +&usb_c0_ss { + remote-endpoint =3D <&usb_hub_dfp2_ss>; +}; + +&usb_c1_hs { + remote-endpoint =3D <&usb_hub_dfp4_hs>; +}; + +&usb_c1_ss { + remote-endpoint =3D <&usb_hub_dfp3_ss>; +}; + +&usb_hub_dfp2_hs { + remote-endpoint =3D <&usb_c0_hs>; +}; + +&usb_hub_dfp2_ss { + remote-endpoint =3D <&usb_c0_ss>; +}; + +&usb_hub_dfp4_hs { + remote-endpoint =3D <&usb_c1_hs>; +}; + +&usb_hub_dfp3_ss { + remote-endpoint =3D <&usb_c1_ss>; +}; + +&usb_hub_dfp3_hs { + remote-endpoint =3D <&pogo_pins_in>; +}; + &wifi { qcom,ath10k-calibration-variant =3D "GO_WORMDINGLER"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot= /dts/qcom/sc7180-trogdor.dtsi index 74ab321d3333..af866cdd4fef 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -673,6 +673,25 @@ usb_c0: connector@0 { power-role =3D "dual"; data-role =3D "host"; try-power-role =3D "source"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + usb_c0_hs: endpoint { + /* Endpoint filled in by board */ + }; + }; + + port@1 { + reg =3D <1>; + usb_c0_ss: endpoint { + /* Endpoint filled in by board */ + }; + }; + }; }; =20 usb_c1: connector@1 { @@ -682,6 +701,25 @@ usb_c1: connector@1 { power-role =3D "dual"; data-role =3D "host"; try-power-role =3D "source"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + usb_c1_hs: endpoint { + /* Endpoint filled in by board */ + }; + }; + + port@1 { + reg =3D <1>; + usb_c1_ss: endpoint { + /* Endpoint filled in by board */ + }; + }; + }; }; }; }; @@ -966,6 +1004,41 @@ usb_hub_2_x: hub@1 { reg =3D <1>; vdd-supply =3D <&pp3300_hub>; peer-hub =3D <&usb_hub_3_x>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + usb_hub_2_x_ports: ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@1 { + reg =3D <1>; + usb_hub_dfp1_hs: endpoint { + /* Endpoint filled in by board */ + }; + }; + port@2 { + reg =3D <2>; + usb_hub_dfp2_hs: endpoint { + /* Endpoint filled in by board */ + }; + }; + + port@3 { + reg =3D <3>; + usb_hub_dfp3_hs: endpoint { + /* Endpoint filled in by board */ + }; + }; + + port@4 { + reg =3D <4>; + usb_hub_dfp4_hs: endpoint { + /* Endpoint filled in by board */ + }; + }; + }; }; =20 /* 3.x hub on port 2 */ @@ -974,6 +1047,42 @@ usb_hub_3_x: hub@2 { reg =3D <2>; vdd-supply =3D <&pp3300_hub>; peer-hub =3D <&usb_hub_2_x>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + usb_hub_3_x_ports: ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@1 { + reg =3D <1>; + usb_hub_dfp1_ss: endpoint { + /* Endpoint filled in by board */ + }; + }; + + port@2 { + reg =3D <2>; + usb_hub_dfp2_ss: endpoint { + /* Endpoint filled in by board */ + }; + }; + + port@3 { + reg =3D <3>; + usb_hub_dfp3_ss: endpoint { + /* Endpoint filled in by board */ + }; + }; + + port@4 { + reg =3D <4>; + usb_hub_dfp4_ss: endpoint { + /* Endpoint filled in by board */ + }; + }; + }; }; }; =20 --=20 https://chromeos.dev