Skip to content

Commit 43e403a

Browse files
committed
Merge tag 'versatile-dts-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/fixes
These are some Versatile family DTS fixes, fixing some node names and clock names related to SPI. * tag 'versatile-dts-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: dts: versatile: Update spi clock-names property ARM: dts: realview: Update spi clock-names property ARM: dts: integratorap: Update spi node properties Link: https://lore.kernel.org/r/CACRpkdZfTe8NSGR2ZCkn-1JcNobjfWeXqajSqcJMp8+WtY+2Xw@mail.gmail.com Signed-off-by: Arnd Bergmann <[email protected]>
2 parents a3bedd2 + 6c939e2 commit 43e403a

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

arch/arm/boot/dts/arm-realview-eb.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
compatible = "arm,pl022", "arm,primecell";
400400
reg = <0x1000d000 0x1000>;
401401
clocks = <&sspclk>, <&pclk>;
402-
clock-names = "SSPCLK", "apb_pclk";
402+
clock-names = "sspclk", "apb_pclk";
403403
};
404404

405405
wdog: watchdog@10010000 {

arch/arm/boot/dts/arm-realview-pb1176.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
interrupt-parent = <&intc_dc1176>;
411411
interrupts = <0 17 IRQ_TYPE_LEVEL_HIGH>;
412412
clocks = <&sspclk>, <&pclk>;
413-
clock-names = "SSPCLK", "apb_pclk";
413+
clock-names = "sspclk", "apb_pclk";
414414
};
415415

416416
pb1176_serial0: serial@1010c000 {

arch/arm/boot/dts/arm-realview-pb11mp.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
interrupt-parent = <&intc_pb11mp>;
556556
interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
557557
clocks = <&sspclk>, <&pclk>;
558-
clock-names = "SSPCLK", "apb_pclk";
558+
clock-names = "sspclk", "apb_pclk";
559559
};
560560

561561
watchdog@1000f000 {

arch/arm/boot/dts/arm-realview-pbx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
compatible = "arm,pl022", "arm,primecell";
391391
reg = <0x1000d000 0x1000>;
392392
clocks = <&sspclk>, <&pclk>;
393-
clock-names = "SSPCLK", "apb_pclk";
393+
clock-names = "sspclk", "apb_pclk";
394394
};
395395

396396
wdog0: watchdog@1000f000 {

arch/arm/boot/dts/integratorap-im-pd1.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,12 @@
178178
clock-names = "uartclk", "apb_pclk";
179179
};
180180

181-
ssp@300000 {
181+
spi@300000 {
182182
compatible = "arm,pl022", "arm,primecell";
183183
reg = <0x00300000 0x1000>;
184184
interrupts-extended = <&impd1_vic 3>;
185185
clocks = <&impd1_sspclk>, <&sysclk>;
186-
clock-names = "spiclk", "apb_pclk";
186+
clock-names = "sspclk", "apb_pclk";
187187
};
188188

189189
impd1_gpio0: gpio@400000 {

arch/arm/boot/dts/versatile-ab.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391
reg = <0x101f4000 0x1000>;
392392
interrupts = <11>;
393393
clocks = <&xtal24mhz>, <&pclk>;
394-
clock-names = "SSPCLK", "apb_pclk";
394+
clock-names = "sspclk", "apb_pclk";
395395
};
396396

397397
fpga {

0 commit comments

Comments
 (0)