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

Commit 45e2916b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.5/soc-initcall' of... 

Merge tag 'omap-for-v4.5/soc-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC changes for omaps for v4.5 merge window. The main change here is to
change the omap initcall levels a bit to initialize things later to allow
early device drivers at core_initcall level. This makes things easier
for us as most clocks can be made into regular device drivers except for
a few early clocks needed to initialize system timers. I wanted to have
these changes sit in Linux next for a few weeks before sending out a pull
request, and so far now issues have showed up.

The other changes in this series are timer changes for making use of the
new PWM driver, and timer changes to support more high security SoCs.
Also few minor improvments for module autoidle settings for ti81xx spinbox
and dra7 debug on uart4 in hwmod code. The rest is pretty much just removal
of platform data for SoCs that are all device tree only nowadays.

* tag 'omap-for-v4.5/soc-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: Remove device creation for omap-pcm-audio
  ARM: OMAP1: Remove device creation for omap-pcm-audio
  ARM: OMAP2+: Change core_initcall levels to postcore_initcall
  ARM: DRA7: hwmod: Enable DEBUG_LL for UART4
  ARM: OMAP: RX-51: fix a typo in log writing
  ARM: omap4: hwmod: Remove elm address space from hwmod data
  ARM: OMAP2+: timer: Remove secure timer for DRA7xx HS devices
  ARM: OMAP: dmtimer: check for fixed timers during config
  ARM: OMAP2+: Remove omap_mmu_dev_attr structure
  ARM: OMAP4: hwmod data: Remove legacy IOMMU attr and addrs
  ARM: OMAP3: hwmod data: Remove legacy IOMMU data
  ARM: OMAP2+: Remove legacy device instantiation of IOMMUs
  ARM: OMAP2+: Add hwmod spinbox support for dm816x
  ARM: OMAP: add DT support for ti,dm816-timer
  ARM: OMAP: dmtimer: Add clock source from DT

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8907dbaa f2e6a0a9

arch/arm/mach-omap1/devices.c

+0 −19
Original line number Diff line number Diff line
@@ -33,24 +33,6 @@ 
#include "mmc.h"

#include "sram.h"



#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)



static struct platform_device omap_pcm = {

	.name	= "omap-pcm-audio",

	.id	= -1,

};



static void omap_init_audio(void)

{

	platform_device_register(&omap_pcm);

}



#else

static inline void omap_init_audio(void) {}

#endif



/*-------------------------------------------------------------------------*/



#if defined(CONFIG_RTC_DRV_OMAP) || defined(CONFIG_RTC_DRV_OMAP_MODULE)



#define	OMAP_RTC_BASE		0xfffb4800
@@ -425,7 +407,6 @@ static int __init omap1_init_devices(void) 
	 * in alphabetical order so they're easier to sort through.

	 */



	omap_init_audio();

	omap_init_mbox();

	omap_init_rtc();

	omap_init_spi100k();

arch/arm/mach-omap2/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -223,8 +223,6 @@ obj-$(CONFIG_SOC_DRA7XX) += omap_hwmod_7xx_data.o 
# EMU peripherals

obj-$(CONFIG_HW_PERF_EVENTS)		+= pmu.o



obj-$(CONFIG_OMAP_IOMMU)		+= omap-iommu.o



# OMAP2420 MSDI controller integration support ("MMC")

obj-$(CONFIG_SOC_OMAP2420)		+= msdi.o

arch/arm/mach-omap2/board-rx51-peripherals.c

+1 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ static struct platform_device omap3_rom_rng_device = { 
static void __init rx51_init_omap3_rom_rng(void)

{

	if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {

		pr_info("RX-51: Registring OMAP3 HWRNG device\n");

		pr_info("RX-51: Registering OMAP3 HWRNG device\n");

		platform_device_register(&omap3_rom_rng_device);

	}

}

arch/arm/mach-omap2/devices.c

+4 −21
Original line number Diff line number Diff line
@@ -94,22 +94,6 @@ static inline void omap_init_mbox(void) { } 


static inline void omap_init_sti(void) {}



#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)



static struct platform_device omap_pcm = {

	.name	= "omap-pcm-audio",

	.id	= -1,

};



static void omap_init_audio(void)

{

	platform_device_register(&omap_pcm);

}



#else

static inline void omap_init_audio(void) {}

#endif



#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)



#include <linux/platform_data/spi-omap2-mcspi.h>
@@ -239,13 +223,12 @@ static int __init omap2_init_devices(void) 
	if (!of_have_populated_dt())

		pinctrl_provide_dummies();



	/* If dtb is there, the devices will be created dynamically */

	if (!of_have_populated_dt()) {

		/*

		 * please keep these calls, and their implementations above,

		 * in alphabetical order so they're easier to sort through.

		 */

	omap_init_audio();

	/* If dtb is there, the devices will be created dynamically */

	if (!of_have_populated_dt()) {

		omap_init_mbox();

		omap_init_mcspi();

		omap_init_sham();

arch/arm/mach-omap2/omap-iommu.c

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
/*

 * omap iommu: omap device registration

 *

 * Copyright (C) 2008-2009 Nokia Corporation

 *

 * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/err.h>

#include <linux/slab.h>



#include <linux/platform_data/iommu-omap.h>

#include "soc.h"

#include "omap_hwmod.h"

#include "omap_device.h"



static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused)

{

	struct platform_device *pdev;

	struct iommu_platform_data *pdata;

	struct omap_mmu_dev_attr *a = (struct omap_mmu_dev_attr *)oh->dev_attr;

	static int i;



	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;



	pdata->name = oh->name;

	pdata->nr_tlb_entries = a->nr_tlb_entries;



	if (oh->rst_lines_cnt == 1) {

		pdata->reset_name = oh->rst_lines->name;

		pdata->assert_reset = omap_device_assert_hardreset;

		pdata->deassert_reset = omap_device_deassert_hardreset;

	}



	pdev = omap_device_build("omap-iommu", i, oh, pdata, sizeof(*pdata));



	kfree(pdata);



	if (IS_ERR(pdev)) {

		pr_err("%s: device build err: %ld\n", __func__, PTR_ERR(pdev));

		return PTR_ERR(pdev);

	}



	i++;



	return 0;

}



static int __init omap_iommu_init(void)

{

	/* If dtb is there, the devices will be created dynamically */

	if (of_have_populated_dt())

		return -ENODEV;



	return omap_hwmod_for_each_by_class("mmu", omap_iommu_dev_init, NULL);

}

omap_subsys_initcall(omap_iommu_init);

/* must be ready before omap3isp is probed */