summaryrefslogtreecommitdiff
path: root/zephyr/projects/nissa/joxer
diff options
context:
space:
mode:
Diffstat (limited to 'zephyr/projects/nissa/joxer')
-rw-r--r--zephyr/projects/nissa/joxer/cbi.dts2
-rw-r--r--zephyr/projects/nissa/joxer/generated.dts2
-rw-r--r--zephyr/projects/nissa/joxer/keyboard.dts2
-rw-r--r--zephyr/projects/nissa/joxer/motionsense.dts2
-rw-r--r--zephyr/projects/nissa/joxer/overlay.dts21
-rw-r--r--zephyr/projects/nissa/joxer/power_signals.dts2
-rw-r--r--zephyr/projects/nissa/joxer/prj.conf2
-rw-r--r--zephyr/projects/nissa/joxer/pwm_leds.dts2
-rw-r--r--zephyr/projects/nissa/joxer/src/charger.c2
-rw-r--r--zephyr/projects/nissa/joxer/src/fan.c2
-rw-r--r--zephyr/projects/nissa/joxer/src/keyboard.c2
-rw-r--r--zephyr/projects/nissa/joxer/src/led.c2
-rw-r--r--zephyr/projects/nissa/joxer/src/usbc.c2
13 files changed, 26 insertions, 19 deletions
diff --git a/zephyr/projects/nissa/joxer/cbi.dts b/zephyr/projects/nissa/joxer/cbi.dts
index 7a91ab6aa9..afbd125b32 100644
--- a/zephyr/projects/nissa/joxer/cbi.dts
+++ b/zephyr/projects/nissa/joxer/cbi.dts
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/zephyr/projects/nissa/joxer/generated.dts b/zephyr/projects/nissa/joxer/generated.dts
index cf789d7eab..22214b9726 100644
--- a/zephyr/projects/nissa/joxer/generated.dts
+++ b/zephyr/projects/nissa/joxer/generated.dts
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
diff --git a/zephyr/projects/nissa/joxer/keyboard.dts b/zephyr/projects/nissa/joxer/keyboard.dts
index b9e9c21707..bf0b098c62 100644
--- a/zephyr/projects/nissa/joxer/keyboard.dts
+++ b/zephyr/projects/nissa/joxer/keyboard.dts
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/zephyr/projects/nissa/joxer/motionsense.dts b/zephyr/projects/nissa/joxer/motionsense.dts
index 137b71cdfd..537cc34451 100644
--- a/zephyr/projects/nissa/joxer/motionsense.dts
+++ b/zephyr/projects/nissa/joxer/motionsense.dts
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/zephyr/projects/nissa/joxer/overlay.dts b/zephyr/projects/nissa/joxer/overlay.dts
index 4747a9b0e2..e0b7422edd 100644
--- a/zephyr/projects/nissa/joxer/overlay.dts
+++ b/zephyr/projects/nissa/joxer/overlay.dts
@@ -1,4 +1,4 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -238,7 +238,10 @@
reg = <0>;
bc12 = <&bc12_port0>;
chg = <&chg_port0>;
- usb-muxes = <&virtual_mux_0>;
+ usb-mux-chain-0 {
+ compatible = "cros-ec,usb-mux-chain";
+ usb-muxes = <&virtual_mux_0>;
+ };
};
port0-muxes {
virtual_mux_0: virtual-mux-0 {
@@ -250,11 +253,15 @@
reg = <1>;
bc12 = <&bc12_port1>;
chg = <&chg_port1>;
- /*
- * Some sub-boards may disable all usb muxes in chain
- * except virtual_mux_1
- */
- usb-muxes = <&virtual_mux_1 &tcpci_mux_1>;
+ usb-mux-chain-1 {
+ compatible = "cros-ec,usb-mux-chain";
+ usb-muxes = <&virtual_mux_1 &tcpci_mux_1>;
+ };
+ usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux {
+ compatible = "cros-ec,usb-mux-chain";
+ alternative-chain;
+ usb-muxes = <&virtual_mux_1>;
+ };
};
port1-muxes {
virtual_mux_1: virtual-mux-1 {
diff --git a/zephyr/projects/nissa/joxer/power_signals.dts b/zephyr/projects/nissa/joxer/power_signals.dts
index 0f10bba52f..8affae03b1 100644
--- a/zephyr/projects/nissa/joxer/power_signals.dts
+++ b/zephyr/projects/nissa/joxer/power_signals.dts
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/zephyr/projects/nissa/joxer/prj.conf b/zephyr/projects/nissa/joxer/prj.conf
index c3b39b0424..c623a4f672 100644
--- a/zephyr/projects/nissa/joxer/prj.conf
+++ b/zephyr/projects/nissa/joxer/prj.conf
@@ -1,4 +1,4 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/zephyr/projects/nissa/joxer/pwm_leds.dts b/zephyr/projects/nissa/joxer/pwm_leds.dts
index bdeada2a82..aa4a76b271 100644
--- a/zephyr/projects/nissa/joxer/pwm_leds.dts
+++ b/zephyr/projects/nissa/joxer/pwm_leds.dts
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/zephyr/projects/nissa/joxer/src/charger.c b/zephyr/projects/nissa/joxer/src/charger.c
index ff350b44da..b9454d8b80 100644
--- a/zephyr/projects/nissa/joxer/src/charger.c
+++ b/zephyr/projects/nissa/joxer/src/charger.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/zephyr/projects/nissa/joxer/src/fan.c b/zephyr/projects/nissa/joxer/src/fan.c
index 8abeb95b39..6d234b2fc3 100644
--- a/zephyr/projects/nissa/joxer/src/fan.c
+++ b/zephyr/projects/nissa/joxer/src/fan.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/zephyr/projects/nissa/joxer/src/keyboard.c b/zephyr/projects/nissa/joxer/src/keyboard.c
index fb627549b4..48db40f53f 100644
--- a/zephyr/projects/nissa/joxer/src/keyboard.c
+++ b/zephyr/projects/nissa/joxer/src/keyboard.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/zephyr/projects/nissa/joxer/src/led.c b/zephyr/projects/nissa/joxer/src/led.c
index 91c6b8e118..d66e5b27a6 100644
--- a/zephyr/projects/nissa/joxer/src/led.c
+++ b/zephyr/projects/nissa/joxer/src/led.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 The ChromiumOS Authors.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
diff --git a/zephyr/projects/nissa/joxer/src/usbc.c b/zephyr/projects/nissa/joxer/src/usbc.c
index 6ee939e47a..5fec9ab544 100644
--- a/zephyr/projects/nissa/joxer/src/usbc.c
+++ b/zephyr/projects/nissa/joxer/src/usbc.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
View Lorry Controller Status