Skip to content

Commit f598314

Browse files
committed
Merge branch 'linux-5.15-trunk/at91/dt' into linux-5.15-mchp
2 parents fee60b5 + 23c783b commit f598314

4 files changed

Lines changed: 24 additions & 1 deletion

File tree

arch/arm/boot/dts/at91-sama5d2_xplained.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
active-semi,input-voltage-threshold-microvolt = <6600>;
310310
active-semi,precondition-timeout = <40>;
311311
active-semi,total-timeout = <3>;
312-
status = "okay";
312+
status = "disabled";
313313
};
314314
};
315315
};

arch/arm/boot/dts/at91-sama5d4_xplained.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
i2c0: i2c@f8014000 {
4343
i2c-digital-filter;
44+
i2c-digital-filter-width-ns = <70>;
4445
status = "okay";
4546
};
4647

arch/arm/boot/dts/sam9x60.dtsi

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,17 @@
226226
status = "disabled";
227227
};
228228

229+
gpu: gfx2d@f0018000 {
230+
compatible = "microchip,sam9x60-gfx2d";
231+
reg = <0xf0018000 0x4000>;
232+
interrupts = <36 IRQ_TYPE_LEVEL_HIGH 0>;
233+
clocks = <&pmc PMC_TYPE_PERIPHERAL 36>;
234+
clock-names = "periph_clk";
235+
#address-cells = <1>;
236+
#size-cells = <0>;
237+
status = "disabled";
238+
};
239+
229240
i2s: i2s@f001c000 {
230241
compatible = "microchip,sam9x60-i2smcc";
231242
reg = <0xf001c000 0x100>;
@@ -280,6 +291,7 @@
280291
dma-names = "tx";
281292
clocks = <&pmc PMC_TYPE_PERIPHERAL 41>;
282293
clock-names = "sha_clk";
294+
status = "disabled";
283295
};
284296

285297
trng: trng@f0030000 {

arch/arm/boot/dts/sama5d2.dtsi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,16 @@
11491149
reg = <0xfc05c000 0x20>;
11501150
};
11511151

1152+
ptc@fc060000 {
1153+
compatible = "atmel,sama5d2-ptc";
1154+
reg = <0x00800000 0x10000
1155+
0xfc060000 0xcf>;
1156+
interrupts = <58 IRQ_TYPE_LEVEL_HIGH 7>;
1157+
clocks = <&pmc PMC_TYPE_PERIPHERAL 58>, <&pmc PMC_TYPE_CORE PMC_MAIN>, <&clk32k>;
1158+
clock-names = "ptc_clk", "ptc_int_osc", "slow_clk";
1159+
status = "disabled";
1160+
};
1161+
11521162
chipid@fc069000 {
11531163
compatible = "atmel,sama5d2-chipid";
11541164
reg = <0xfc069000 0x8>;

0 commit comments

Comments
 (0)