summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Sharma <harsh.sharma@multitech.com>2022-08-23 09:21:48 -0500
committerHarsh Sharma <harsh.sharma@multitech.com>2022-08-23 09:21:48 -0500
commitddc64ad625fd8696c202dd4b7deed90fcba50696 (patch)
tree5ea6f5236cfaff315ef8693c91f20d8db935110d
parent9d1754d92ced9f771cd0fcf00a128ca58e388596 (diff)
parenta75f4a12bdd234c442bdb78761d4fa64015e4405 (diff)
downloadmt-dt-overlay-ddc64ad625fd8696c202dd4b7deed90fcba50696.tar.gz
mt-dt-overlay-ddc64ad625fd8696c202dd4b7deed90fcba50696.tar.bz2
mt-dt-overlay-ddc64ad625fd8696c202dd4b7deed90fcba50696.zip
Merge branch 'vp/fix_gpio_addr' into 'master' 1.2.9
MTX-4571 Fix I2C GPIO addr for MTCDT3 v 0.2. Remove 0x20 (0x18) GPIO. See merge request !6
-rw-r--r--mtcpmhs/ap1-gpiob-0.0.dtso1
-rw-r--r--mtcpmhs/ap1-lora-0.0.dtso1
-rw-r--r--mtcpmhs/ap2-gpiob-0.0.dtso1
-rw-r--r--mtcpmhs/ap2-lora-0.0.dtso1
-rw-r--r--mtcpmhs/gpio-expander-0.0.dtso15
-rw-r--r--mtcpmhs/gpio-expander-0.2.dtso (renamed from mtcpmhs/gpio-expander-0.1.dtso)20
6 files changed, 12 insertions, 27 deletions
diff --git a/mtcpmhs/ap1-gpiob-0.0.dtso b/mtcpmhs/ap1-gpiob-0.0.dtso
index 810c03b..5d5a6c9 100644
--- a/mtcpmhs/ap1-gpiob-0.0.dtso
+++ b/mtcpmhs/ap1-gpiob-0.0.dtso
@@ -8,6 +8,7 @@
* Location(s):
* Put: MTCDT3/0.0/gpiob/ap1-gpiob.dtbo
* Link: MTCDT3/0.1/gpiob/ap1-gpiob.dtbo
+ * Link: MTCDT3/0.2/gpiob/ap1-gpiob.dtbo
*/
#include "am4372.dtsi"
diff --git a/mtcpmhs/ap1-lora-0.0.dtso b/mtcpmhs/ap1-lora-0.0.dtso
index 22b6801..30fd711 100644
--- a/mtcpmhs/ap1-lora-0.0.dtso
+++ b/mtcpmhs/ap1-lora-0.0.dtso
@@ -8,6 +8,7 @@
* Location(s):
* Put: MTCDT3/0.0/lora/ap1-lora.dtbo
* Link: MTCDT3/0.1/lora/ap1-lora.dtbo
+ * Link: MTCDT3/0.2/lora/ap1-lora.dtbo
*/
#include "am4372.dtsi"
diff --git a/mtcpmhs/ap2-gpiob-0.0.dtso b/mtcpmhs/ap2-gpiob-0.0.dtso
index a4a2d15..254a8c3 100644
--- a/mtcpmhs/ap2-gpiob-0.0.dtso
+++ b/mtcpmhs/ap2-gpiob-0.0.dtso
@@ -8,6 +8,7 @@
* Location(s):
* Put: MTCDT3/0.0/gpiob/ap2-gpiob.dtbo
* Link: MTCDT3/0.1/gpiob/ap2-gpiob.dtbo
+ * Link: MTCDT3/0.2/gpiob/ap2-gpiob.dtbo
*/
#include "am4372.dtsi"
diff --git a/mtcpmhs/ap2-lora-0.0.dtso b/mtcpmhs/ap2-lora-0.0.dtso
index b27ab5a..8d9bc8c 100644
--- a/mtcpmhs/ap2-lora-0.0.dtso
+++ b/mtcpmhs/ap2-lora-0.0.dtso
@@ -8,6 +8,7 @@
* Location(s):
* Put: MTCDT3/0.0/lora/ap2-lora.dtbo
* Link: MTCDT3/0.1/lora/ap2-lora.dtbo
+ * Link: MTCDT3/0.2/lora/ap2-lora.dtbo
*/
#include "am4372.dtsi"
diff --git a/mtcpmhs/gpio-expander-0.0.dtso b/mtcpmhs/gpio-expander-0.0.dtso
index 388deba..b93a49b 100644
--- a/mtcpmhs/gpio-expander-0.0.dtso
+++ b/mtcpmhs/gpio-expander-0.0.dtso
@@ -8,6 +8,7 @@
/*
* Location(s):
* Put: MTCDT3/0.0/gpio-expander.dtbo
+ * Link: MTCDT3/0.1/gpio-expander.dtbo
*/
#include "am4372.dtsi"
@@ -21,17 +22,7 @@
fragment@0 {
target-path = "/ocp@44000000/interconnect@48000000/segment@0/target-module@2a000/i2c@0";
__overlay__ {
- gpiom1: gpio@20 {
- compatible = "microchip,mcp23008";
- gpio-controller;
- #gpio-cells = <2>;
- reg = <0x20>;
- interrupt-parent = <&gpio1>;
- interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
- interrupt-controller;
- #interrupt-cells=<2>;
- }; /*gpio@20*/
- gpiom2: gpio@21 {
+ gpiom1: gpio@21 {
compatible = "microchip,mcp23008";
gpio-controller;
#gpio-cells = <2>;
@@ -51,7 +42,7 @@
leds-exp {
compatible = "gpio-leds";
led-gpio {
- gpios = <&gpiom2 6 GPIO_ACTIVE_LOW>;
+ gpios = <&gpiom1 6 GPIO_ACTIVE_LOW>;
default-state = "off";
}; /*led-gpio*/
}; /*leds-exp*/
diff --git a/mtcpmhs/gpio-expander-0.1.dtso b/mtcpmhs/gpio-expander-0.2.dtso
index ba79b0c..c0736c3 100644
--- a/mtcpmhs/gpio-expander-0.1.dtso
+++ b/mtcpmhs/gpio-expander-0.2.dtso
@@ -1,5 +1,5 @@
/*
- * DTS overlay for MTCDT3 0.1 hardware version.
+ * DTS overlay for MTCDT3 0.2 hardware version.
*/
/dts-v1/;
@@ -7,7 +7,7 @@
/*
* Location(s):
- * Put: MTCDT3/0.1/gpio-expander.dtbo
+ * Put: MTCDT3/0.2/gpio-expander.dtbo
*/
#include "am4372.dtsi"
@@ -21,21 +21,11 @@
fragment@0 {
target-path = "/ocp@44000000/interconnect@48000000/segment@0/target-module@2a000/i2c@0";
__overlay__ {
- gpiom1: gpio@20 {
+ gpiom1: gpio@19 {
compatible = "nxp,pca9557";
gpio-controller;
#gpio-cells = <2>;
- reg = <0x20>;
- interrupt-parent = <&gpio1>;
- interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
- interrupt-controller;
- #interrupt-cells=<2>;
- }; /*gpio@20*/
- gpiom2: gpio@21 {
- compatible = "nxp,pca9557";
- gpio-controller;
- #gpio-cells = <2>;
- reg = <0x21>;
+ reg = <0x19>;
interrupt-parent = <&gpio1>;
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
@@ -51,7 +41,7 @@
leds-exp {
compatible = "gpio-leds";
led-gpio {
- gpios = <&gpiom2 6 GPIO_ACTIVE_LOW>;
+ gpios = <&gpiom1 6 GPIO_ACTIVE_LOW>;
default-state = "off";
}; /*led-gpio*/
}; /*leds-exp*/