Commit 9d0db7ab authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'renesas-soc' into renesas-board 

* renesas-soc: (31 commits)
  ARM: shmobile: Fix build problem in pm-sh7372.c for unusual .config
  ARM: shmobile: Take cpuidle dependencies into account correctly
  ARM: mach-shmobile: sh7377 generic board support via DT
  ARM: mach-shmobile: r8a7740 generic board support via DT
  ARM: shmobile: sh7372: completely switch over to using pm-rmobile API
  ARM: shmobile: ap4evb: switch to using pm-rmobile API
  ARM: shmobile: mackerel: switch to using pm-rmobile API
  ARM: shmobile: sh7372: add pm-rmobile domain support
  ARM: shmobile: r8a7740: add A4LC pm domain support
  ARM: shmobile: r8a7740: add A3SP pm domain support
  ARM: shmobile: r8a7740: add A4S pm domain support
  ARM: shmobile: r8a7740: fixup: MSEL1CR 7bit control
  ARM: shmobile: soc-core: add R-mobile PM domain common APIs
  ARM: shmobile: sh7372 A3SM CPUIdle support
  ARM: shmobile: Use INTCA with sh7372 A3SM power domain
  ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register
  ARM: shmobile: use common DMAEngine definitions on sh7372
  ARM: shmobile: use common DMAEngine definitions on sh73a0
  ARM: shmobile: sh73a0: add DMAEngine support for MPDMAC
  ARM: shmobile: sh73a0: add USB clock support
  ...
parents f5e8779a 0df8fa46

arch/arm/boot/dts/r8a7740.dtsi

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

 * Device Tree Source for the r8a7740 SoC

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * 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,r8a7740";



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a9";

		};

	};

};

arch/arm/boot/dts/sh7377.dtsi

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

 * Device Tree Source for the sh7377 SoC

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * 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,sh7377";



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a8";

		};

	};

};

arch/arm/mach-shmobile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ config ARCH_SH7372 
	select CPU_V7

	select SH_CLK_CPG

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_CPU_SUSPEND if PM || CPU_IDLE



config ARCH_SH73A0

	bool "SH-Mobile AG5 (R8A73A00)"

arch/arm/mach-shmobile/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ obj-$(CONFIG_ARCH_R8A7740) += entry-intc.o 
# PM objects

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

obj-$(CONFIG_ARCH_SHMOBILE)	+= pm-rmobile.o

obj-$(CONFIG_ARCH_SH7372)	+= pm-sh7372.o sleep-sh7372.o

obj-$(CONFIG_ARCH_R8A7740)	+= pm-r8a7740.o

obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o



# Board objects

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

+8 −8
Original line number Diff line number Diff line
@@ -1447,14 +1447,14 @@ static void __init ap4evb_init(void) 


	platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices));



	sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc1_device);

	sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);

	sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);



	sh7372_add_device_to_domain(&sh7372_a3sp, &sh_mmcif_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi0_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi1_device);

	sh7372_add_device_to_domain(&sh7372_a4r, &ceu_device);

	rmobile_add_device_to_domain(&sh7372_pd_a4lc, &lcdc1_device);

	rmobile_add_device_to_domain(&sh7372_pd_a4lc, &lcdc_device);

	rmobile_add_device_to_domain(&sh7372_pd_a4mp, &fsi_device);



	rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sh_mmcif_device);

	rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi0_device);

	rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi1_device);

	rmobile_add_device_to_domain(&sh7372_pd_a4r, &ceu_device);



	hdmi_init_pm_clock();

	fsi_init_pm_clock();

CRA Git | Maintained and supported by SUSTech CRA and CCSE