diff options
Diffstat (limited to 'zephyr/boards/arm/npcx_evb')
| -rw-r--r-- | zephyr/boards/arm/npcx_evb/Kconfig.board | 2 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx_evb/Kconfig.defconfig | 2 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx_evb/npcx7_evb.dts | 7 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig | 3 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx_evb/npcx9_evb.dts | 7 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig | 3 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx_evb/npcx_evb.dtsi | 17 |
7 files changed, 24 insertions, 17 deletions
diff --git a/zephyr/boards/arm/npcx_evb/Kconfig.board b/zephyr/boards/arm/npcx_evb/Kconfig.board index 0a64548887..00b6b75f72 100644 --- a/zephyr/boards/arm/npcx_evb/Kconfig.board +++ b/zephyr/boards/arm/npcx_evb/Kconfig.board @@ -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/boards/arm/npcx_evb/Kconfig.defconfig b/zephyr/boards/arm/npcx_evb/Kconfig.defconfig index c0c874ad26..512a8403e7 100644 --- a/zephyr/boards/arm/npcx_evb/Kconfig.defconfig +++ b/zephyr/boards/arm/npcx_evb/Kconfig.defconfig @@ -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/boards/arm/npcx_evb/npcx7_evb.dts b/zephyr/boards/arm/npcx_evb/npcx7_evb.dts index 1780495feb..75ad9e33a6 100644 --- a/zephyr/boards/arm/npcx_evb/npcx7_evb.dts +++ b/zephyr/boards/arm/npcx_evb/npcx7_evb.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. */ @@ -22,3 +22,8 @@ pinctrl-0 = <&uart1_2_sin_sout_gp64_65>; pinctrl-names = "default"; }; + +/* PSL_OUT is fixed to GPIO85 in npcx7 series. */ +&power_ctrl_psl { + enable-gpios = <&gpio8 5 0>; +}; diff --git a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig index 169108f18b..faee09f492 100644 --- a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig +++ b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig @@ -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. @@ -29,6 +29,7 @@ CONFIG_PINCTRL=y # GPIO Controller CONFIG_GPIO=y +CONFIG_GPIO_GET_CONFIG=y # Clock configuration CONFIG_CLOCK_CONTROL=y diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb.dts b/zephyr/boards/arm/npcx_evb/npcx9_evb.dts index 6669575466..1def8dc48f 100644 --- a/zephyr/boards/arm/npcx_evb/npcx9_evb.dts +++ b/zephyr/boards/arm/npcx_evb/npcx9_evb.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. */ @@ -23,3 +23,8 @@ &uart1_2_sout_gp65>; pinctrl-names = "default"; }; + +/* PSL_OUT is fixed to GPIO85 in npcx9 series. */ +&power_ctrl_psl { + enable-gpios = <&gpio8 5 0>; +}; diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig index e64abd9e73..da75b3d113 100644 --- a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig +++ b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig @@ -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. @@ -29,6 +29,7 @@ CONFIG_PINCTRL=y # GPIO Controller CONFIG_GPIO=y +CONFIG_GPIO_GET_CONFIG=y # Clock configuration CONFIG_CLOCK_CONTROL=y diff --git a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi index 9a9f221bfc..615df09a64 100644 --- a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi +++ b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi @@ -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. */ @@ -22,23 +22,23 @@ i2c_evb_0_0 { i2c-port = <&i2c0_0>; - enum-name = "I2C_PORT_EVB_0"; + enum-names = "I2C_PORT_EVB_0"; }; i2c_evb_1_0 { i2c-port = <&i2c1_0>; - enum-name = "I2C_PORT_EVB_1"; + enum-names = "I2C_PORT_EVB_1"; }; i2c_evb_2_0 { i2c-port = <&i2c2_0>; - enum-name = "I2C_PORT_EVB_2"; + enum-names = "I2C_PORT_EVB_2"; }; i2c_evb_3_0 { i2c-port = <&i2c3_0>; - enum-name = "I2C_PORT_EVB_3"; + enum-names = "I2C_PORT_EVB_3"; }; i2c_evb_7_0 { i2c-port = <&i2c7_0>; - enum-name = "I2C_PORT_EVB_7"; + enum-names = "I2C_PORT_EVB_7"; }; }; @@ -46,27 +46,22 @@ compatible = "named-adc-channels"; adc_ch_0 { - label = "ADC0"; enum-name = "ADC_EVB_CH_0"; io-channels = <&adc0 0>; }; adc_ch_1 { - label = "ADC1"; enum-name = "ADC_EVB_CH_1"; io-channels = <&adc0 1>; }; adc_ch_2 { - label = "ADC2"; enum-name = "ADC_EVB_CH_2"; io-channels = <&adc0 2>; }; adc_ch_3 { - label = "ADC3"; enum-name = "ADC_EVB_CH_3"; io-channels = <&adc0 3>; }; adc_ch_4 { - label = "ADC4"; enum-name = "ADC_EVB_CH_4"; io-channels = <&adc0 4>; }; |