Commit 615c924f authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth
Browse files

Merge tag 'tegra-for-3.13-deps-for-arm-init-time-cleanup' of... 

Merge tag 'tegra-for-3.13-deps-for-arm-init-time-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into clk-of-init-v2_for-3.13

ARM: tegra: dependencies for ARM .init_time cleanup

This patch is a dependency for Sebastian Hesselbarth's series that
cleans up the ARM machine descriptor's .init_time hook. It may also end
up being a dependency for cleanup/development in the Tegra tree, and
hence is contained in its own topic branch, to allow conflicts to be
easily resolved.
parents 272b98c6 d2207071

arch/arm/mach-tegra/common.c

+1 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/delay.h>

#include <linux/reboot.h>

#include <linux/irqchip.h>

#include <linux/clk-provider.h>



#include <asm/hardware/cache-l2x0.h>
@@ -61,8 +60,7 @@ u32 tegra_uart_config[4] = { 
#ifdef CONFIG_OF

void __init tegra_dt_init_irq(void)

{

	of_clk_init(NULL);

	tegra_pmc_init();

	tegra_pmc_init_irq();

	tegra_init_irq();

	irqchip_init();

	tegra_legacy_irq_syscore_init();

arch/arm/mach-tegra/pmc.c

+22 −19
Original line number Diff line number Diff line
@@ -285,13 +285,10 @@ static const struct of_device_id matches[] __initconst = { 
	{ }

};



static void __init tegra_pmc_parse_dt(void)

void __init tegra_pmc_init_irq(void)

{

	struct device_node *np;

	u32 prop;

	enum tegra_suspend_mode suspend_mode;

	u32 core_good_time[2] = {0, 0};

	u32 lp0_vec[2] = {0, 0};

	u32 val;



	np = of_find_matching_node(NULL, matches);

	BUG_ON(!np);
@@ -300,6 +297,26 @@ static void __init tegra_pmc_parse_dt(void) 


	tegra_pmc_invert_interrupt = of_property_read_bool(np,

				     "nvidia,invert-interrupt");



	val = tegra_pmc_readl(PMC_CTRL);

	if (tegra_pmc_invert_interrupt)

		val |= PMC_CTRL_INTR_LOW;

	else

		val &= ~PMC_CTRL_INTR_LOW;

	tegra_pmc_writel(val, PMC_CTRL);

}



void __init tegra_pmc_init(void)

{

	struct device_node *np;

	u32 prop;

	enum tegra_suspend_mode suspend_mode;

	u32 core_good_time[2] = {0, 0};

	u32 lp0_vec[2] = {0, 0};



	np = of_find_matching_node(NULL, matches);

	BUG_ON(!np);



	tegra_pclk = of_clk_get_by_name(np, "pclk");

	WARN_ON(IS_ERR(tegra_pclk));
@@ -365,17 +382,3 @@ static void __init tegra_pmc_parse_dt(void) 


	pmc_pm_data.suspend_mode = suspend_mode;

}
 


void __init tegra_pmc_init(void)

{

	u32 val;



	tegra_pmc_parse_dt();



	val = tegra_pmc_readl(PMC_CTRL);

	if (tegra_pmc_invert_interrupt)

		val |= PMC_CTRL_INTR_LOW;

	else

		val &= ~PMC_CTRL_INTR_LOW;

	tegra_pmc_writel(val, PMC_CTRL);

}

arch/arm/mach-tegra/pmc.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ bool tegra_pmc_cpu_is_powered(int cpuid); 
int tegra_pmc_cpu_power_on(int cpuid);

int tegra_pmc_cpu_remove_clamping(int cpuid);



void tegra_pmc_init_irq(void);

void tegra_pmc_init(void);



#endif

arch/arm/mach-tegra/tegra.c

+11 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/slab.h>

#include <linux/sys_soc.h>

#include <linux/usb/tegra_usb_phy.h>

#include <linux/clk-provider.h>

#include <linux/clk/tegra.h>



#include <asm/mach-types.h>
@@ -44,6 +45,7 @@ 
#include "common.h"

#include "fuse.h"

#include "iomap.h"

#include "pmc.h"



static void __init tegra_dt_init(void)

{
@@ -51,6 +53,8 @@ static void __init tegra_dt_init(void) 
	struct soc_device *soc_dev;

	struct device *parent = NULL;



	tegra_pmc_init();



	tegra_clocks_apply_init_table();



	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
@@ -80,6 +84,12 @@ out: 
	of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);

}



static void __init tegra_dt_init_time(void)

{

	of_clk_init(NULL);

	clocksource_of_init();

}



static void __init paz00_init(void)

{

	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
@@ -119,7 +129,7 @@ DT_MACHINE_START(TEGRA_DT, "NVIDIA Tegra SoC (Flattened Device Tree)") 
	.smp		= smp_ops(tegra_smp_ops),

	.init_early	= tegra_init_early,

	.init_irq	= tegra_dt_init_irq,

	.init_time	= clocksource_of_init,

	.init_time	= tegra_dt_init_time,

	.init_machine	= tegra_dt_init,

	.init_late	= tegra_dt_init_late,

	.restart	= tegra_assert_system_reset,

CRA Git | Maintained and supported by SUSTech CRA and CCSE