Skip to content

Commit 2b7fda3

Browse files
committed
Merge tag 'at91-dt-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt
Microchip AT91 device tree updates for v6.13 It contains: - device tree support for the Microchip SAM9X7 SoC and the Microchip SAM9X75 Curiosity board - enable power monitor support for SAM9X60-EK, SAMA5D2-ICP, SAMA7G45 Curiosity, SAMA7G5-EK boards - updates the uart nodes with missing properties - device tree cleanups * tag 'at91-dt-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: microchip: sam9x75_curiosity: add sam9x75 curiosity board dt-bindings: arm: add sam9x75 curiosity board ARM: dts: at91: sam9x7: add device tree for SoC ARM: dts: microchip: Rename LED sub nodes name ARM: dts: microchip: Rename the pmic node ARM: dts: microchip: Rename the eeprom nodename ARM: dts: microchip: sama7g5ek: Add power monitor support ARM: dts: microchip: sama7g54_curiosity: Add power monitor support ARM: dts: microchip: sama5d2_icp: Add power monitor support ARM: dts: microchip: sam9x60ek: Add power monitor support ARM: dts: microchip: Unify rng node names ARM: dts: microchip: Add trng labels for all at91 SoCs ARM: dts: microchip: sam9x60: Add missing property atmel,usart-mode Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents bc329f3 + 371a47c commit 2b7fda3

30 files changed

+1735
-42
lines changed

Documentation/devicetree/bindings/arm/atmel-at91.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ properties:
106106
- const: microchip,sam9x60
107107
- const: atmel,at91sam9
108108

109+
- description: Microchip SAM9X7 Evaluation Boards
110+
items:
111+
- const: microchip,sam9x75-curiosity
112+
- const: microchip,sam9x7
113+
- const: atmel,at91sam9
114+
109115
- description: Nattis v2 board with Natte v2 power board
110116
items:
111117
- const: axentia,nattis-2

arch/arm/boot/dts/microchip/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Enables support for device-tree overlays
33
DTC_FLAGS_at91-sam9x60_curiosity := -@
44
DTC_FLAGS_at91-sam9x60ek := -@
5+
DTC_FLAGS_at91-sam9x75_curiosity := -@
56
DTC_FLAGS_at91-sama5d27_som1_ek := -@
67
DTC_FLAGS_at91-sama5d27_wlsom1_ek := -@
78
DTC_FLAGS_at91-sama5d29_curiosity := -@
@@ -60,6 +61,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \
6061
dtb-$(CONFIG_SOC_SAM9X60) += \
6162
at91-sam9x60_curiosity.dtb \
6263
at91-sam9x60ek.dtb
64+
dtb-$(CONFIG_SOC_SAM9X7) += \
65+
at91-sam9x75_curiosity.dtb
6366
dtb-$(CONFIG_SOC_SAM_V7) += \
6467
at91-kizbox2-2.dtb \
6568
at91-kizbox3-hs.dtb \

arch/arm/boot/dts/microchip/aks-cdu.dts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,27 @@
9898
leds {
9999
compatible = "gpio-leds";
100100

101-
red {
101+
led-red {
102+
label = "red";
102103
gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
103104
linux,default-trigger = "none";
104105
};
105106

106-
green {
107+
led-green {
108+
label = "green";
107109
gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
108110
linux,default-trigger = "none";
109111
default-state = "on";
110112
};
111113

112-
yellow {
114+
led-yellow {
115+
label = "yellow";
113116
gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
114117
linux,default-trigger = "none";
115118
};
116119

117-
blue {
120+
led-blue {
121+
label = "blue";
118122
gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
119123
linux,default-trigger = "none";
120124
};

arch/arm/boot/dts/microchip/animeo_ip.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,23 +146,23 @@
146146
leds {
147147
compatible = "gpio-leds";
148148

149-
power_green {
149+
led-power-green {
150150
label = "power_green";
151151
gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
152152
linux,default-trigger = "heartbeat";
153153
};
154154

155-
power_red {
155+
led-power-red {
156156
label = "power_red";
157157
gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
158158
};
159159

160-
tx_green {
160+
led-tx-green {
161161
label = "tx_green";
162162
gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
163163
};
164164

165-
tx_red {
165+
led-tx-red {
166166
label = "tx_red";
167167
gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
168168
};

arch/arm/boot/dts/microchip/at91-kizbox2-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
&i2c1 {
8686
status = "okay";
8787

88-
pmic: act8865@5b {
88+
act8865: pmic@5b {
8989
compatible = "active-semi,act8865";
9090
reg = <0x5b>;
9191
status = "okay";

arch/arm/boot/dts/microchip/at91-sam9x60ek.dts

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@
5353
pinctrl-0 = <&pinctrl_gpio_leds>;
5454
status = "okay"; /* Conflict with pwm0. */
5555

56-
red {
56+
led-red {
5757
label = "red";
5858
gpios = <&pioB 11 GPIO_ACTIVE_HIGH>;
5959
};
6060

61-
green {
61+
led-green {
6262
label = "green";
6363
gpios = <&pioB 12 GPIO_ACTIVE_HIGH>;
6464
};
6565

66-
blue {
66+
led-blue {
6767
label = "blue";
6868
gpios = <&pioB 13 GPIO_ACTIVE_HIGH>;
6969
linux,default-trigger = "heartbeat";
@@ -260,6 +260,37 @@
260260
i2c-digital-filter-width-ns = <35>;
261261
status = "okay";
262262

263+
power-monitor@17 {
264+
compatible = "microchip,pac1934";
265+
reg = <0x17>;
266+
#address-cells = <1>;
267+
#size-cells = <0>;
268+
269+
channel@1 {
270+
reg = <0x1>;
271+
shunt-resistor-micro-ohms = <10000>;
272+
label = "VDDIOM";
273+
};
274+
275+
channel@2 {
276+
reg = <0x2>;
277+
shunt-resistor-micro-ohms = <10000>;
278+
label = "VDDCORE";
279+
};
280+
281+
channel@3 {
282+
reg = <0x3>;
283+
shunt-resistor-micro-ohms = <10000>;
284+
label = "VDD3V3_MPU";
285+
};
286+
287+
channel@4 {
288+
reg = <0x4>;
289+
shunt-resistor-micro-ohms = <10000>;
290+
label = "VDD3V3";
291+
};
292+
};
293+
263294
gpio_exp: mcp23008@20 {
264295
compatible = "microchip,mcp23008";
265296
reg = <0x20>;

0 commit comments

Comments
 (0)