Skip to content

Commit cefb8fb

Browse files
committed
Merge tag 'at91-dt-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt
Microchip AT91 device tree updates for v7.1 This update includes: - enable LVDS, LCD and PMU for SAMA7D64 SoC - drop unused #address-cells, #size-cells for SAM9X60 UDC node * tag 'at91-dt-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: microchip: sama7d65: add Cortex-A7 PMU node arm: dts: microchip: remove unused #address-cells/#size-cells from sam9x60 udc node ARM: dts: microchip: sama7d65: add LVDS controller ARM: dts: microchip: sama7d65: add LCD controller Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2 parents 55fbbbb + 7d7a9fc commit cefb8fb

2 files changed

Lines changed: 40 additions & 2 deletions

File tree

arch/arm/boot/dts/microchip/sam9x60.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@
7575
ranges;
7676

7777
usb0: gadget@500000 {
78-
#address-cells = <1>;
79-
#size-cells = <0>;
8078
compatible = "microchip,sam9x60-udc";
8179
reg = <0x00500000 0x100000
8280
0xf803c000 0x400>;

arch/arm/boot/dts/microchip/sama7d65.dtsi

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
#size-cells = <1>;
6868
};
6969

70+
pmu {
71+
compatible = "arm,cortex-a7-pmu";
72+
interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
73+
};
74+
7075
soc {
7176
compatible = "simple-bus";
7277
ranges;
@@ -278,6 +283,41 @@
278283
status = "disabled";
279284
};
280285

286+
xlcdc: lcd-controller@e1400000 {
287+
compatible = "microchip,sama7d65-xlcdc";
288+
reg = <0xe1400000 0x2000>;
289+
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
290+
clocks = <&pmc PMC_TYPE_PERIPHERAL 56>, <&pmc PMC_TYPE_GCK 56>, <&clk32k 1>;
291+
clock-names = "periph_clk", "sys_clk", "slow_clk";
292+
status = "disabled";
293+
294+
display-controller {
295+
compatible = "atmel,hlcdc-display-controller";
296+
#address-cells = <1>;
297+
#size-cells = <0>;
298+
299+
port@0 {
300+
reg = <0>;
301+
#address-cells = <1>;
302+
#size-cells = <0>;
303+
};
304+
};
305+
306+
pwm {
307+
compatible = "atmel,hlcdc-pwm";
308+
#pwm-cells = <3>;
309+
};
310+
};
311+
312+
lvdsc: lvds-controller@e1408000 {
313+
compatible = "microchip,sama7d65-lvds", "microchip,sam9x75-lvds";
314+
reg = <0xe1408000 0x100>;
315+
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
316+
clocks = <&pmc PMC_TYPE_PERIPHERAL 104>;
317+
clock-names = "pclk";
318+
status = "disabled";
319+
};
320+
281321
aes: crypto@e1600000 {
282322
compatible = "microchip,sama7d65-aes", "atmel,at91sam9g46-aes";
283323
reg = <0xe1600000 0x100>;

0 commit comments

Comments
 (0)