Merge "msm: remove setup and last remnants of MSM_IMEM_BASE" (4b2f3358) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/board-dt.c

+0 −37

Original line number	Diff line number	Diff line
		@@ -80,43 +80,6 @@ void __init msm_dt_init_irq_l2x0(void)
		msm_dt_init_irq();
		}

		int __init msm_scan_dt_map_imem(unsigned long node, const char *uname,
		int depth, void *data)
		{
		unsigned int *imem_prop;
		unsigned long imem_prop_len;
		struct map_desc map;
		int ret;
		const char *compat = "qti,msm-imem";

		ret = of_flat_dt_is_compatible(node, compat);

		if (!ret)
		return 0;

		imem_prop = of_get_flat_dt_prop(node, "reg",
		&imem_prop_len);

		if (!imem_prop) {
		WARN(1, "IMEM reg field not found\n");
		return 0;
		}

		if (imem_prop_len != (2*sizeof(u32))) {
		WARN(1, "IMEM range malformed\n");
		return 0;
		}

		map.virtual = (unsigned long)MSM_IMEM_BASE;
		map.pfn = __phys_to_pfn(be32_to_cpu(imem_prop[0]));
		map.length = be32_to_cpu(imem_prop[1]);
		map.type = MT_DEVICE;
		iotable_init(&map, 1);
		pr_info("IMEM DT static mapping successful\n");

		return 1;
		}

		void __init board_dt_populate(struct of_dev_auxdata *adata)
		{
		of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

arch/arm/mach-msm/board-dt.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,4 @@
		void __init msm_dt_init_irq(void);
		void __init msm_dt_init_irq_nompm(void);
		void __init msm_dt_init_irq_l2x0(void);
		int __init msm_scan_dt_map_imem(unsigned long node, const char *uname,
		int depth, void *data);
		void __init board_dt_populate(struct of_dev_auxdata *adata);

arch/arm/mach-msm/include/mach/msm_iomap.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -57,8 +57,6 @@
		#define MSM_SAW0_BASE IOMEM(0xFA008000) /* 4K */
		#define MSM_SAW1_BASE IOMEM(0xFA009000) /* 4K */

		#define MSM_IMEM_BASE IOMEM(0xFA00A000) /* 4K */

		#define MSM_ACC0_BASE IOMEM(0xFA00B000) /* 4K */
		#define MSM_ACC1_BASE IOMEM(0xFA00C000) /* 4K */
		#define MSM_ACC2_BASE IOMEM(0xFA00D000) /* 4K */

arch/arm/mach-msm/io.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ static struct map_desc msm_8974_io_desc[] __initdata = {
		void __init msm_map_8974_io(void)
		{
		iotable_init(msm_8974_io_desc, ARRAY_SIZE(msm_8974_io_desc));
		of_scan_flat_dt(msm_scan_dt_map_imem, NULL);
		}
		#endif /* CONFIG_ARCH_MSM8974 */

		@@ -74,7 +73,6 @@ static struct map_desc msm_8084_io_desc[] __initdata = {
		void __init msm_map_8084_io(void)
		{
		iotable_init(msm_8084_io_desc, ARRAY_SIZE(msm_8084_io_desc));
		of_scan_flat_dt(msm_scan_dt_map_imem, NULL);
		}
		#endif /* CONFIG_ARCH_APQ8084 */

		@@ -90,7 +88,6 @@ static struct map_desc fsm9900_io_desc[] __initdata = {
		void __init msm_map_fsm9900_io(void)
		{
		iotable_init(fsm9900_io_desc, ARRAY_SIZE(fsm9900_io_desc));
		of_scan_flat_dt(msm_scan_dt_map_imem, NULL);
		}
		#endif /* CONFIG_ARCH_FSM9900 */

		@@ -103,7 +100,6 @@ static struct map_desc msmkrypton_io_desc[] __initdata = {
		void __init msm_map_msmkrypton_io(void)
		{
		iotable_init(msmkrypton_io_desc, ARRAY_SIZE(msmkrypton_io_desc));
		of_scan_flat_dt(msm_scan_dt_map_imem, NULL);
		}
		#endif /* CONFIG_ARCH_MSMKRYPTON */

		@@ -119,7 +115,6 @@ static struct map_desc mpq8092_io_desc[] __initdata = {
		void __init msm_map_mpq8092_io(void)
		{
		iotable_init(mpq8092_io_desc, ARRAY_SIZE(mpq8092_io_desc));
		of_scan_flat_dt(msm_scan_dt_map_imem, NULL);
		}
		#endif /* CONFIG_ARCH_MPQ8092 */

		@@ -137,7 +132,6 @@ static struct map_desc msm_8226_io_desc[] __initdata = {
		void __init msm_map_msm8226_io(void)
		{
		iotable_init(msm_8226_io_desc, ARRAY_SIZE(msm_8226_io_desc));
		of_scan_flat_dt(msm_scan_dt_map_imem, NULL);
		}
		#endif /* CONFIG_ARCH_MSM8226 */

		@@ -151,7 +145,6 @@ static struct map_desc msm8610_io_desc[] __initdata = {
		void __init msm_map_msm8610_io(void)
		{
		iotable_init(msm8610_io_desc, ARRAY_SIZE(msm8610_io_desc));
		of_scan_flat_dt(msm_scan_dt_map_imem, NULL);
		}
		#endif /* CONFIG_ARCH_MSM8610 */

		@@ -167,6 +160,5 @@ static struct map_desc msmsamarium_io_desc[] __initdata = {
		void __init msm_map_msmsamarium_io(void)
		{
		iotable_init(msmsamarium_io_desc, ARRAY_SIZE(msmsamarium_io_desc));
		of_scan_flat_dt(msm_scan_dt_map_imem, NULL);
		}
		#endif /* CONFIG_ARCH_MSMSAMARIUM */