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

Commit f1844aca authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-cleanup-bundle' of... 

Merge tag 'ux500-cleanup-bundle' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers

Merge "Ux500 cleanups from Arnd" from Linus Walleij:

This is a set of cleanups for the Ux500 that reduce the number
of machine-local files and boardfile-type data for regulators
and ASoC.

* tag 'ux500-cleanup-bundle' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: consolidate base platform files
  ARM: ux500: move soc_id driver to drivers/soc
  ARM: ux500: call ux500_setup_id later
  ARM: ux500: consolidate soc_device code in id.c
  ARM: ux500: remove cpu_is_u* helpers
  ARM: ux500: use CLK_OF_DECLARE()
  ARM: ux500: move l2x0 init to .init_irq
  mfd: db8500 stop passing around platform data
  ASoC: ab8500-codec: remove platform data based probe
  ARM: ux500: move ab8500_regulator_plat_data into driver
  ARM: ux500: remove unused regulator data
parents cf1d9dd4 a16729ea

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1822,7 +1822,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
T:	git git://git.linaro.org/people/ulfh/clk.git

S:	Maintained

F:	drivers/clk/ux500/

F:	include/linux/platform_data/clk-ux500.h



ARM/VERSATILE EXPRESS PLATFORM

M:	Liviu Dudau <liviu.dudau@arm.com>

arch/arm/mach-ux500/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -2,11 +2,9 @@ 
# Makefile for the linux kernel, U8500 machine.

#



obj-y				:= cpu.o id.o pm.o

obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o

obj-y				:= pm.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o

obj-$(CONFIG_MACH_MOP500)	+= board-mop500-regulators.o \

				board-mop500-audio.o

obj-$(CONFIG_MACH_MOP500)	+= board-mop500-audio.o

obj-$(CONFIG_SMP)		+= platsmp.o

obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o

arch/arm/mach-ux500/board-mop500-regulators.c

deleted100644 → 0
+0 −1065

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-ux500/board-mop500-regulators.h

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

 * Copyright (C) ST-Ericsson SA 2010

 *

 * License Terms: GNU General Public License v2

 *

 * Author: Bengt Jonsson <bengt.g.jonsson@stericsson.com> for ST-Ericsson

 *

 * MOP500 board specific initialization for regulators

 */



#ifndef __BOARD_MOP500_REGULATORS_H

#define __BOARD_MOP500_REGULATORS_H



#include <linux/regulator/machine.h>

#include <linux/regulator/ab8500.h>



extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data;

extern struct ab8500_regulator_platform_data ab8505_regulator_plat_data;

extern struct regulator_init_data tps61052_regulator;

extern struct regulator_init_data gpio_en_3v3_regulator;



void mop500_regulator_init(void);



#endif

arch/arm/mach-ux500/cache-l2x0.c

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

 * Copyright (C) ST-Ericsson SA 2011

 *

 * License terms: GNU General Public License (GPL) version 2

 */



#include <linux/io.h>

#include <linux/of.h>

#include <linux/of_address.h>



#include <asm/outercache.h>

#include <asm/hardware/cache-l2x0.h>



#include "db8500-regs.h"

#include "id.h"



static int __init ux500_l2x0_unlock(void)

{

	int i;

	struct device_node *np;

	void __iomem *l2x0_base;



	np = of_find_compatible_node(NULL, NULL, "arm,pl310-cache");

	l2x0_base = of_iomap(np, 0);

	of_node_put(np);

	if (!l2x0_base)

		return -ENODEV;



	/*

	 * Unlock Data and Instruction Lock if locked. Ux500 U-Boot versions

	 * apparently locks both caches before jumping to the kernel. The

	 * l2x0 core will not touch the unlock registers if the l2x0 is

	 * already enabled, so we do it right here instead. The PL310 has

	 * 8 sets of registers, one per possible CPU.

	 */

	for (i = 0; i < 8; i++) {

		writel_relaxed(0x0, l2x0_base + L2X0_LOCKDOWN_WAY_D_BASE +

			       i * L2X0_LOCKDOWN_STRIDE);

		writel_relaxed(0x0, l2x0_base + L2X0_LOCKDOWN_WAY_I_BASE +

			       i * L2X0_LOCKDOWN_STRIDE);

	}

	iounmap(l2x0_base);

	return 0;

}



static void ux500_l2c310_write_sec(unsigned long val, unsigned reg)

{

	/*

	 * We can't write to secure registers as we are in non-secure

	 * mode, until we have some SMI service available.

	 */

}



static int __init ux500_l2x0_init(void)

{

	/* Multiplatform guard */

	if (!((cpu_is_u8500_family() || cpu_is_ux540_family())))

		return -ENODEV;



	/* Unlock before init */

	ux500_l2x0_unlock();

	outer_cache.write_sec = ux500_l2c310_write_sec;

	l2x0_of_init(0, ~0);



	return 0;

}

early_initcall(ux500_l2x0_init);