diff options
Diffstat (limited to 'zephyr/program/trogdor')
| -rw-r--r-- | zephyr/program/trogdor/lazor/host_interface_npcx.dts | 2 | ||||
| -rw-r--r-- | zephyr/program/trogdor/lazor/i2c.dts | 12 | ||||
| -rw-r--r-- | zephyr/program/trogdor/lazor/interrupts.dts | 10 | ||||
| -rw-r--r-- | zephyr/program/trogdor/lazor/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/program/trogdor/lazor/src/usbc_config.c | 4 |
5 files changed, 11 insertions, 18 deletions
diff --git a/zephyr/program/trogdor/lazor/host_interface_npcx.dts b/zephyr/program/trogdor/lazor/host_interface_npcx.dts index 14efa3c6b2..b691893854 100644 --- a/zephyr/program/trogdor/lazor/host_interface_npcx.dts +++ b/zephyr/program/trogdor/lazor/host_interface_npcx.dts @@ -4,7 +4,7 @@ */ /* host interface */ -&shi { +&shi0 { status = "okay"; pinctrl-0 = <&shi_gp46_47_53_55>; pinctrl-1 = <&shi_gpio_gp46_47_53_55>; diff --git a/zephyr/program/trogdor/lazor/i2c.dts b/zephyr/program/trogdor/lazor/i2c.dts index 8d11d4c90a..595bae59c7 100644 --- a/zephyr/program/trogdor/lazor/i2c.dts +++ b/zephyr/program/trogdor/lazor/i2c.dts @@ -76,7 +76,11 @@ compatible = "parade,ps8xxx"; status = "okay"; reg = <0xb>; - int-pin = <&gpio_usb_c0_pd_int_odl>; + /* a duplicate of the <&gpio_usb_c0_pd_int_odl> node in + * "named-gpios". This is the Zephyr preferred style, + * the "named-gpios" node will be dealt with at a later date. + */ + irq-gpios = <&gpioe 0 GPIO_ACTIVE_LOW>; }; }; @@ -100,7 +104,11 @@ compatible = "parade,ps8xxx"; status = "okay"; reg = <0xb>; - int-pin = <&gpio_usb_c1_pd_int_odl>; + /* a duplicate of the <&gpio_usb_c1_pd_int_odl> node in + * "named-gpios". This is the Zephyr preferred style, + * the "named-gpios" node will be dealt with at a later date. + */ + irq-gpios = <&gpiof 5 GPIO_ACTIVE_LOW>; }; }; diff --git a/zephyr/program/trogdor/lazor/interrupts.dts b/zephyr/program/trogdor/lazor/interrupts.dts index 5c2ed35e90..90e20b8e48 100644 --- a/zephyr/program/trogdor/lazor/interrupts.dts +++ b/zephyr/program/trogdor/lazor/interrupts.dts @@ -81,16 +81,6 @@ flags = <GPIO_INT_EDGE_BOTH>; handler = "chipset_warm_reset_interrupt"; }; - int_usb_c0_tcpc: usb_c0_tcpc { - irq-pin = <&gpio_usb_c0_pd_int_odl>; - flags = <GPIO_INT_EDGE_FALLING>; - handler = "tcpc_alert_event"; - }; - int_usb_c1_tcpc: usb_c1_tcpc { - irq-pin = <&gpio_usb_c1_pd_int_odl>; - flags = <GPIO_INT_EDGE_FALLING>; - handler = "tcpc_alert_event"; - }; int_usb_c0_swctl: usb_c0_swctl { irq-pin = <&gpio_usb_c0_swctl_int_odl>; flags = <GPIO_INT_EDGE_FALLING>; diff --git a/zephyr/program/trogdor/lazor/prj.conf b/zephyr/program/trogdor/lazor/prj.conf index 958c854bd9..9dd83cefe8 100644 --- a/zephyr/program/trogdor/lazor/prj.conf +++ b/zephyr/program/trogdor/lazor/prj.conf @@ -78,7 +78,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y # USB-C CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=n -CONFIG_PLATFORM_EC_USBC_RETIMER_FW_UPDATE=n CONFIG_PLATFORM_EC_USBC_SS_MUX_DFP_ONLY=y CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y diff --git a/zephyr/program/trogdor/lazor/src/usbc_config.c b/zephyr/program/trogdor/lazor/src/usbc_config.c index 5cb96be7eb..d8cafee7a3 100644 --- a/zephyr/program/trogdor/lazor/src/usbc_config.c +++ b/zephyr/program/trogdor/lazor/src/usbc_config.c @@ -176,10 +176,6 @@ void board_tcpc_init(void) /* Enable PPC interrupts */ gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usb_c0_swctl)); - /* Enable TCPC interrupts */ - gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usb_c0_tcpc)); - gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usb_c1_tcpc)); - /* * Initialize HPD to low; after sysjump SOC needs to see * HPD pulse to enable video path |