ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree (48a0d1e0) · Commits · e / devices / android_kernel_samsung_universal8895

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -173,6 +173,10 @@
	};		};
	};		};

			&cmt1 {
			status = "ok";
			};

	&i2c0 {		&i2c0 {
	status = "okay";		status = "okay";
	as3711@40 {		as3711@40 {

arch/arm/mach-shmobile/setup-sh73a0.c

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -696,10 +696,6 @@ static struct platform_device irqpin3_device = {
	},		},
	};		};

	static struct platform_device *sh73a0_devices_dt[] __initdata = {
	&cmt1_device,
	};

	static struct platform_device *sh73a0_early_devices[] __initdata = {		static struct platform_device *sh73a0_early_devices[] __initdata = {
	&scif0_device,		&scif0_device,
	&scif1_device,		&scif1_device,
	@@ -712,6 +708,7 @@ static struct platform_device *sh73a0_early_devices[] __initdata = {
	&scif8_device,		&scif8_device,
	&tmu0_device,		&tmu0_device,
	&ipmmu_device,		&ipmmu_device,
			&cmt1_device,
	};		};

	static struct platform_device *sh73a0_late_devices[] __initdata = {		static struct platform_device *sh73a0_late_devices[] __initdata = {
	@@ -736,8 +733,6 @@ void __init sh73a0_add_standard_devices(void)
	/* Clear software reset bit on SY-DMAC module */		/* Clear software reset bit on SY-DMAC module */
	__raw_writel(__raw_readl(SRCR2) & ~(1 << 18), SRCR2);		__raw_writel(__raw_readl(SRCR2) & ~(1 << 18), SRCR2);

	platform_add_devices(sh73a0_devices_dt,
	ARRAY_SIZE(sh73a0_devices_dt));
	platform_add_devices(sh73a0_early_devices,		platform_add_devices(sh73a0_early_devices,
	ARRAY_SIZE(sh73a0_early_devices));		ARRAY_SIZE(sh73a0_early_devices));
	platform_add_devices(sh73a0_late_devices,		platform_add_devices(sh73a0_late_devices,
	@@ -762,8 +757,6 @@ void __init sh73a0_earlytimer_init(void)

	void __init sh73a0_add_early_devices(void)		void __init sh73a0_add_early_devices(void)
	{		{
	early_platform_add_devices(sh73a0_devices_dt,
	ARRAY_SIZE(sh73a0_devices_dt));
	early_platform_add_devices(sh73a0_early_devices,		early_platform_add_devices(sh73a0_early_devices,
	ARRAY_SIZE(sh73a0_early_devices));		ARRAY_SIZE(sh73a0_early_devices));

	@@ -780,8 +773,6 @@ void __init sh73a0_add_standard_devices_dt(void)
	/* clocks are setup late during boot in the case of DT */		/* clocks are setup late during boot in the case of DT */
	sh73a0_clock_init();		sh73a0_clock_init();

	platform_add_devices(sh73a0_devices_dt,
	ARRAY_SIZE(sh73a0_devices_dt));
	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);		of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	/* Instantiate cpufreq-cpu0 */		/* Instantiate cpufreq-cpu0 */