mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 13:43:55 +08:00
Renesas ARM Based SoC Cleanup for v3.17
* Use shmobile_init_delay on r8a7790, r7s72100 and EMEV2 SoCs * Remove unused redundant callbacks on EMEV2 SoC -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTp4YiAAoJENfPZGlqN0++xfEQALAC6IG0nydElVsJZavFVTiq NpVWfG7A9LrEcPswO9ODlzJ3szbsHfr5hG1Cyq2w1/4V6xrvhhRe5hfs9K2gQMf4 32exqFsND9pf6Rzu2YBbKfi6Zlxfi3wJO7dXvf2Q7BIVXvDRUXUGtDscTQ+Wde9v icMVrkliAOLWDyrZpdJAcsJGyMpyUNhdia5n7qQcPEHshMQZWQHPvAwoG6s9qGC3 7Lv5DkkrsQwNDB2ASlGFw3eK3IEEL8DiHbxF3gX/rCMF6jpWWtoLrwMeSU/D/sUo Yk6Vs6xC3pNcpgnqHJD8hw5QlNPWvh5vb7qfpBkR7WnZmziw13Y5TM9CT8bD9f59 wj83YmLNccltQWN+T6Celu/I1X1QkBz09Ai63SIlzN2tfrr05t1EXL8acSVfWXXS Tc/Mf+GXqqIHtMKe5hXM7biizHn7sXk57OfSVnNNSbE5Wrs/TaCsHiTL4E74C2dt bwq7GHDBYkETs1Rvh727sfJDpDSGHwWyrhTdXclSn+HHb5kxZ69TfnmovXTUbRPa 99ieorUeSFqwmkb6/jn3DKjPz2I/KyIfF7yS2T8BNIP742wtD3aSVa6m7KAZ+udS kO5WOfunHY7Ckt4/pmgO1gPDX+cbbmG8r+UPXlH+2W73ryTtc46HLoImqawT6h2g 0WkoIqd4qmyiBLenZiL+ =UEEy -----END PGP SIGNATURE----- Merge tag 'renesas-soc-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup Merge "Renesas ARM Based SoC Cleanup for v3.17" from Simon Horman: - Use shmobile_init_delay on r8a7790, r7s72100 and EMEV2 SoCs - Remove unused redundant callbacks on EMEV2 SoC * tag 'renesas-soc-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Remove unused r8a7790_init_early() ARM: shmobile: Use r8a7790 DT CPU Frequency for Lager ARM: shmobile: Use r8a7790 DT CPU Frequency in common case ARM: shmobile: Use shmobile_init_delay() on r7s72100 ARM: shmobile: Use shmobile_init_delay() on Genmai boards ARM: shmobile: Update r7s72100 DTS to include CPU frequency ARM: shmobile: Get rid of redundant EMEV2 mach callbacks ARM: shmobile: Use shmobile_init_delay() on EMEV2 ARM: shmobile: Update EMEV2 DTS to include CPU frequency Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
a7ed497e3f
@ -31,11 +31,13 @@
|
||||
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>;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -144,6 +144,7 @@
|
||||
device_type = "cpu";
|
||||
compatible = "arm,cortex-a9";
|
||||
reg = <0>;
|
||||
clock-frequency = <400000000>;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -47,7 +47,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
|
||||
};
|
||||
|
||||
DT_MACHINE_START(GENMAI_DT, "genmai")
|
||||
.init_early = r7s72100_init_early,
|
||||
.init_early = shmobile_init_delay,
|
||||
.init_machine = genmai_add_standard_devices,
|
||||
.dt_compat = genmai_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
@ -154,7 +154,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
|
||||
};
|
||||
|
||||
DT_MACHINE_START(GENMAI_DT, "genmai")
|
||||
.init_early = r7s72100_init_early,
|
||||
.init_early = shmobile_init_delay,
|
||||
.init_machine = genmai_add_standard_devices,
|
||||
.dt_compat = genmai_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
@ -129,7 +129,7 @@ static const char *lager_boards_compat_dt[] __initdata = {
|
||||
|
||||
DT_MACHINE_START(LAGER_DT, "lager")
|
||||
.smp = smp_ops(r8a7790_smp_ops),
|
||||
.init_early = r8a7790_init_early,
|
||||
.init_early = shmobile_init_delay,
|
||||
.init_time = rcar_gen2_timer_init,
|
||||
.init_machine = lager_add_standard_devices,
|
||||
.init_late = shmobile_init_late,
|
||||
|
@ -887,7 +887,7 @@ static const char * const lager_boards_compat_dt[] __initconst = {
|
||||
|
||||
DT_MACHINE_START(LAGER_DT, "lager")
|
||||
.smp = smp_ops(r8a7790_smp_ops),
|
||||
.init_early = r8a7790_init_early,
|
||||
.init_early = shmobile_init_delay,
|
||||
.init_time = rcar_gen2_timer_init,
|
||||
.init_machine = lager_init,
|
||||
.init_late = shmobile_init_late,
|
||||
|
@ -3,6 +3,5 @@
|
||||
|
||||
void r7s72100_add_dt_devices(void);
|
||||
void r7s72100_clock_init(void);
|
||||
void r7s72100_init_early(void);
|
||||
|
||||
#endif /* __ASM_R7S72100_H__ */
|
||||
|
@ -31,7 +31,6 @@ void r8a7790_add_dt_devices(void);
|
||||
void r8a7790_clock_init(void);
|
||||
void r8a7790_pinmux_init(void);
|
||||
void r8a7790_pm_init(void);
|
||||
void r8a7790_init_early(void);
|
||||
extern struct smp_operations r8a7790_smp_ops;
|
||||
|
||||
#endif /* __ASM_R8A7790_H__ */
|
||||
|
@ -16,10 +16,9 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
#include <linux/clk-provider.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/mm.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/map.h>
|
||||
@ -42,17 +41,6 @@ static void __init emev2_map_io(void)
|
||||
iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
|
||||
}
|
||||
|
||||
static void __init emev2_init_delay(void)
|
||||
{
|
||||
shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
|
||||
}
|
||||
|
||||
static void __init emev2_add_standard_devices_dt(void)
|
||||
{
|
||||
of_clk_init(NULL);
|
||||
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
||||
}
|
||||
|
||||
static const char *emev2_boards_compat_dt[] __initconst = {
|
||||
"renesas,emev2",
|
||||
NULL,
|
||||
@ -63,8 +51,7 @@ extern struct smp_operations emev2_smp_ops;
|
||||
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
|
||||
.smp = smp_ops(emev2_smp_ops),
|
||||
.map_io = emev2_map_io,
|
||||
.init_early = emev2_init_delay,
|
||||
.init_machine = emev2_add_standard_devices_dt,
|
||||
.init_early = shmobile_init_delay,
|
||||
.init_late = shmobile_init_late,
|
||||
.dt_compat = emev2_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
@ -43,11 +43,6 @@ void __init r7s72100_add_dt_devices(void)
|
||||
r7s72100_register_mtu2();
|
||||
}
|
||||
|
||||
void __init r7s72100_init_early(void)
|
||||
{
|
||||
shmobile_setup_delay(400, 1, 3); /* Cortex-A9 @ 400MHz */
|
||||
}
|
||||
|
||||
#ifdef CONFIG_USE_OF
|
||||
static const char *r7s72100_boards_compat_dt[] __initdata = {
|
||||
"renesas,r7s72100",
|
||||
@ -55,7 +50,7 @@ static const char *r7s72100_boards_compat_dt[] __initdata = {
|
||||
};
|
||||
|
||||
DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
|
||||
.init_early = r7s72100_init_early,
|
||||
.init_early = shmobile_init_delay,
|
||||
.dt_compat = r7s72100_boards_compat_dt,
|
||||
MACHINE_END
|
||||
#endif /* CONFIG_USE_OF */
|
||||
|
@ -308,13 +308,6 @@ void __init r8a7790_add_standard_devices(void)
|
||||
r8a7790_register_audio_dmac(1);
|
||||
}
|
||||
|
||||
void __init r8a7790_init_early(void)
|
||||
{
|
||||
#ifndef CONFIG_ARM_ARCH_TIMER
|
||||
shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef CONFIG_USE_OF
|
||||
|
||||
static const char * const r8a7790_boards_compat_dt[] __initconst = {
|
||||
@ -324,7 +317,7 @@ static const char * const r8a7790_boards_compat_dt[] __initconst = {
|
||||
|
||||
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
|
||||
.smp = smp_ops(r8a7790_smp_ops),
|
||||
.init_early = r8a7790_init_early,
|
||||
.init_early = shmobile_init_delay,
|
||||
.init_time = rcar_gen2_timer_init,
|
||||
.dt_compat = r8a7790_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
Loading…
Reference in New Issue
Block a user