Skip to content

Commit

Permalink
Microchip: MEC172X DTS files reorganization
Browse files Browse the repository at this point in the history
MEC172X series SoCs share most IP but the -LJ series expands the PWM and
ADC channels available as well as defines extra pinctrl pins.
Separating these better to be able to simplify their inclusion and
driver code.  Any board based on either the -SZ or -LJ package can just
include the mec172x<sz/lj> dtsi files for their specific package.

(cherry picked from commit 13a8708)

Original-Signed-off-by: Jeff Daly <jeffd@silicom-usa.com>
GitOrigin-RevId: 13a8708
Change-Id: I6472335006e9ca46e8f6c86ac23a004777e6aac8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4962172
Tested-by: Al Semjonovs <asemjonovs@google.com>
Commit-Queue: Al Semjonovs <asemjonovs@google.com>
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
Reviewed-by: Al Semjonovs <asemjonovs@google.com>
  • Loading branch information
jjdalynh authored and Chromeos LUCI committed Oct 24, 2023
1 parent d4c3a6b commit 009b116
Show file tree
Hide file tree
Showing 5 changed files with 1,109 additions and 997 deletions.
41 changes: 40 additions & 1 deletion dts/arm/microchip/mec1727nsz.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,55 @@
#include <zephyr/dt-bindings/clock/mchp_xec_pcr.h>
#include <zephyr/dt-bindings/interrupt-controller/mchp-xec-ecia.h>

#include "mec172xnsz.dtsi"
#include "mec172x/mec172x-vw-routing.dtsi"

#include <mem.h>
#include <freq.h>

/ {
cpus {
#address-cells = <1>;
#size-cells = <0>;

cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-m4";
reg = <0>;
cpu-power-states = <&idle &suspend_to_ram>;
};

power-states {
idle: idle {
compatible = "zephyr,power-state";
power-state-name = "suspend-to-idle";
min-residency-us = <1000000>;
};

suspend_to_ram: suspend_to_ram {
compatible = "zephyr,power-state";
power-state-name = "suspend-to-ram";
min-residency-us = <2000000>;
};
};
};

flash0: flash@c0000 {
reg = <0x000C0000 0x58000>;
};

flash1: flash@60000000 {
reg = <0x60000000 0x80000>;
};

sram0: memory@118000 {
compatible = "mmio-sram";
reg = <0x00118000 0x10000>;
};

soc {
#include "mec172x_common.dtsi"
};

};

&spi0 {
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/microchip/mec172x/mec172xnlj-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <zephyr/dt-bindings/pinctrl/mchp-xec-pinctrl.h>
#include "mec172xnsz-pinctrl.dtsi"

&pinctrl {

Expand Down
Loading

0 comments on commit 009b116

Please sign in to comment.