Skip to content

Commit 6981e2a

Browse files
torvaldstorvalds
committed
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "This is a rather unpleasantly large set of bug fixes for arm-soc, Most of them because of cross-tree dependencies for Exynos where we should have figured out the right path to merge things before the merge window, and then the maintainer being unable to sort things out in time during a business trip. The other changes contained here are the usual collection: MAINTAINERS file updates - Gregory Clement is now a co-maintainer for the legacy Marvell EBU platforms - A MAINTAINERS entry for the Freescale Vybrid platform that was added last year - Matt Porter no longer works as a maintainer on Broadcom SoCs Build-time issues - A compile-time error for at91 - Several minor DT fixes on at91, imx, exynos, socfpga, and omap - The new digicolor platform was not correctly enabled at all Configuration issues - Two defconfig fix for regressions using USB on versatile express and on OMAP3 - Enabling all 8 CPUs on Allwinner/SUNxi - Enabling the new STiH410 platform to be usable Bug fixes in platform code - A missing barrier for socfpga - Fixing LPDDR1 self-refresh mode on at91 - Fixing RTC interrupt numbers on Exynos3250 - Fixing a cache-coherency issues in CPU power-down on Exynos5 - Multiple small OMAP power management fixes" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (69 commits) MAINTAINERS: Add myself as co-maintainer to the legacy support of the mvebu SoCs ARM: at91: pm_slowclock: fix the compilation error ARM: at91/dt: fix USB high-speed clock to select UTMI ARM: at91/dt: fix at91 udc compatible strings ARM: at91/dt: declare matrix node as a syscon device ARM: vexpress: update CONFIG_USB_ISP1760 option ARM: digicolor: add the machine directory to Makefile ARM: STi: Add STiH410 SoC support MAINTAINERS: add Freescale Vybrid SoC MAINTAINERS: Remove self as ARM mach-bcm co-maintainer ARM: imx6sl-evk: set swbst_reg as vbus's parent reg ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg ARM: at91/dt: at91sam9261: fix clocks and clock-names in udc definition ARM: OMAP2+: Fix wl12xx on dm3730-evm with mainline u-boot ARM: OMAP: enable TWL4030_USB in omap2plus_defconfig ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN lines ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl ARM: dts: am43xx: fix SLEWCTRL_FAST pinctrl binding ARM: dts: am33xx: fix SLEWCTRL_FAST pinctrl binding ARM: dts: OMAP5: fix polling intervals for thermal zones ...
2 parents 71c87bd + bfda403 commit 6981e2a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+882
-225
lines changed

‎Documentation/devicetree/bindings/arm/exynos/power_domain.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Optional Properties:
2222
- pclkN, clkN: Pairs of parent of input clock and input clock to the
2323
devices in this power domain. Maximum of 4 pairs (N = 0 to 3)
2424
are supported currently.
25+
- power-domains: phandle pointing to the parent power domain, for more details
26+
see Documentation/devicetree/bindings/power/power_domain.txt
2527

2628
Node of a device using power domains must have a power-domains property
2729
defined with a phandle to respective power domain.

‎Documentation/devicetree/bindings/arm/sti.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Boards with the ST STiH407 SoC shall have the following properties:
1313
Required root node property:
1414
compatible = "st,stih407";
1515

16+
Boards with the ST STiH410 SoC shall have the following properties:
17+
Required root node property:
18+
compatible = "st,stih410";
19+
1620
Boards with the ST STiH418 SoC shall have the following properties:
1721
Required root node property:
1822
compatible = "st,stih418";

‎Documentation/devicetree/bindings/power/power_domain.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ Required properties:
1919
providing multiple PM domains (e.g. power controllers), but can be any value
2020
as specified by device tree binding documentation of particular provider.
2121

22+
Optional properties:
23+
- power-domains : A phandle and PM domain specifier as defined by bindings of
24+
the power controller specified by phandle.
25+
Some power domains might be powered from another power domain (or have
26+
other hardware specific dependencies). For representing such dependency
27+
a standard PM domain consumer binding is used. When provided, all domains
28+
created by the given provider should be subdomains of the domain
29+
specified by this binding. More details about power domain specifier are
30+
available in the next section.
31+
2232
Example:
2333

2434
power: power-controller@12340000 {
@@ -30,6 +40,25 @@ Example:
3040
The node above defines a power controller that is a PM domain provider and
3141
expects one cell as its phandle argument.
3242

43+
Example 2:
44+
45+
parent: power-controller@12340000 {
46+
compatible = "foo,power-controller";
47+
reg = <0x12340000 0x1000>;
48+
#power-domain-cells = <1>;
49+
};
50+
51+
child: power-controller@12340000 {
52+
compatible = "foo,power-controller";
53+
reg = <0x12341000 0x1000>;
54+
power-domains = <&parent 0>;
55+
#power-domain-cells = <1>;
56+
};
57+
58+
The nodes above define two power controllers: 'parent' and 'child'.
59+
Domains created by the 'child' power controller are subdomains of '0' power
60+
domain provided by the 'parent' power controller.
61+
3362
==PM domain consumers==
3463

3564
Required properties:

‎Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ Optional properties:
2626
- atmel,disable : Should be present if you want to disable the watchdog.
2727
- atmel,idle-halt : Should be present if you want to stop the watchdog when
2828
entering idle state.
29+
CAUTION: This property should be used with care, it actually makes the
30+
watchdog not counting when the CPU is in idle state, therefore the
31+
watchdog reset time depends on mean CPU usage and will not reset at all
32+
if the CPU stop working while it is in idle state, which is probably
33+
not what you want.
2934
- atmel,dbg-halt : Should be present if you want to stop the watchdog when
3035
entering debug state.
3136

‎MAINTAINERS

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,16 @@ F: arch/arm/mach-mxs/
10301030
F: arch/arm/boot/dts/imx*
10311031
F: arch/arm/configs/imx*_defconfig
10321032

1033+
ARM/FREESCALE VYBRID ARM ARCHITECTURE
1034+
M: Shawn Guo <shawn.guo@linaro.org>
1035+
M: Sascha Hauer <kernel@pengutronix.de>
1036+
R: Stefan Agner <stefan@agner.ch>
1037+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1038+
S: Maintained
1039+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
1040+
F: arch/arm/mach-imx/*vf610*
1041+
F: arch/arm/boot/dts/vf*
1042+
10331043
ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
10341044
M: Lennert Buytenhek <kernel@wantstofly.org>
10351045
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1188,6 +1198,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support
11881198
M: Jason Cooper <jason@lakedaemon.net>
11891199
M: Andrew Lunn <andrew@lunn.ch>
11901200
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
1201+
M: Gregory Clement <gregory.clement@free-electrons.com>
11911202
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
11921203
S: Maintained
11931204
F: arch/arm/mach-dove/
@@ -2107,7 +2118,6 @@ F: drivers/net/ethernet/broadcom/bnx2x/
21072118

21082119
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
21092120
M: Christian Daudt <bcm@fixthebug.org>
2110-
M: Matt Porter <mporter@linaro.org>
21112121
M: Florian Fainelli <f.fainelli@gmail.com>
21122122
L: bcm-kernel-feedback-list@broadcom.com
21132123
T: git git://github.com/broadcom/mach-bcm

‎arch/arm/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ machine-$(CONFIG_ARCH_BERLIN) += berlin
150150
machine-$(CONFIG_ARCH_CLPS711X) += clps711x
151151
machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx
152152
machine-$(CONFIG_ARCH_DAVINCI) += davinci
153+
machine-$(CONFIG_ARCH_DIGICOLOR) += digicolor
153154
machine-$(CONFIG_ARCH_DOVE) += dove
154155
machine-$(CONFIG_ARCH_EBSA110) += ebsa110
155156
machine-$(CONFIG_ARCH_EFM32) += efm32

‎arch/arm/boot/dts/am335x-bone-common.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,3 +301,11 @@
301301
cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
302302
cd-inverted;
303303
};
304+
305+
&aes {
306+
status = "okay";
307+
};
308+
309+
&sham {
310+
status = "okay";
311+
};

‎arch/arm/boot/dts/am335x-bone.dts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,3 @@
2424
&mmc1 {
2525
vmmc-supply = <&ldo3_reg>;
2626
};
27-
28-
&sham {
29-
status = "okay";
30-
};
31-
32-
&aes {
33-
status = "okay";
34-
};

‎arch/arm/boot/dts/am335x-lxm.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,10 @@
328328
dual_emac_res_vlan = <3>;
329329
};
330330

331+
&phy_sel {
332+
rmii-clock-ext;
333+
};
334+
331335
&mac {
332336
pinctrl-names = "default", "sleep";
333337
pinctrl-0 = <&cpsw_default>;

‎arch/arm/boot/dts/am33xx-clocks.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,23 @@
9999
ehrpwm0_tbclk: ehrpwm0_tbclk@44e10664 {
100100
#clock-cells = <0>;
101101
compatible = "ti,gate-clock";
102-
clocks = <&dpll_per_m2_ck>;
102+
clocks = <&l4ls_gclk>;
103103
ti,bit-shift = <0>;
104104
reg = <0x0664>;
105105
};
106106

107107
ehrpwm1_tbclk: ehrpwm1_tbclk@44e10664 {
108108
#clock-cells = <0>;
109109
compatible = "ti,gate-clock";
110-
clocks = <&dpll_per_m2_ck>;
110+
clocks = <&l4ls_gclk>;
111111
ti,bit-shift = <1>;
112112
reg = <0x0664>;
113113
};
114114

115115
ehrpwm2_tbclk: ehrpwm2_tbclk@44e10664 {
116116
#clock-cells = <0>;
117117
compatible = "ti,gate-clock";
118-
clocks = <&dpll_per_m2_ck>;
118+
clocks = <&l4ls_gclk>;
119119
ti,bit-shift = <2>;
120120
reg = <0x0664>;
121121
};

‎arch/arm/boot/dts/am43xx-clocks.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,47 +107,47 @@
107107
ehrpwm0_tbclk: ehrpwm0_tbclk {
108108
#clock-cells = <0>;
109109
compatible = "ti,gate-clock";
110-
clocks = <&dpll_per_m2_ck>;
110+
clocks = <&l4ls_gclk>;
111111
ti,bit-shift = <0>;
112112
reg = <0x0664>;
113113
};
114114

115115
ehrpwm1_tbclk: ehrpwm1_tbclk {
116116
#clock-cells = <0>;
117117
compatible = "ti,gate-clock";
118-
clocks = <&dpll_per_m2_ck>;
118+
clocks = <&l4ls_gclk>;
119119
ti,bit-shift = <1>;
120120
reg = <0x0664>;
121121
};
122122

123123
ehrpwm2_tbclk: ehrpwm2_tbclk {
124124
#clock-cells = <0>;
125125
compatible = "ti,gate-clock";
126-
clocks = <&dpll_per_m2_ck>;
126+
clocks = <&l4ls_gclk>;
127127
ti,bit-shift = <2>;
128128
reg = <0x0664>;
129129
};
130130

131131
ehrpwm3_tbclk: ehrpwm3_tbclk {
132132
#clock-cells = <0>;
133133
compatible = "ti,gate-clock";
134-
clocks = <&dpll_per_m2_ck>;
134+
clocks = <&l4ls_gclk>;
135135
ti,bit-shift = <4>;
136136
reg = <0x0664>;
137137
};
138138

139139
ehrpwm4_tbclk: ehrpwm4_tbclk {
140140
#clock-cells = <0>;
141141
compatible = "ti,gate-clock";
142-
clocks = <&dpll_per_m2_ck>;
142+
clocks = <&l4ls_gclk>;
143143
ti,bit-shift = <5>;
144144
reg = <0x0664>;
145145
};
146146

147147
ehrpwm5_tbclk: ehrpwm5_tbclk {
148148
#clock-cells = <0>;
149149
compatible = "ti,gate-clock";
150-
clocks = <&dpll_per_m2_ck>;
150+
clocks = <&l4ls_gclk>;
151151
ti,bit-shift = <6>;
152152
reg = <0x0664>;
153153
};

‎arch/arm/boot/dts/at91sam9260.dtsi

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,12 +494,12 @@
494494

495495
pinctrl_usart3_rts: usart3_rts-0 {
496496
atmel,pins =
497-
<AT91_PIOB 8 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC8 periph B */
497+
<AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_NONE>;
498498
};
499499

500500
pinctrl_usart3_cts: usart3_cts-0 {
501501
atmel,pins =
502-
<AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC10 periph B */
502+
<AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_NONE>;
503503
};
504504
};
505505

@@ -853,7 +853,7 @@
853853
};
854854

855855
usb1: gadget@fffa4000 {
856-
compatible = "atmel,at91rm9200-udc";
856+
compatible = "atmel,at91sam9260-udc";
857857
reg = <0xfffa4000 0x4000>;
858858
interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;
859859
clocks = <&udc_clk>, <&udpck>;
@@ -976,7 +976,6 @@
976976
atmel,watchdog-type = "hardware";
977977
atmel,reset-type = "all";
978978
atmel,dbg-halt;
979-
atmel,idle-halt;
980979
status = "disabled";
981980
};
982981

‎arch/arm/boot/dts/at91sam9261.dtsi

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,12 @@
124124
};
125125

126126
usb1: gadget@fffa4000 {
127-
compatible = "atmel,at91rm9200-udc";
127+
compatible = "atmel,at91sam9261-udc";
128128
reg = <0xfffa4000 0x4000>;
129129
interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;
130-
clocks = <&usb>, <&udc_clk>, <&udpck>;
131-
clock-names = "usb_clk", "udc_clk", "udpck";
130+
clocks = <&udc_clk>, <&udpck>;
131+
clock-names = "pclk", "hclk";
132+
atmel,matrix = <&matrix>;
132133
status = "disabled";
133134
};
134135

@@ -262,7 +263,7 @@
262263
};
263264

264265
matrix: matrix@ffffee00 {
265-
compatible = "atmel,at91sam9260-bus-matrix";
266+
compatible = "atmel,at91sam9260-bus-matrix", "syscon";
266267
reg = <0xffffee00 0x200>;
267268
};
268269

‎arch/arm/boot/dts/at91sam9263.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
sram1: sram@00500000 {
7171
compatible = "mmio-sram";
72-
reg = <0x00300000 0x4000>;
72+
reg = <0x00500000 0x4000>;
7373
};
7474

7575
ahb {
@@ -856,7 +856,7 @@
856856
};
857857

858858
usb1: gadget@fff78000 {
859-
compatible = "atmel,at91rm9200-udc";
859+
compatible = "atmel,at91sam9263-udc";
860860
reg = <0xfff78000 0x4000>;
861861
interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>;
862862
clocks = <&udc_clk>, <&udpck>;
@@ -905,7 +905,6 @@
905905
atmel,watchdog-type = "hardware";
906906
atmel,reset-type = "all";
907907
atmel,dbg-halt;
908-
atmel,idle-halt;
909908
status = "disabled";
910909
};
911910

‎arch/arm/boot/dts/at91sam9g45.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,6 @@
11161116
atmel,watchdog-type = "hardware";
11171117
atmel,reset-type = "all";
11181118
atmel,dbg-halt;
1119-
atmel,idle-halt;
11201119
status = "disabled";
11211120
};
11221121

@@ -1301,7 +1300,7 @@
13011300
compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
13021301
reg = <0x00800000 0x100000>;
13031302
interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
1304-
clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
1303+
clocks = <&utmi>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
13051304
clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";
13061305
status = "disabled";
13071306
};

‎arch/arm/boot/dts/at91sam9n12.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,6 @@
894894
atmel,watchdog-type = "hardware";
895895
atmel,reset-type = "all";
896896
atmel,dbg-halt;
897-
atmel,idle-halt;
898897
status = "disabled";
899898
};
900899

‎arch/arm/boot/dts/at91sam9x5.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@
10661066
reg = <0x00500000 0x80000
10671067
0xf803c000 0x400>;
10681068
interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
1069-
clocks = <&usb>, <&udphs_clk>;
1069+
clocks = <&utmi>, <&udphs_clk>;
10701070
clock-names = "hclk", "pclk";
10711071
status = "disabled";
10721072

@@ -1130,7 +1130,6 @@
11301130
atmel,watchdog-type = "hardware";
11311131
atmel,reset-type = "all";
11321132
atmel,dbg-halt;
1133-
atmel,idle-halt;
11341133
status = "disabled";
11351134
};
11361135

@@ -1186,7 +1185,7 @@
11861185
compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
11871186
reg = <0x00700000 0x100000>;
11881187
interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
1189-
clocks = <&usb>, <&uhphs_clk>, <&uhpck>;
1188+
clocks = <&utmi>, <&uhphs_clk>, <&uhpck>;
11901189
clock-names = "usb_clk", "ehci_clk", "uhpck";
11911190
status = "disabled";
11921191
};

‎arch/arm/boot/dts/dra7-evm.dts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,17 +263,15 @@
263263

264264
dcan1_pins_default: dcan1_pins_default {
265265
pinctrl-single,pins = <
266-
0x3d0 (PIN_OUTPUT | MUX_MODE0) /* dcan1_tx */
267-
0x3d4 (MUX_MODE15) /* dcan1_rx.off */
268-
0x418 (PULL_DIS | MUX_MODE1) /* wakeup0.dcan1_rx */
266+
0x3d0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */
267+
0x418 (PULL_UP | MUX_MODE1) /* wakeup0.dcan1_rx */
269268
>;
270269
};
271270

272271
dcan1_pins_sleep: dcan1_pins_sleep {
273272
pinctrl-single,pins = <
274-
0x3d0 (MUX_MODE15) /* dcan1_tx.off */
275-
0x3d4 (MUX_MODE15) /* dcan1_rx.off */
276-
0x418 (MUX_MODE15) /* wakeup0.off */
273+
0x3d0 (MUX_MODE15 | PULL_UP) /* dcan1_tx.off */
274+
0x418 (MUX_MODE15 | PULL_UP) /* wakeup0.off */
277275
>;
278276
};
279277
};

0 commit comments

Comments
 (0)