Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"A collection of fixes for ARM platforms. Most are fixes for DTS
files, mostly from DT conversion on OMAP which is still finding a few
issues here and there.
There's a couple of small stale code removal patches that we usually
queue for the next release instead, but they seemed harmless enough to
bring in now.
Also, a fix for backlight on some PXA platforms, and a cache
configuration fix for Tegra, etc"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
MAINTAINERS: add additional ARM BCM281xx/BCM11xxx maintainer
ARM: tegra: only run PL310 init on systems with one
ARM: tegra: Add head numbers to display controllers
ARM: imx6: build pm-imx6q.c independently of CONFIG_PM
ARM: tegra: fix RTC0 alias for Cardhu
ARM: dove: dt: revert PMU interrupt controller node
Documentation: dt: OMAP: Update Overo/Tobi
ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
ARM: dts: omap3-tobi: Use the correct vendor prefix
ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
ARM: OMAP2+: Remove legacy macros for zoom platforms
ARM: OMAP2+: Remove MACH_NOKIA_N800
ARM: dts: N900: add missing compatible property
ARM: dts: N9/N950: fix boot hang with 3.14-rc1
ARM: OMAP1: nokia770: enable tahvo-usb
ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
ARM: dts: omap3-gta04: Fix mmc1 properties.
ARM: dts: omap3-gta04: Fix 'aux' gpio key flags.
ARM: OMAP2+: add missing ARCH_HAS_OPP
...
+108
-48
+1
-1
Documentation/devicetree/bindings/arm/omap/omap.txt
+1
-1
Documentation/devicetree/bindings/arm/omap/omap.txt
···
91
91
compatible = "ti,omap3-beagle", "ti,omap3"
92
92
93
93
- OMAP3 Tobi with Overo : Commercial expansion board with daughter board
94
-
compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"
94
+
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"
95
95
96
96
- OMAP4 SDP : Software Development Board
97
97
compatible = "ti,omap4-sdp", "ti,omap4430"
+1
MAINTAINERS
+1
MAINTAINERS
+2
-1
arch/arm/boot/dts/Makefile
+2
-1
arch/arm/boot/dts/Makefile
+10
-1
arch/arm/boot/dts/am335x-evmsk.dts
+10
-1
arch/arm/boot/dts/am335x-evmsk.dts
···
121
121
ti,model = "AM335x-EVMSK";
122
122
ti,audio-codec = <&tlv320aic3106>;
123
123
ti,mcasp-controller = <&mcasp1>;
124
-
ti,codec-clock-rate = <24576000>;
124
+
ti,codec-clock-rate = <24000000>;
125
125
ti,audio-routing =
126
126
"Headphone Jack", "HPLOUT",
127
127
"Headphone Jack", "HPROUT";
···
253
253
/* MDIO reset value */
254
254
0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
255
255
0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
256
+
>;
257
+
};
258
+
259
+
mmc1_pins: pinmux_mmc1_pins {
260
+
pinctrl-single,pins = <
261
+
0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
256
262
>;
257
263
};
258
264
···
462
456
status = "okay";
463
457
vmmc-supply = <&vmmc_reg>;
464
458
bus-width = <4>;
459
+
pinctrl-names = "default";
460
+
pinctrl-0 = <&mmc1_pins>;
461
+
cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
465
462
};
466
463
467
464
&sham {
+2
-1
arch/arm/boot/dts/armada-xp-mv78260.dtsi
+2
-1
arch/arm/boot/dts/armada-xp-mv78260.dtsi
···
23
23
gpio0 = &gpio0;
24
24
gpio1 = &gpio1;
25
25
gpio2 = &gpio2;
26
+
eth3 = ð3;
26
27
};
27
28
28
29
cpus {
···
292
291
interrupts = <91>;
293
292
};
294
293
295
-
ethernet@34000 {
294
+
eth3: ethernet@34000 {
296
295
compatible = "marvell,armada-370-neta";
297
296
reg = <0x34000 0x4000>;
298
297
interrupts = <14>;
-11
arch/arm/boot/dts/dove.dtsi
-11
arch/arm/boot/dts/dove.dtsi
···
379
379
#clock-cells = <1>;
380
380
};
381
381
382
-
pmu_intc: pmu-interrupt-ctrl@d0050 {
383
-
compatible = "marvell,dove-pmu-intc";
384
-
interrupt-controller;
385
-
#interrupt-cells = <1>;
386
-
reg = <0xd0050 0x8>;
387
-
interrupts = <33>;
388
-
marvell,#interrupts = <7>;
389
-
};
390
-
391
382
pinctrl: pin-ctrl@d0200 {
392
383
compatible = "marvell,dove-pinctrl";
393
384
reg = <0xd0200 0x10>;
···
601
610
rtc: real-time-clock@d8500 {
602
611
compatible = "marvell,orion-rtc";
603
612
reg = <0xd8500 0x20>;
604
-
interrupt-parent = <&pmu_intc>;
605
-
interrupts = <5>;
606
613
};
607
614
608
615
gpio2: gpio-ctrl@e8400 {
+4
-2
arch/arm/boot/dts/omap3-gta04.dts
+4
-2
arch/arm/boot/dts/omap3-gta04.dts
···
32
32
aux-button {
33
33
label = "aux";
34
34
linux,code = <169>;
35
-
gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
35
+
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
36
36
gpio-key,wakeup;
37
37
};
38
38
};
···
92
92
bmp085@77 {
93
93
compatible = "bosch,bmp085";
94
94
reg = <0x77>;
95
+
interrupt-parent = <&gpio4>;
96
+
interrupts = <17 IRQ_TYPE_EDGE_RISING>;
95
97
};
96
98
97
99
/* leds */
···
143
141
pinctrl-names = "default";
144
142
pinctrl-0 = <&mmc1_pins>;
145
143
vmmc-supply = <&vmmc1>;
146
-
vmmc_aux-supply = <&vsim>;
147
144
bus-width = <4>;
145
+
ti,non-removable;
148
146
};
149
147
150
148
&mmc2 {
+1
-1
arch/arm/boot/dts/omap3-n9.dts
+1
-1
arch/arm/boot/dts/omap3-n9.dts
+2
-2
arch/arm/boot/dts/omap3-n900.dts
+2
-2
arch/arm/boot/dts/omap3-n900.dts
···
1
1
/*
2
2
* Copyright (C) 2013 Pavel Machek <pavel@ucw.cz>
3
-
* Copyright 2013 Aaro Koskinen <aaro.koskinen@iki.fi>
3
+
* Copyright (C) 2013-2014 Aaro Koskinen <aaro.koskinen@iki.fi>
4
4
*
5
5
* This program is free software; you can redistribute it and/or modify
6
6
* it under the terms of the GNU General Public License version 2 (or later) as
···
13
13
14
14
/ {
15
15
model = "Nokia N900";
16
-
compatible = "nokia,omap3-n900", "ti,omap3";
16
+
compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
17
17
18
18
cpus {
19
19
cpu@0 {
+1
-1
arch/arm/boot/dts/omap3-n950.dts
+1
-1
arch/arm/boot/dts/omap3-n950.dts
+22
arch/arm/boot/dts/omap3-overo-storm-tobi.dts
+22
arch/arm/boot/dts/omap3-overo-storm-tobi.dts
···
1
+
/*
2
+
* Copyright (C) 2012 Florian Vaussard, EPFL Mobots group
3
+
*
4
+
* This program is free software; you can redistribute it and/or modify
5
+
* it under the terms of the GNU General Public License version 2 as
6
+
* published by the Free Software Foundation.
7
+
*/
8
+
9
+
/*
10
+
* Tobi expansion board is manufactured by Gumstix Inc.
11
+
*/
12
+
13
+
/dts-v1/;
14
+
15
+
#include "omap36xx.dtsi"
16
+
#include "omap3-overo-tobi-common.dtsi"
17
+
18
+
/ {
19
+
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Tobi";
20
+
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
21
+
};
22
+
+22
arch/arm/boot/dts/omap3-overo-tobi.dts
+22
arch/arm/boot/dts/omap3-overo-tobi.dts
···
1
+
/*
2
+
* Copyright (C) 2012 Florian Vaussard, EPFL Mobots group
3
+
*
4
+
* This program is free software; you can redistribute it and/or modify
5
+
* it under the terms of the GNU General Public License version 2 as
6
+
* published by the Free Software Foundation.
7
+
*/
8
+
9
+
/*
10
+
* Tobi expansion board is manufactured by Gumstix Inc.
11
+
*/
12
+
13
+
/dts-v1/;
14
+
15
+
#include "omap34xx.dtsi"
16
+
#include "omap3-overo-tobi-common.dtsi"
17
+
18
+
/ {
19
+
model = "OMAP35xx Gumstix Overo on Tobi";
20
+
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3";
21
+
};
22
+
-3
arch/arm/boot/dts/omap3-overo.dtsi
-3
arch/arm/boot/dts/omap3-overo.dtsi
-3
arch/arm/boot/dts/omap3-tobi.dts
arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
-3
arch/arm/boot/dts/omap3-tobi.dts
arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
+4
arch/arm/boot/dts/tegra114.dtsi
+4
arch/arm/boot/dts/tegra114.dtsi
···
57
57
resets = <&tegra_car 27>;
58
58
reset-names = "dc";
59
59
60
+
nvidia,head = <0>;
61
+
60
62
rgb {
61
63
status = "disabled";
62
64
};
···
73
71
clock-names = "dc", "parent";
74
72
resets = <&tegra_car 26>;
75
73
reset-names = "dc";
74
+
75
+
nvidia,head = <1>;
76
76
77
77
rgb {
78
78
status = "disabled";
+4
arch/arm/boot/dts/tegra20.dtsi
+4
arch/arm/boot/dts/tegra20.dtsi
···
94
94
resets = <&tegra_car 27>;
95
95
reset-names = "dc";
96
96
97
+
nvidia,head = <0>;
98
+
97
99
rgb {
98
100
status = "disabled";
99
101
};
···
110
108
clock-names = "dc", "parent";
111
109
resets = <&tegra_car 26>;
112
110
reset-names = "dc";
111
+
112
+
nvidia,head = <1>;
113
113
114
114
rgb {
115
115
status = "disabled";
+1
-1
arch/arm/boot/dts/tegra30-cardhu.dtsi
+1
-1
arch/arm/boot/dts/tegra30-cardhu.dtsi
+4
arch/arm/boot/dts/tegra30.dtsi
+4
arch/arm/boot/dts/tegra30.dtsi
···
170
170
resets = <&tegra_car 27>;
171
171
reset-names = "dc";
172
172
173
+
nvidia,head = <0>;
174
+
173
175
rgb {
174
176
status = "disabled";
175
177
};
···
186
184
clock-names = "dc", "parent";
187
185
resets = <&tegra_car 26>;
188
186
reset-names = "dc";
187
+
188
+
nvidia,head = <1>;
189
189
190
190
rgb {
191
191
status = "disabled";
-2
arch/arm/mach-imx/Makefile
-2
arch/arm/mach-imx/Makefile
···
101
101
obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o
102
102
obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o
103
103
104
-
ifeq ($(CONFIG_PM),y)
105
104
obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o
106
105
# i.MX6SL reuses i.MX6Q code
107
106
obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o
108
-
endif
109
107
110
108
# i.MX5 based machines
111
109
obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
+1
-3
arch/arm/mach-imx/common.h
+1
-3
arch/arm/mach-imx/common.h
···
144
144
void imx_cpu_die(unsigned int cpu);
145
145
int imx_cpu_kill(unsigned int cpu);
146
146
147
-
#ifdef CONFIG_PM
148
147
void imx6q_pm_init(void);
149
148
void imx6q_pm_set_ccm_base(void __iomem *base);
149
+
#ifdef CONFIG_PM
150
150
void imx5_pm_init(void);
151
151
#else
152
-
static inline void imx6q_pm_init(void) {}
153
-
static inline void imx6q_pm_set_ccm_base(void __iomem *base) {}
154
152
static inline void imx5_pm_init(void) {}
155
153
#endif
156
154
+1
arch/arm/mach-omap1/board-nokia770.c
+1
arch/arm/mach-omap1/board-nokia770.c
+4
-4
arch/arm/mach-omap2/Kconfig
+4
-4
arch/arm/mach-omap2/Kconfig
···
50
50
bool "TI OMAP5"
51
51
depends on ARCH_MULTI_V7
52
52
select ARCH_OMAP2PLUS
53
+
select ARCH_HAS_OPP
53
54
select ARM_CPU_SUSPEND if PM
54
55
select ARM_GIC
55
56
select CPU_V7
···
64
63
bool "TI AM33XX"
65
64
depends on ARCH_MULTI_V7
66
65
select ARCH_OMAP2PLUS
66
+
select ARCH_HAS_OPP
67
67
select ARM_CPU_SUSPEND if PM
68
68
select CPU_V7
69
69
select MULTI_IRQ_HANDLER
···
74
72
depends on ARCH_MULTI_V7
75
73
select CPU_V7
76
74
select ARCH_OMAP2PLUS
75
+
select ARCH_HAS_OPP
77
76
select MULTI_IRQ_HANDLER
78
77
select ARM_GIC
79
78
select MACH_OMAP_GENERIC
···
83
80
bool "TI DRA7XX"
84
81
depends on ARCH_MULTI_V7
85
82
select ARCH_OMAP2PLUS
83
+
select ARCH_HAS_OPP
86
84
select ARM_CPU_SUSPEND if PM
87
85
select ARM_GIC
88
86
select CPU_V7
···
272
268
default y
273
269
select OMAP_PACKAGE_CBB
274
270
275
-
config MACH_NOKIA_N800
276
-
bool
277
-
278
271
config MACH_NOKIA_N810
279
272
bool
280
273
···
282
281
bool "Nokia N800/N810"
283
282
depends on SOC_OMAP2420
284
283
default y
285
-
select MACH_NOKIA_N800
286
284
select MACH_NOKIA_N810
287
285
select MACH_NOKIA_N810_WIMAX
288
286
select OMAP_PACKAGE_ZAC
+2
-2
arch/arm/mach-omap2/gpmc.c
+2
-2
arch/arm/mach-omap2/gpmc.c
···
1339
1339
of_property_read_bool(np, "gpmc,time-para-granularity");
1340
1340
}
1341
1341
1342
-
#ifdef CONFIG_MTD_NAND
1342
+
#if IS_ENABLED(CONFIG_MTD_NAND)
1343
1343
1344
1344
static const char * const nand_xfer_types[] = {
1345
1345
[NAND_OMAP_PREFETCH_POLLED] = "prefetch-polled",
···
1429
1429
}
1430
1430
#endif
1431
1431
1432
-
#ifdef CONFIG_MTD_ONENAND
1432
+
#if IS_ENABLED(CONFIG_MTD_ONENAND)
1433
1433
static int gpmc_probe_onenand_child(struct platform_device *pdev,
1434
1434
struct device_node *child)
1435
1435
{
-9
arch/arm/mach-omap2/io.c
-9
arch/arm/mach-omap2/io.c
···
179
179
.length = L4_EMU_34XX_SIZE,
180
180
.type = MT_DEVICE
181
181
},
182
-
#if defined(CONFIG_DEBUG_LL) && \
183
-
(defined(CONFIG_MACH_OMAP_ZOOM2) || defined(CONFIG_MACH_OMAP_ZOOM3))
184
-
{
185
-
.virtual = ZOOM_UART_VIRT,
186
-
.pfn = __phys_to_pfn(ZOOM_UART_BASE),
187
-
.length = SZ_1M,
188
-
.type = MT_DEVICE
189
-
},
190
-
#endif
191
182
};
192
183
#endif
193
184
+9
arch/arm/mach-pxa/mioa701.c
+9
arch/arm/mach-pxa/mioa701.c
···
38
38
#include <linux/mtd/physmap.h>
39
39
#include <linux/usb/gpio_vbus.h>
40
40
#include <linux/reboot.h>
41
+
#include <linux/regulator/fixed.h>
41
42
#include <linux/regulator/max1586.h>
42
43
#include <linux/slab.h>
43
44
#include <linux/i2c/pxa-i2c.h>
···
715
714
{ GPIO56_MT9M111_nOE, GPIOF_OUT_INIT_LOW, "Camera nOE" },
716
715
};
717
716
717
+
static struct regulator_consumer_supply fixed_5v0_consumers[] = {
718
+
REGULATOR_SUPPLY("power", "pwm-backlight"),
719
+
};
720
+
718
721
static void __init mioa701_machine_init(void)
719
722
{
720
723
int rc;
···
758
753
pxa_set_i2c_info(&i2c_pdata);
759
754
pxa27x_set_i2c_power_info(NULL);
760
755
pxa_set_camera_info(&mioa701_pxacamera_platform_data);
756
+
757
+
regulator_register_always_on(0, "fixed-5.0V", fixed_5v0_consumers,
758
+
ARRAY_SIZE(fixed_5v0_consumers),
759
+
5000000);
761
760
}
762
761
763
762
static void mioa701_machine_exit(void)
+10
arch/arm/mach-tegra/tegra.c
+10
arch/arm/mach-tegra/tegra.c
···
73
73
static void __init tegra_init_cache(void)
74
74
{
75
75
#ifdef CONFIG_CACHE_L2X0
76
+
static const struct of_device_id pl310_ids[] __initconst = {
77
+
{ .compatible = "arm,pl310-cache", },
78
+
{}
79
+
};
80
+
81
+
struct device_node *np;
76
82
int ret;
77
83
void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000;
78
84
u32 aux_ctrl, cache_type;
85
+
86
+
np = of_find_matching_node(NULL, pl310_ids);
87
+
if (!np)
88
+
return;
79
89
80
90
cache_type = readl(p + L2X0_CACHE_TYPE);
81
91
aux_ctrl = (cache_type & 0x700) << (17-8);