Commit 5cc25d80 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc-for-v3.10' of... 

Merge tag 'renesas-soc-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman <horms+renesas@verge.net.au>:

Renesas ARM-based SoC updates for v3.10

* tag 'renesas-soc-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (43 commits)
  r8a7779: Add Display Unit clock support
  ARM: shmobile: R8A7779: use gic_iid() in SATA IRQ resource
  ARM: mach-shmobile: r8a7779: add SATA support
  ARM: mach-shmobile: r8a7779: SATA DT configuration
  ARM: shmobile: r8a7779: add Thermal support on DT
  ARM: shmobile: tidyup chip series definition order for r8a7740/r8a7779
  ARM: shmobile: r8a7779: use gic_iid macro
  ARM: shmobile: r8a7779: fixup DT machine name
  ARM: shmobile: r8a7779: fixup dtsi typo
  ARM: shmobile: add gic_iid macro for ICCIAR / interrupt ID
  ARM: mach-shmobile: r8a7740: Add DT names to clock list
  ARM: shmobile: Remove unused hotplug.c
  ARM: shmobile: Rearrange r8a7779 cpu hotplug code
  ARM: shmobile: Use sh73a0-specific cpu disable code
  ARM: shmobile: Update r8a7779 to use scu_power_mode()
  ARM: shmobile: Update r8a7779 to check SCU for hotplug
  ARM: shmobile: Use R8A7779_SCU_BASE with TWD
  ARM: shmobile: Rework SH73A0_SCU_BASE IOMEM() usage
  ARM: shmobile: Fix base address readout in headsmp-scu.S
  ARM: shmobile: r8a7779: Remove lan from dtsi
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5f796cc9 d75bc78b

arch/arm/boot/dts/r8a7779.dtsi

0 → 100644
+98 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for Renesas r8a7779

 *

 * Copyright (C) 2013 Renesas Solutions Corp.

 * Copyright (C) 2013 Simon Horman

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/include/ "skeleton.dtsi"



/ {

	compatible = "renesas,r8a7779";



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

		};

		cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

		};

		cpu@2 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <2>;

		};

		cpu@3 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <3>;

		};

	};



        gic: interrupt-controller@f0001000 {

                compatible = "arm,cortex-a9-gic";

                #interrupt-cells = <3>;

                interrupt-controller;

                reg = <0xf0001000 0x1000>,

                      <0xf0000100 0x100>;

        };



	i2c0: i2c@0xffc70000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xffc70000 0x1000>;

		interrupt-parent = <&gic>;

		interrupts = <0 79 0x4>;

	};



	i2c1: i2c@0xffc71000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xffc71000 0x1000>;

		interrupt-parent = <&gic>;

		interrupts = <0 82 0x4>;

	};



	i2c2: i2c@0xffc72000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xffc72000 0x1000>;

		interrupt-parent = <&gic>;

		interrupts = <0 80 0x4>;

	};



	i2c3: i2c@0xffc73000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		reg = <0xffc73000 0x1000>;

		interrupt-parent = <&gic>;

		interrupts = <0 81 0x4>;

	};



	thermal@ffc48000 {

		compatible = "renesas,rcar-thermal";

		reg = <0xffc48000 0x38>;

	};



	sata: sata@fc600000 {

		compatible = "renesas,rcar-sata";

		reg = <0xfc600000 0x2000>;

		interrupt-parent = <&gic>;

		interrupts = <0 100 0x4>;

	};

};

arch/arm/mach-shmobile/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -14,10 +14,9 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o clock-emev2.o 


# SMP objects

smp-y				:= platsmp.o headsmp.o

smp-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-sh73a0.o

smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o

smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-scu.o

smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o headsmp-scu.o

smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o headsmp-scu.o



# IRQ objects

obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o

arch/arm/mach-shmobile/clock-r8a7740.c

+13 −0
Original line number Diff line number Diff line
@@ -593,29 +593,42 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh_mobile_ceu.1",	&mstp_clks[MSTP128]),



	CLKDEV_DEV_ID("sh-sci.4",		&mstp_clks[MSTP200]),

	CLKDEV_DEV_ID("e6c80000.sci",		&mstp_clks[MSTP200]),

	CLKDEV_DEV_ID("sh-sci.3",		&mstp_clks[MSTP201]),

	CLKDEV_DEV_ID("e6c70000.sci",		&mstp_clks[MSTP201]),

	CLKDEV_DEV_ID("sh-sci.2",		&mstp_clks[MSTP202]),

	CLKDEV_DEV_ID("e6c60000.sci",		&mstp_clks[MSTP202]),

	CLKDEV_DEV_ID("sh-sci.1",		&mstp_clks[MSTP203]),

	CLKDEV_DEV_ID("e6c50000.sci",		&mstp_clks[MSTP203]),

	CLKDEV_DEV_ID("sh-sci.0",		&mstp_clks[MSTP204]),

	CLKDEV_DEV_ID("e6c40000.sci",		&mstp_clks[MSTP204]),

	CLKDEV_DEV_ID("sh-sci.8",		&mstp_clks[MSTP206]),

	CLKDEV_DEV_ID("e6c30000.sci",		&mstp_clks[MSTP206]),

	CLKDEV_DEV_ID("sh-sci.5",		&mstp_clks[MSTP207]),

	CLKDEV_DEV_ID("e6cb0000.sci",		&mstp_clks[MSTP207]),

	CLKDEV_DEV_ID("sh-dma-engine.3",	&mstp_clks[MSTP214]),

	CLKDEV_DEV_ID("sh-dma-engine.2",	&mstp_clks[MSTP216]),

	CLKDEV_DEV_ID("sh-dma-engine.1",	&mstp_clks[MSTP217]),

	CLKDEV_DEV_ID("sh-dma-engine.0",	&mstp_clks[MSTP218]),

	CLKDEV_DEV_ID("sh-sci.7",		&mstp_clks[MSTP222]),

	CLKDEV_DEV_ID("e6cd0000.sci",		&mstp_clks[MSTP222]),

	CLKDEV_DEV_ID("sh-sci.6",		&mstp_clks[MSTP230]),

	CLKDEV_DEV_ID("e6cc0000.sci",		&mstp_clks[MSTP230]),



	CLKDEV_DEV_ID("sh_cmt.10",		&mstp_clks[MSTP329]),

	CLKDEV_DEV_ID("sh_fsi2",		&mstp_clks[MSTP328]),

	CLKDEV_DEV_ID("i2c-sh_mobile.1",	&mstp_clks[MSTP323]),

	CLKDEV_DEV_ID("renesas_usbhs",		&mstp_clks[MSTP320]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.0",	&mstp_clks[MSTP314]),

	CLKDEV_DEV_ID("e6850000.sdhi",          &mstp_clks[MSTP314]),

	CLKDEV_DEV_ID("sh_mobile_sdhi.1",	&mstp_clks[MSTP313]),

	CLKDEV_DEV_ID("e6860000.sdhi",          &mstp_clks[MSTP313]),

	CLKDEV_DEV_ID("sh_mmcif",		&mstp_clks[MSTP312]),

	CLKDEV_DEV_ID("e6bd0000.mmcif",         &mstp_clks[MSTP312]),

	CLKDEV_DEV_ID("sh-eth",			&mstp_clks[MSTP309]),



	CLKDEV_DEV_ID("sh_mobile_sdhi.2",	&mstp_clks[MSTP415]),

	CLKDEV_DEV_ID("e6870000.sdhi",          &mstp_clks[MSTP415]),



	/* ICK */

	CLKDEV_ICK_ID("host",	"renesas_usbhs",	&mstp_clks[MSTP416]),

arch/arm/mach-shmobile/clock-r8a7779.c

+7 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ static struct clk div4_clks[DIV4_NR] = { 
};



enum { MSTP323, MSTP322, MSTP321, MSTP320,

	MSTP101, MSTP100,

	MSTP115,

	MSTP103, MSTP101, MSTP100,

	MSTP030,

	MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,

	MSTP016, MSTP015, MSTP014,
@@ -99,6 +100,8 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP322] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 22, 0), /* SDHI1 */

	[MSTP321] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 21, 0), /* SDHI2 */

	[MSTP320] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 20, 0), /* SDHI3 */

	[MSTP115] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 15, 0), /* SATA */

	[MSTP103] = SH_CLK_MSTP32(&div4_clks[DIV4_S], MSTPCR1,  3, 0), /* DU */

	[MSTP101] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1,  1, 0), /* USB2 */

	[MSTP100] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1,  0, 0), /* USB0/1 */

	[MSTP030] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 30, 0), /* I2C0 */
@@ -156,6 +159,8 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("peripheral_clk",	&div4_clks[DIV4_P]),



	/* MSTP32 clocks */

	CLKDEV_DEV_ID("sata_rcar", &mstp_clks[MSTP115]), /* SATA */

	CLKDEV_DEV_ID("fc600000.sata", &mstp_clks[MSTP115]), /* SATA w/DT */

	CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */

	CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */

	CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
@@ -180,6 +185,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */

	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */

	CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP320]), /* SDHI3 */

	CLKDEV_DEV_ID("rcar-du.0", &mstp_clks[MSTP103]), /* DU */

};



void __init r8a7779_clock_init(void)

arch/arm/mach-shmobile/clock-sh73a0.c

+5 −2
Original line number Diff line number Diff line
@@ -265,12 +265,12 @@ enum { DIV4_I, DIV4_ZG, DIV4_M3, DIV4_B, DIV4_M1, DIV4_M2, 


static struct clk div4_clks[DIV4_NR] = {

	[DIV4_I] = DIV4(FRQCRA, 20, 0xdff, CLK_ENABLE_ON_INIT),

	[DIV4_ZG] = DIV4(FRQCRA, 16, 0xd7f, CLK_ENABLE_ON_INIT),

	[DIV4_ZG] = SH_CLK_DIV4(&pll0_clk, FRQCRA, 16, 0xd7f, CLK_ENABLE_ON_INIT),

	[DIV4_M3] = DIV4(FRQCRA, 12, 0x1dff, CLK_ENABLE_ON_INIT),

	[DIV4_B] = DIV4(FRQCRA, 8, 0xdff, CLK_ENABLE_ON_INIT),

	[DIV4_M1] = DIV4(FRQCRA, 4, 0x1dff, 0),

	[DIV4_M2] = DIV4(FRQCRA, 0, 0x1dff, 0),

	[DIV4_Z] = DIV4(FRQCRB, 24, 0x97f, 0),

	[DIV4_Z] = SH_CLK_DIV4(&pll0_clk, FRQCRB, 24, 0x97f, 0),

	[DIV4_ZTR] = DIV4(FRQCRB, 20, 0xdff, 0),

	[DIV4_ZT] = DIV4(FRQCRB, 16, 0xdff, 0),

	[DIV4_ZX] = DIV4(FRQCRB, 12, 0xdff, 0),
@@ -581,10 +581,13 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("e6822000.i2c", &mstp_clks[MSTP323]), /* I2C1 */

	CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP322]), /* USB */

	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */

	CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]), /* SDHI0 */

	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), /* SDHI1 */

	CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]), /* SDHI1 */

	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP312]), /* MMCIF0 */

	CLKDEV_DEV_ID("e6bd0000.mmcif", &mstp_clks[MSTP312]), /* MMCIF0 */

	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP311]), /* SDHI2 */

	CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP311]), /* SDHI2 */

	CLKDEV_DEV_ID("leds-renesas-tpu.12", &mstp_clks[MSTP303]), /* TPU1 */

	CLKDEV_DEV_ID("leds-renesas-tpu.21", &mstp_clks[MSTP302]), /* TPU2 */

	CLKDEV_DEV_ID("leds-renesas-tpu.30", &mstp_clks[MSTP301]), /* TPU3 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE