Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbcdf687 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-fixes-4.9-1' of git://git.infradead.org/linux-mvebu into fixes 

mvebu fixes for 4.9 (part 1)

All of them are fixes for arm64 device tree

- 2 for the SPI node on the Armada 7K/8K
- 1 for the clock node on the Armada 37xx

* tag 'mvebu-fixes-4.9-1' of git://git.infradead.org/linux-mvebu

:
  arm64: dts: marvell: add unique identifiers for Armada A8k SPI controllers
  arm64: dts: marvell: fix clocksource for CP110 slave SPI0
  arm64: dts: marvell: Fix typo in label name on Armada 37xx

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1c8018f7 8d897006

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
				status = "disabled";

			};



			nb_perih_clk: nb-periph-clk@13000{

			nb_periph_clk: nb-periph-clk@13000 {

				compatible = "marvell,armada-3700-periph-clock-nb";

				reg = <0x13000 0x100>;

				clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
@@ -113,7 +113,7 @@ 
				#clock-cells = <1>;

			};



			sb_perih_clk: sb-periph-clk@18000{

			sb_periph_clk: sb-periph-clk@18000 {

				compatible = "marvell,armada-3700-periph-clock-sb";

				reg = <0x18000 0x100>;

				clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,

arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ 
				reg = <0x700600 0x50>;

				#address-cells = <0x1>;

				#size-cells = <0x0>;

				cell-index = <1>;

				clocks = <&cps_syscon0 0 3>;

				cell-index = <3>;

				clocks = <&cps_syscon0 1 21>;

				status = "disabled";

			};
@@ -140,7 +140,7 @@ 
				reg = <0x700680 0x50>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <2>;

				cell-index = <4>;

				clocks = <&cps_syscon0 1 21>;

				status = "disabled";

			};