| Message ID | 20240210070934.2549994-1-swboyd@chromium.org |
|---|---|
| Headers | show |
| Series | platform/chrome: Add DT USB/DP muxing/topology to Trogdor | expand |
On Sat, 10 Feb 2024 at 09:16, Stephen Boyd <swboyd@chromium.org> wrote: > > It's simpler to reason about things if we disable nodes instead of > deleting them. Disable the second usb type-c connector node on > quackingstick instead of deleting it so that we can reason about ports > more easily. > > Cc: <cros-qcom-dts-watchers@chromium.org> > Cc: Andy Gross <agross@kernel.org> > Cc: Bjorn Andersson <andersson@kernel.org> > Cc: Konrad Dybcio <konrad.dybcio@linaro.org> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > Cc: Conor Dooley <conor+dt@kernel.org> > Cc: <linux-arm-msm@vger.kernel.org> > Cc: <devicetree@vger.kernel.org> > Cc: Pin-yen Lin <treapking@chromium.org> > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > --- > .../arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Sat, 10 Feb 2024 at 09:17, Stephen Boyd <swboyd@chromium.org> wrote: > > At a high-level, detachable Trogdors (sometimes known as Strongbads) > don't have a cros_ec keyboard, while all clamshell Trogdors (only known > as Trogdors) always have a cros_ec keyboard. Looking closer though, all > clamshells have a USB type-A connector and a hardwired USB camera. And > all detachables replace the USB camera with a MIPI based one and swap > the USB type-a connector for the detachable keyboard pogo pins. > > Split the detachable and clamshell bits into different files so we can > describe these differences in one place instead of in each board that > includes sc7180-trogdor.dtsi. For now this is just the keyboard part, > but eventually this will include the type-a port and the pogo pins. > > Cc: <cros-qcom-dts-watchers@chromium.org> > Cc: Andy Gross <agross@kernel.org> > Cc: Bjorn Andersson <andersson@kernel.org> > Cc: Konrad Dybcio <konrad.dybcio@linaro.org> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > Cc: Conor Dooley <conor+dt@kernel.org> > Cc: <linux-arm-msm@vger.kernel.org> > Cc: <devicetree@vger.kernel.org> > Cc: Pin-yen Lin <treapking@chromium.org> > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > --- > .../boot/dts/qcom/sc7180-trogdor-clamshell.dtsi | 9 +++++++++ > arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 5 +---- > .../boot/dts/qcom/sc7180-trogdor-detachable.dtsi | 12 ++++++++++++ > .../arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 7 +------ > .../boot/dts/qcom/sc7180-trogdor-kingoftown.dts | 2 +- > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 +-- > arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 2 +- > .../boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi | 7 +------ > arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 2 +- > .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi | 5 +---- > 11 files changed, 30 insertions(+), 26 deletions(-) > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On 10/02/2024 08:09, Stephen Boyd wrote: > The ChromeOS embedded controller (EC) supports setting the state of > GPIOs when the system is unlocked, and getting the state of GPIOs in all > cases. The GPIOs are on the EC itself, so the EC acts similar to a GPIO > expander. Add a binding to describe these GPIOs in DT so that other > devices described in DT can read the GPIOs on the EC. ... > + > +additionalProperties: false > + > +examples: > + - | > + spi { > + #address-cells = <1>; > + #size-cells = <0>; > + > + cros-ec@0 { > + compatible = "google,cros-ec-spi"; > + reg = <0>; > + interrupts = <101 0>; This is should be proper define but then are you sure interrupt is type NONE? Does not look right. Best regards, Krzysztof
On 10/02/2024 08:09, Stephen Boyd wrote: > Add a binding for the USB type-c switch controls found on some ChromeOS > Embedded Controllers (ECs). When this device is a mode switch, it takes > one DisplayPort (DP) port as input and some number (possibly zero) of > USB SuperSpeed ports (bundles of USB SS lanes) as input, and muxes those > lanes into USB type-c SuperSpeed lanes suitable for the SSTRX1/2 pins on > a usb-c-connector. When this device is an orientation switch, it > redirects the DP lanes to the proper USB type-c SSTRX lanes. > > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > Cc: Conor Dooley <conor+dt@kernel.org> > Cc: Lee Jones <lee@kernel.org> > Cc: Benson Leung <bleung@chromium.org> > Cc: Guenter Roeck <groeck@chromium.org> > Cc: Prashant Malani <pmalani@chromium.org> > Cc: Tzung-Bi Shih <tzungbi@kernel.org> > Cc: <devicetree@vger.kernel.org> > Cc: <chrome-platform@lists.linux.dev> > Cc: Pin-yen Lin <treapking@chromium.org> > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > --- > .../chrome/google,cros-ec-typec-switch.yaml | 365 ++++++++++++++++++ > .../bindings/mfd/google,cros-ec.yaml | 5 + > 2 files changed, 370 insertions(+) > create mode 100644 Documentation/devicetree/bindings/chrome/google,cros-ec-typec-switch.yaml Ah, and wrong placement. There is no hardware called "chrome", please don't stuff things there. USB switches go to other USB switches (git grep usb-switch.yaml will give you hints). Best regards, Krzysztof
This series adds support for fully describing the USB/DP topology on ChromeOS Trogdor devices in DT. Trogdor devices have a single DP phy in the AP that is muxed to one of two usb type-c connectors depending on which port asserts HPD first to the EC. We'd like to know which port is connected to an external monitor to provide a better experience to the user about things like which type-c port is displaying DP or which type-c hub is acting up, etc. Describing the connection all the way from the source to the connector will allow us to do this. There will be some more work to do after this to wire up sysfs connections, but that work has already started or finished so it should be mostly minor changes to support DT there. This patch series is large, unfortunately, and is ordered in logical groups: gpio, USB, DRM, typec, and finally dts to put it all together. There's more that could be put in here, e.g. supporting ChromeOS Corsola devices, but I wanted to get something out there early instead of waiting to make this work with everything that exists today and posting it then. Onto the patches: First is the EC GPIO driver, which is dependency free and can be merged at any time. It's only needed to provide information about which port the EC is steering DP to, because the EC had a bug where it never told the AP about which port has HPD asserted or not. Second is the USB binding and hub patches. These are used to describe how the USB hub is wired up on all the Trogdor devices, and make the connect_type be something besides "unknown" on DT devices. ACPI has supported setting a proper connect_type for some time now. These can also be merged pretty much dependency free, except that the dt binding will be needed to avoid DT binding check failures. I don't think those checks are fatal though, so probably also fine to take this part independently. Third is the DRM bridge patches. These are used to implement lane assignment for DP altmode configurations through the drm_bridge code. The typec code will use this to tell the DP phy how many lanes of DP to drive and which lanes to drive out to the USB type-c connector. Adding support for lane assignment allows us to implement DP muxing as well, physically splitting the DP lanes on the DP phy so that hardware doesn't have to use an analog mux to steer two DP lanes to one or the other type-c port. These are a hard dependency for the typec code. Fourth is the typec patches, that ties together everything that comes before it in this series. The EC typec switch driver implements a drm_bridge that can signal HPD from the type-c connector through the bridge chain, mux the DP phy in software so that we don't have to use an analog mux, and implement orientation control for boards like Kukui that directly connect the DP phy to the type-c port, necessitating lane assignment to flip the lanes to match the cable orientation. Finally, the dts patches wire everything up to fully describe the USB/DT topology on Trogdor. This includes the USB hub, the EC gpios, the DP controller, and the external connectors like the usb-c and usb-a connectors. After this initial version I will probably split this series and send parts in pieces to more rapidly send new versions. Those parts will refer back to this version in the cover letter so we can all get the full context. I don't expect to merge this through one maintainer tree immediately, so I set the 'To' line to chrome-platform to reflect the overall target audience. Prashant Malani (1): platform/chrome: cros_ec_typec: Purge blocking switch devlinks Stephen Boyd (21): dt-bindings: gpio: Add binding for ChromeOS EC GPIO controller gpio: Add ChromeOS EC GPIO driver dt-bindings: usb: Add downstream facing ports to realtek binding usb: core: Set connect_type of ports based on DT node drm/atomic-helper: Introduce lane remapping support to bridges drm/bridge: Verify lane assignment is going to work during atomic_check device property: Add remote endpoint to devcon matcher platform/chrome: cros_typec_switch: Use read_poll_timeout helper platform/chrome: cros_typec_switch: Move port creation code to sub-function platform/chrome: cros_typec_switch: Use fwnode instead of ACPI APIs platform/chrome: cros_typec_switch: Use dev_err_probe() dt-bindings: chrome: Add google,cros-ec-typec-switch binding platform/chrome: cros_typec_switch: Add support for signaling HPD to drm_bridge platform/chrome: cros_typec_switch: Support DP muxing via DRM lane assignment platform/chrome: cros_typec_switch: Support orientation-switch platform/chrome: cros_typec_switch: Handle lack of HPD information dt-bindings: chrome: Add binding for ChromeOS Pogo pin connector arm64: dts: qcom: sc7180: quackingstick: Disable instead of delete usb_c1 arm64: dts: qcom: sc7180: pazquel: Add missing comment header arm64: dts: qcom: sc7180-trogdor: Make clamshell/detachable fragments arm64: dts: qcom: sc7180-trogdor: Wire up USB and DP to usb-c-connectors .../chrome/google,cros-ec-typec-switch.yaml | 365 ++++++++++++ .../chrome/google,pogo-pin-connector.yaml | 61 ++ .../bindings/gpio/google,cros-ec-gpio.yaml | 49 ++ .../bindings/mfd/google,cros-ec.yaml | 8 + .../bindings/usb/realtek,rts5411.yaml | 50 ++ .../dts/qcom/sc7180-trogdor-clamshell.dtsi | 30 + .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 52 +- .../dts/qcom/sc7180-trogdor-detachable.dtsi | 25 + .../dts/qcom/sc7180-trogdor-homestar.dtsi | 54 +- .../dts/qcom/sc7180-trogdor-kingoftown.dts | 57 +- .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 58 +- .../boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 59 +- .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 46 +- .../qcom/sc7180-trogdor-quackingstick.dtsi | 46 +- .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 2 +- .../dts/qcom/sc7180-trogdor-wormdingler.dtsi | 52 +- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 175 ++++++ drivers/base/property.c | 7 +- drivers/gpio/Kconfig | 10 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-cros-ec.c | 218 +++++++ drivers/gpu/drm/drm_atomic_state_helper.c | 2 + drivers/gpu/drm/drm_bridge.c | 50 ++ drivers/platform/chrome/Kconfig | 3 +- drivers/platform/chrome/cros_ec_typec.c | 10 + drivers/platform/chrome/cros_typec_switch.c | 555 +++++++++++++++--- drivers/usb/core/port.c | 37 ++ drivers/usb/roles/class.c | 4 +- drivers/usb/typec/mux.c | 8 + drivers/usb/typec/retimer.c | 7 +- include/drm/drm_atomic.h | 31 + include/drm/drm_bridge.h | 4 + include/linux/property.h | 5 +- 33 files changed, 2026 insertions(+), 115 deletions(-) create mode 100644 Documentation/devicetree/bindings/chrome/google,cros-ec-typec-switch.yaml create mode 100644 Documentation/devicetree/bindings/chrome/google,pogo-pin-connector.yaml create mode 100644 Documentation/devicetree/bindings/gpio/google,cros-ec-gpio.yaml create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi create mode 100644 drivers/gpio/gpio-cros-ec.c Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Andrzej Hajda <andrzej.hajda@intel.com> Cc: Andy Gross <agross@kernel.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Bartosz Golaszewski <brgl@bgdev.pl> Cc: Benson Leung <bleung@chromium.org> Cc: Bjorn Andersson <andersson@kernel.org> Cc: <chrome-platform@lists.linux.dev> Cc: Conor Dooley <conor+dt@kernel.org> Cc: <cros-qcom-dts-watchers@chromium.org> Cc: Daniel Scally <djrscally@gmail.com> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: David Airlie <airlied@gmail.com> Cc: <devicetree@vger.kernel.org> Cc: <dri-devel@lists.freedesktop.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guenter Roeck <groeck@chromium.org> Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> Cc: Ivan Orlov <ivan.orlov0322@gmail.com> Cc: Jernej Skrabec <jernej.skrabec@gmail.com> Cc: Jonas Karlman <jonas@kwiboo.se> Cc: Konrad Dybcio <konrad.dybcio@linaro.org> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> Cc: Lee Jones <lee@kernel.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: <linux-acpi@vger.kernel.org> Cc: <linux-arm-msm@vger.kernel.org> Cc: <linux-gpio@vger.kernel.org> Cc: <linux-usb@vger.kernel.org> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: maciek swiech <drmasquatch@google.com> Cc: Matthias Kaehlcke <mka@chromium.org> Cc: Maxime Ripard <mripard@kernel.org> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Neil Armstrong <neil.armstrong@linaro.org> Cc: Pin-yen Lin <treapking@chromium.org> Cc: Prashant Malani <pmalani@chromium.org> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> Cc: Robert Foss <rfoss@kernel.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Sakari Ailus <sakari.ailus@linux.intel.com> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Tzung-Bi Shih <tzungbi@kernel.org> Cc: Vinod Koul <vkoul@kernel.org> base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a