Commit 63167569 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu into next/cleanup 

From Jason Cooper:
mvebu soc changes for v3.14

 - orion:
    - remove IRQF_DISABLED
    - directly include some .h files

 - mvebu:
    - remove some sparse warnings

 - orion5x:
    - include cleanup
    - warning removal for C=1

 - kirkwood:
    - remove legacy clock workarounds
    - stop rpinting a TCLK value of 0 for DT boards

 - dove:
    - warning removal for C=1

* tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: fix some sparse warnings
  ARM: kirkwood: stop printk TCLK value at boot for DT boards
  ARM: orion5x: drop unused include from common.c
  ARM: Dove: Fix compiler warnings with C=1 builds
  ARM: Orion5x: Fix warnings when using C=1.
  ARM: Orion: Add missing includes
  ARM: kirkwood: remove lagacy clk workarounds
  arm: plat-orion: remove deprecated IRQF_DISABLED

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6ecf49bc b12634e3

arch/arm/mach-dove/common.c

+3 −12
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data) 
/*****************************************************************************

 * SoC RTC

 ****************************************************************************/

void __init dove_rtc_init(void)

static void __init dove_rtc_init(void)

{

	orion_rtc_init(DOVE_RTC_PHYS_BASE, IRQ_DOVE_RTC);

}
@@ -256,19 +256,10 @@ void __init dove_timer_init(void) 
			IRQ_DOVE_BRIDGE, dove_tclk);

}



/*****************************************************************************

 * Cryptographic Engines and Security Accelerator (CESA)

 ****************************************************************************/

void __init dove_crypto_init(void)

{

	orion_crypto_init(DOVE_CRYPT_PHYS_BASE, DOVE_CESA_PHYS_BASE,

			  DOVE_CESA_SIZE, IRQ_DOVE_CRYPTO);

}



/*****************************************************************************

 * XOR 0

 ****************************************************************************/

void __init dove_xor0_init(void)

static void __init dove_xor0_init(void)

{

	orion_xor0_init(DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE,

			IRQ_DOVE_XOR_00, IRQ_DOVE_XOR_01);
@@ -277,7 +268,7 @@ void __init dove_xor0_init(void) 
/*****************************************************************************

 * XOR 1

 ****************************************************************************/

void __init dove_xor1_init(void)

static void __init dove_xor1_init(void)

{

	orion_xor1_init(DOVE_XOR1_PHYS_BASE, DOVE_XOR1_HIGH_PHYS_BASE,

			IRQ_DOVE_XOR_10, IRQ_DOVE_XOR_11);

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

+2 −38
Original line number Diff line number Diff line
@@ -10,55 +10,21 @@ 
 * warranty of any kind, whether express or implied.

 */



#include <linux/clk.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_net.h>

#include <linux/of_platform.h>

#include <linux/clk-provider.h>

#include <linux/dma-mapping.h>

#include <linux/irqchip.h>

#include <linux/kexec.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/bridge-regs.h>

#include <linux/platform_data/usb-ehci-orion.h>

#include <plat/irq.h>

#include <plat/common.h>

#include "common.h"



/*

 * There are still devices that doesn't know about DT yet.  Get clock

 * gates here and add a clock lookup alias, so that old platform

 * devices still work.

*/



static void __init kirkwood_legacy_clk_init(void)

{



	struct device_node *np = of_find_compatible_node(

		NULL, NULL, "marvell,kirkwood-gating-clock");

	struct of_phandle_args clkspec;

	struct clk *clk;



	clkspec.np = np;

	clkspec.args_count = 1;



	/*

	 * The ethernet interfaces forget the MAC address assigned by

	 * u-boot if the clocks are turned off. Until proper DT support

	 * is available we always enable them for now.

	 */

	clkspec.args[0] = CGC_BIT_GE0;

	clk = of_clk_get_from_provider(&clkspec);

	clk_prepare_enable(clk);



	clkspec.args[0] = CGC_BIT_GE1;

	clk = of_clk_get_from_provider(&clkspec);

	clk_prepare_enable(clk);

}



#define MV643XX_ETH_MAC_ADDR_LOW	0x0414

#define MV643XX_ETH_MAC_ADDR_HIGH	0x0418
@@ -140,7 +106,7 @@ eth_fixup_skip: 


static void __init kirkwood_dt_init(void)

{

	pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);

	pr_info("Kirkwood: %s.\n", kirkwood_id());



	/*

	 * Disable propagation of mbus errors to the CPU local bus,
@@ -156,8 +122,6 @@ static void __init kirkwood_dt_init(void) 


	kirkwood_cpufreq_init();

	kirkwood_cpuidle_init();

	/* Setup clocks for legacy devices */

	kirkwood_legacy_clk_init();



	kirkwood_pm_init();

	kirkwood_dt_eth_fixup();

arch/arm/mach-mvebu/coherency.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/smp_plat.h>

#include <asm/cacheflush.h>

#include "armada-370-xp.h"

#include "coherency.h"



unsigned long coherency_phys_base;

static void __iomem *coherency_base;

arch/arm/mach-mvebu/coherency.h

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
#ifndef __MACH_370_XP_COHERENCY_H

#define __MACH_370_XP_COHERENCY_H



int set_cpu_coherent(int cpu_id, int smp_group_id);

extern unsigned long coherency_phys_base;



int set_cpu_coherent(unsigned int cpu_id, int smp_group_id);

int coherency_init(void);



#endif	/* __MACH_370_XP_COHERENCY_H */

arch/arm/mach-mvebu/common.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ void armada_370_xp_handle_irq(struct pt_regs *regs); 


void armada_xp_cpu_die(unsigned int cpu);

int armada_370_xp_coherency_init(void);

int armada_370_xp_pmsu_init(void);

void armada_xp_secondary_startup(void);

extern struct smp_operations armada_xp_smp_ops;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE