Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'soc-arm-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull arm platform SoC code updates from Arnd Bergmann:
"These are mainly code cleanups, dropping some unneeded code, plus a
reference counting leak fix"
* tag 'soc-arm-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: at91: remove unnecessary of_platform_default_populate calls
ARM: at91: Move PM init functions to .init_late hook
ARM: omap1: drop unused Kconfig symbol
ARM: omap2: Fix reference count leaks in omap_control_init()
+18
-77
+1
-11
arch/arm/mach-at91/at91rm9200.c
+1
-11
arch/arm/mach-at91/at91rm9200.c
···
7
7
* 2012 Joachim Eastwood <manabian@gmail.com>
8
8
*/
9
9
10
-
#include <linux/of.h>
11
-
#include <linux/of_platform.h>
12
-
13
10
#include <asm/mach/arch.h>
14
11
15
12
#include "generic.h"
16
-
17
-
static void __init at91rm9200_dt_device_init(void)
18
-
{
19
-
of_platform_default_populate(NULL, NULL, NULL);
20
-
21
-
at91rm9200_pm_init();
22
-
}
23
13
24
14
static const char *const at91rm9200_dt_board_compat[] __initconst = {
25
15
"atmel,at91rm9200",
···
17
27
};
18
28
19
29
DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200")
20
-
.init_machine = at91rm9200_dt_device_init,
30
+
.init_late = at91rm9200_pm_init,
21
31
.dt_compat = at91rm9200_dt_board_compat,
22
32
MACHINE_END
+1
-11
arch/arm/mach-at91/at91sam9.c
+1
-11
arch/arm/mach-at91/at91sam9.c
···
6
6
* 2011 Nicolas Ferre <nicolas.ferre@atmel.com>
7
7
*/
8
8
9
-
#include <linux/of.h>
10
-
#include <linux/of_platform.h>
11
-
12
9
#include <asm/mach/arch.h>
13
10
#include <asm/system_misc.h>
14
11
15
12
#include "generic.h"
16
-
17
-
static void __init at91sam9_init(void)
18
-
{
19
-
of_platform_default_populate(NULL, NULL, NULL);
20
-
21
-
at91sam9_pm_init();
22
-
}
23
13
24
14
static const char *const at91_dt_board_compat[] __initconst = {
25
15
"atmel,at91sam9",
···
18
28
19
29
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")
20
30
/* Maintainer: Atmel */
21
-
.init_machine = at91sam9_init,
31
+
.init_late = at91sam9_pm_init,
22
32
.dt_compat = at91_dt_board_compat,
23
33
MACHINE_END
+1
-11
arch/arm/mach-at91/sam9x60.c
+1
-11
arch/arm/mach-at91/sam9x60.c
···
7
7
* Author: Claudiu Beznea <claudiu.beznea@microchip.com>
8
8
*/
9
9
10
-
#include <linux/of.h>
11
-
#include <linux/of_platform.h>
12
-
13
10
#include <asm/mach/arch.h>
14
11
#include <asm/system_misc.h>
15
12
16
13
#include "generic.h"
17
-
18
-
static void __init sam9x60_init(void)
19
-
{
20
-
of_platform_default_populate(NULL, NULL, NULL);
21
-
22
-
sam9x60_pm_init();
23
-
}
24
14
25
15
static const char *const sam9x60_dt_board_compat[] __initconst = {
26
16
"microchip,sam9x60",
···
19
29
20
30
DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60")
21
31
/* Maintainer: Microchip */
22
-
.init_machine = sam9x60_init,
32
+
.init_late = sam9x60_pm_init,
23
33
.dt_compat = sam9x60_dt_board_compat,
24
34
MACHINE_END
+1
-11
arch/arm/mach-at91/sam9x7.c
+1
-11
arch/arm/mach-at91/sam9x7.c
···
7
7
* Author: Varshini Rajendran <varshini.rajendran@microchip.com>
8
8
*/
9
9
10
-
#include <linux/of.h>
11
-
#include <linux/of_platform.h>
12
-
13
10
#include <asm/mach/arch.h>
14
11
15
12
#include "generic.h"
16
-
17
-
static void __init sam9x7_init(void)
18
-
{
19
-
of_platform_default_populate(NULL, NULL, NULL);
20
-
21
-
sam9x7_pm_init();
22
-
}
23
13
24
14
static const char * const sam9x7_dt_board_compat[] __initconst = {
25
15
"microchip,sam9x7",
···
18
28
19
29
DT_MACHINE_START(sam9x7_dt, "Microchip SAM9X7")
20
30
/* Maintainer: Microchip */
21
-
.init_machine = sam9x7_init,
31
+
.init_late = sam9x7_pm_init,
22
32
.dt_compat = sam9x7_dt_board_compat,
23
33
MACHINE_END
+3
-18
arch/arm/mach-at91/sama5.c
+3
-18
arch/arm/mach-at91/sama5.c
···
6
6
* 2013 Ludovic Desroches <ludovic.desroches@atmel.com>
7
7
*/
8
8
9
-
#include <linux/of.h>
10
-
#include <linux/of_platform.h>
11
-
12
9
#include <asm/hardware/cache-l2x0.h>
13
10
#include <asm/mach/arch.h>
14
11
#include <asm/mach/map.h>
···
27
30
outer_cache.write_sec = sama5_l2c310_write_sec;
28
31
}
29
32
30
-
static void __init sama5_dt_device_init(void)
31
-
{
32
-
of_platform_default_populate(NULL, NULL, NULL);
33
-
sama5_pm_init();
34
-
}
35
-
36
33
static const char *const sama5_dt_board_compat[] __initconst = {
37
34
"atmel,sama5",
38
35
NULL
···
34
43
35
44
DT_MACHINE_START(sama5_dt, "Atmel SAMA5")
36
45
/* Maintainer: Atmel */
37
-
.init_machine = sama5_dt_device_init,
46
+
.init_late = sama5_pm_init,
38
47
.dt_compat = sama5_dt_board_compat,
39
48
MACHINE_END
40
49
···
45
54
46
55
DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5")
47
56
/* Maintainer: Atmel */
48
-
.init_machine = sama5_dt_device_init,
57
+
.init_late = sama5_pm_init,
49
58
.dt_compat = sama5_alt_dt_board_compat,
50
59
.l2c_aux_mask = ~0UL,
51
60
MACHINE_END
52
-
53
-
static void __init sama5d2_init(void)
54
-
{
55
-
of_platform_default_populate(NULL, NULL, NULL);
56
-
sama5d2_pm_init();
57
-
}
58
61
59
62
static const char *const sama5d2_compat[] __initconst = {
60
63
"atmel,sama5d2",
···
57
72
58
73
DT_MACHINE_START(sama5d2, "Atmel SAMA5")
59
74
/* Maintainer: Atmel */
60
-
.init_machine = sama5d2_init,
61
75
.init_early = sama5_secure_cache_init,
76
+
.init_late = sama5d2_pm_init,
62
77
.dt_compat = sama5d2_compat,
63
78
.l2c_aux_mask = ~0UL,
64
79
MACHINE_END
+1
-10
arch/arm/mach-at91/sama7.c
+1
-10
arch/arm/mach-at91/sama7.c
···
6
6
*
7
7
*/
8
8
9
-
#include <linux/of.h>
10
-
#include <linux/of_platform.h>
11
-
12
9
#include <asm/mach/arch.h>
13
10
#include <asm/system_misc.h>
14
11
15
12
#include "generic.h"
16
-
17
-
static void __init sama7_dt_device_init(void)
18
-
{
19
-
of_platform_default_populate(NULL, NULL, NULL);
20
-
sama7_pm_init();
21
-
}
22
13
23
14
static const char *const sama7_dt_board_compat[] __initconst = {
24
15
"microchip,sama7",
···
18
27
19
28
DT_MACHINE_START(sama7_dt, "Microchip SAMA7")
20
29
/* Maintainer: Microchip */
21
-
.init_machine = sama7_dt_device_init,
30
+
.init_late = sama7_pm_init,
22
31
.dt_compat = sama7_dt_board_compat,
23
32
MACHINE_END
24
33
-1
arch/arm/mach-omap1/Kconfig
-1
arch/arm/mach-omap1/Kconfig
+10
-4
arch/arm/mach-omap2/control.c
+10
-4
arch/arm/mach-omap2/control.c
···
732
732
*/
733
733
int __init omap_control_init(void)
734
734
{
735
-
struct device_node *np, *scm_conf;
735
+
struct device_node *np, *scm_conf, *clocks_node;
736
736
const struct of_device_id *match;
737
737
const struct omap_prcm_init_data *data;
738
738
int ret;
···
753
753
754
754
if (IS_ERR(syscon)) {
755
755
ret = PTR_ERR(syscon);
756
-
goto of_node_put;
756
+
goto err_put_scm_conf;
757
757
}
758
758
759
-
if (of_get_child_by_name(scm_conf, "clocks")) {
759
+
clocks_node = of_get_child_by_name(scm_conf, "clocks");
760
+
if (clocks_node) {
761
+
of_node_put(clocks_node);
760
762
ret = omap2_clk_provider_init(scm_conf,
761
763
data->index,
762
764
syscon, NULL);
763
765
if (ret)
764
-
goto of_node_put;
766
+
goto err_put_scm_conf;
765
767
}
768
+
of_node_put(scm_conf);
766
769
} else {
767
770
/* No scm_conf found, direct access */
768
771
ret = omap2_clk_provider_init(np, data->index, NULL,
···
783
780
784
781
return 0;
785
782
783
+
err_put_scm_conf:
784
+
if (scm_conf)
785
+
of_node_put(scm_conf);
786
786
of_node_put:
787
787
of_node_put(np);
788
788
return ret;