Skip to content

Commit 974b335

Browse files
committed
Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "People are back from the holiday breaks, and it shows. Here are a bunch of fixes for a number of platforms: - A couple of small fixes for Nomadik - A larger set of changes for kirkwood/mvebu - uart driver selection, dt clocks, gpio-poweroff fixups, a few __init annotation fixes and some error handling improvement in their xor dma driver. - i.MX had a couple of minor fixes (and a critical one for flexcan2 clock setup) - MXS has a small board fix and a framebuffer bugfix - A set of fixes for Samsung Exynos, fixing default bootargs and some Exynos5440 clock issues - A set of OMAP changes including PM fixes and a few sparse warning fixups All in all a bit more positive code delta than we'd ideally want to see here, mostly from the OMAP PM changes, but nothing overly crazy." * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits) ARM: clps711x: Fix bad merge of clockevents setup ARM: highbank: save and restore L2 cache and GIC on suspend ARM: highbank: add a power request clear ARM: highbank: fix secondary boot and hotplug ARM: highbank: fix typos with hignbank in power request functions ARM: dts: fix highbank cpu mpidr values ARM: dts: add device_type prop to cpu nodes on Calxeda platforms ARM: mx5: Fix MX53 flexcan2 clock ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array pinctrl: mvebu: make pdma clock on dove mandatory ARM: Dove: Add pinctrl clock to DT dma: mv_xor: fix error handling for clocks dma: mv_xor: fix error handling of mv_xor_channel_add() arm: mvebu: Add missing ; for cpu node. arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces arm: mvebu: Armada XP MV78230 has two cores, not one clk: mvebu: Remove inappropriate __init tagging ARM: Kirkwood: Use fixed-regulator instead of board gpio call ARM: Kirkwood: Fix missing sdio clock ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers ...
2 parents ca5c8a4 + 434fec1 commit 974b335

Some content is hidden

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

53 files changed

+351
-183
lines changed

Documentation/devicetree/bindings/clock/imx23-clock.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ clks: clkctrl@80040000 {
6060
compatible = "fsl,imx23-clkctrl";
6161
reg = <0x80040000 0x2000>;
6262
#clock-cells = <1>;
63-
clock-output-names =
64-
...
65-
"uart", /* 32 */
66-
...
67-
"end_of_list";
6863
};
6964

7065
auart0: serial@8006c000 {

Documentation/devicetree/bindings/clock/imx25-clock.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,6 @@ clks: ccm@53f80000 {
146146
compatible = "fsl,imx25-ccm";
147147
reg = <0x53f80000 0x4000>;
148148
interrupts = <31>;
149-
clock-output-names = ...
150-
"uart_ipg",
151-
"uart_serial",
152-
...;
153149
};
154150

155151
uart1: serial@43f90000 {

Documentation/devicetree/bindings/clock/imx28-clock.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@ clks: clkctrl@80040000 {
8383
compatible = "fsl,imx28-clkctrl";
8484
reg = <0x80040000 0x2000>;
8585
#clock-cells = <1>;
86-
clock-output-names =
87-
...
88-
"uart", /* 45 */
89-
...
90-
"end_of_list";
9186
};
9287

9388
auart0: serial@8006a000 {

Documentation/devicetree/bindings/clock/imx6q-clock.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,6 @@ clks: ccm@020c4000 {
211211
reg = <0x020c4000 0x4000>;
212212
interrupts = <0 87 0x04 0 88 0x04>;
213213
#clock-cells = <1>;
214-
clock-output-names = ...
215-
"uart_ipg",
216-
"uart_serial",
217-
...;
218214
};
219215

220216
uart1: serial@02020000 {

Documentation/devicetree/bindings/gpio/gpio-poweroff.txt

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
GPIO line that should be set high/low to power off a device
1+
Driver a GPIO line that can be used to turn the power off.
2+
3+
The driver supports both level triggered and edge triggered power off.
4+
At driver load time, the driver will request the given gpio line and
5+
install a pm_power_off handler. If the optional properties 'input' is
6+
not found, the GPIO line will be driven in the inactive
7+
state. Otherwise its configured as an input.
8+
9+
When the pm_power_off is called, the gpio is configured as an output,
10+
and drive active, so triggering a level triggered power off
11+
condition. This will also cause an inactive->active edge condition, so
12+
triggering positive edge triggered power off. After a delay of 100ms,
13+
the GPIO is set to inactive, thus causing an active->inactive edge,
14+
triggering negative edge triggered power off. After another 100ms
15+
delay the GPIO is driver active again. If the power is still on and
16+
the CPU still running after a 3000ms delay, a WARN_ON(1) is emitted.
217

318
Required properties:
419
- compatible : should be "gpio-poweroff".
@@ -13,10 +28,9 @@ Optional properties:
1328
property is not specified, the GPIO is initialized as an output in its
1429
inactive state.
1530

16-
1731
Examples:
1832

1933
gpio-poweroff {
2034
compatible = "gpio-poweroff";
21-
gpios = <&gpio 4 0>; /* GPIO 4 Active Low */
35+
gpios = <&gpio 4 0>;
2236
};

arch/arm/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ config ARCH_CNS3XXX
371371
config ARCH_CLPS711X
372372
bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
373373
select ARCH_REQUIRE_GPIOLIB
374-
select ARCH_USES_GETTIMEOFFSET
375374
select AUTO_ZRELADDR
376375
select CLKDEV_LOOKUP
377376
select COMMON_CLK

arch/arm/boot/dts/armada-370-xp.dtsi

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,19 @@
5050
ranges;
5151

5252
serial@d0012000 {
53-
compatible = "ns16550";
53+
compatible = "snps,dw-apb-uart";
5454
reg = <0xd0012000 0x100>;
5555
reg-shift = <2>;
5656
interrupts = <41>;
57+
reg-io-width = <4>;
5758
status = "disabled";
5859
};
5960
serial@d0012100 {
60-
compatible = "ns16550";
61+
compatible = "snps,dw-apb-uart";
6162
reg = <0xd0012100 0x100>;
6263
reg-shift = <2>;
6364
interrupts = <42>;
65+
reg-io-width = <4>;
6466
status = "disabled";
6567
};
6668

arch/arm/boot/dts/armada-xp-mv78230.dtsi

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,14 @@
3434
reg = <0>;
3535
clocks = <&cpuclk 0>;
3636
};
37-
}
37+
38+
cpu@1 {
39+
device_type = "cpu";
40+
compatible = "marvell,sheeva-v7";
41+
reg = <1>;
42+
clocks = <&cpuclk 1>;
43+
};
44+
};
3845

3946
soc {
4047
pinctrl {

arch/arm/boot/dts/armada-xp-mv78260.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,13 @@
8585
#interrupts-cells = <2>;
8686
interrupts = <24>;
8787
};
88+
89+
ethernet@d0034000 {
90+
compatible = "marvell,armada-370-neta";
91+
reg = <0xd0034000 0x2500>;
92+
interrupts = <14>;
93+
clocks = <&gateclk 1>;
94+
status = "disabled";
95+
};
8896
};
8997
};

arch/arm/boot/dts/armada-xp-mv78460.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,13 @@
100100
#interrupts-cells = <2>;
101101
interrupts = <24>;
102102
};
103+
104+
ethernet@d0034000 {
105+
compatible = "marvell,armada-370-neta";
106+
reg = <0xd0034000 0x2500>;
107+
interrupts = <14>;
108+
clocks = <&gateclk 1>;
109+
status = "disabled";
110+
};
103111
};
104112
};

0 commit comments

Comments
 (0)