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

Commit 5fdebdc9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-init-delay-for-v3.18' of... 

Merge tag 'renesas-init-delay-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

 into next/soc

Merge "Renesas ARM Based SoC Init Delay Updates For v3.18" from Simon Horman:

* Use shmobile_init_delay across a wider range of SoCs

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'renesas-init-delay-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g: Use shmobile_init_delay()
  ARM: shmobile: bockw: Use shmobile_init_delay()
  ARM: shmobile: r8a7778: Use shmobile_init_delay()
  ARM: shmobile: sh73a0: Use shmobile_init_delay()
  ARM: shmobile: Remove shmobile_setup_delay()
  ARM: shmobile: r8a73a4: Use shmobile_init_delay()
  ARM: shmobile: sh7372: Use shmobile_init_delay()
  ARM: shmobile: r8a7778: Update DTS to include CPU frequency
  ARM: shmobile: sh73a0: Update DTS to include CPU frequency
  ARM: shmobile: sh7372: Update DTS to include CPU frequency
  ARM: shmobile: kzm9g-reference: Remove unneeded nr_irqs initialization
  ARM: shmobile: kzm9g: Remove unneeded nr_irqs initialization
  ARM: shmobile: marzen: Remove NR_IRQS_LEGACY
  ARM: shmobile: ape6evm: Use shmobile_init_delay()
  ARM: shmobile: ape6evm: Add shmobile_init_late()
  ARM: shmobile: bockw: Add shmobile_init_late()
  ARM: shmobile: marzen: Add shmobile_init_late()
  ARM: shmobile: kzm9g: Add shmobile_init_late()
parents a6fff113 fc35ca25

arch/arm/boot/dts/r8a7778.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -23,8 +23,14 @@ 
	interrupt-parent = <&gic>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

			clock-frequency = <800000000>;

		};

	};

arch/arm/boot/dts/sh7372.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
			compatible = "arm,cortex-a8";

			device_type = "cpu";

			reg = <0x0>;

			clock-frequency = <800000000>;

		};

	};

arch/arm/boot/dts/sh73a0.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -23,11 +23,13 @@ 
			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

			clock-frequency = <1196000000>;

		};

		cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

			clock-frequency = <1196000000>;

		};

	};

arch/arm/mach-shmobile/board-ape6evm-reference.c

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(APE6EVM_DT, "ape6evm")

	.init_early	= r8a73a4_init_early,

	.init_early	= shmobile_init_delay,

	.init_machine	= ape6evm_add_standard_devices,

	.init_late	= shmobile_init_late,

	.dt_compat	= ape6evm_boards_compat_dt,

MACHINE_END

arch/arm/mach-shmobile/board-ape6evm.c

+2 −1
Original line number Diff line number Diff line
@@ -283,7 +283,8 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(APE6EVM_DT, "ape6evm")

	.init_early	= r8a73a4_init_early,

	.init_early	= shmobile_init_delay,

	.init_machine	= ape6evm_add_standard_devices,

	.init_late	= shmobile_init_late,

	.dt_compat	= ape6evm_boards_compat_dt,

MACHINE_END