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

Merge branch 'renesas/cleanup2' into next/soc 

Merging in as base to resolve a merge conflict with later soc branch
locally.
parents edf4f16f 113522ee

arch/arm/boot/dts/emev2.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ cpu@0 { 
			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

			clock-frequency = <533000000>;

		};

		cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

			clock-frequency = <533000000>;

		};

	};

arch/arm/boot/dts/r7s72100.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ cpu@0 { 
			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

			clock-frequency = <400000000>;

		};

	};

arch/arm/mach-shmobile/board-ape6evm-reference.c

+3 −1
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ 
#include <linux/pinctrl/machine.h>

#include <linux/platform_device.h>

#include <linux/sh_clk.h>

#include <mach/r8a73a4.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include "common.h"

#include "r8a73a4.h"



static void __init ape6evm_add_standard_devices(void)

{

arch/arm/mach-shmobile/board-ape6evm.c

+3 −1
Original line number Diff line number Diff line
@@ -33,11 +33,13 @@ 
#include <linux/regulator/machine.h>

#include <linux/sh_clk.h>

#include <linux/smsc911x.h>

#include <mach/r8a73a4.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include "common.h"

#include "irqs.h"

#include "r8a73a4.h"



/* LEDS */

static struct gpio_led ape6evm_leds[] = {

arch/arm/mach-shmobile/board-armadillo800eva-reference.c

+3 −1
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ 
#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/io.h>

#include <mach/r8a7740.h>



#include <asm/mach/arch.h>

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



#include "common.h"

#include "r8a7740.h"



/*

 * CON1		Camera Module