Skip to content

Commit 974b335

Browse files
torvaldstorvalds
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
};

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,19 @@
4242

4343
soc {
4444
serial@d0012200 {
45-
compatible = "ns16550";
45+
compatible = "snps,dw-apb-uart";
4646
reg = <0xd0012200 0x100>;
4747
reg-shift = <2>;
4848
interrupts = <43>;
49+
reg-io-width = <4>;
4950
status = "disabled";
5051
};
5152
serial@d0012300 {
52-
compatible = "ns16550";
53+
compatible = "snps,dw-apb-uart";
5354
reg = <0xd0012300 0x100>;
5455
reg-shift = <2>;
5556
interrupts = <44>;
57+
reg-io-width = <4>;
5658
status = "disabled";
5759
};
5860

@@ -93,14 +95,6 @@
9395
status = "disabled";
9496
};
9597

96-
ethernet@d0034000 {
97-
compatible = "marvell,armada-370-neta";
98-
reg = <0xd0034000 0x2500>;
99-
interrupts = <14>;
100-
clocks = <&gateclk 1>;
101-
status = "disabled";
102-
};
103-
10498
xor@d0060900 {
10599
compatible = "marvell,orion-xor";
106100
reg = <0xd0060900 0x100

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
pinctrl: pinctrl@d0200 {
118118
compatible = "marvell,dove-pinctrl";
119119
reg = <0xd0200 0x10>;
120+
clocks = <&gate_clk 22>;
120121
};
121122

122123
spi0: spi@10600 {

‎arch/arm/boot/dts/ecx-2000.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,31 @@
3232

3333
cpu@0 {
3434
compatible = "arm,cortex-a15";
35+
device_type = "cpu";
3536
reg = <0>;
3637
clocks = <&a9pll>;
3738
clock-names = "cpu";
3839
};
3940

4041
cpu@1 {
4142
compatible = "arm,cortex-a15";
43+
device_type = "cpu";
4244
reg = <1>;
4345
clocks = <&a9pll>;
4446
clock-names = "cpu";
4547
};
4648

4749
cpu@2 {
4850
compatible = "arm,cortex-a15";
51+
device_type = "cpu";
4952
reg = <2>;
5053
clocks = <&a9pll>;
5154
clock-names = "cpu";
5255
};
5356

5457
cpu@3 {
5558
compatible = "arm,cortex-a15";
59+
device_type = "cpu";
5660
reg = <3>;
5761
clocks = <&a9pll>;
5862
clock-names = "cpu";

‎arch/arm/boot/dts/exynos4210-smdkv310.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
};
2727

2828
chosen {
29-
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
29+
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
3030
};
3131

3232
sdhci@12530000 {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@
574574

575575
hdmi {
576576
compatible = "samsung,exynos5-hdmi";
577-
reg = <0x14530000 0x100000>;
577+
reg = <0x14530000 0x70000>;
578578
interrupts = <0 95 0>;
579579
};
580580

‎arch/arm/boot/dts/exynos5440-ssdk5440.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
};
2222

2323
chosen {
24-
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x81000000,8M console=ttySAC2,115200 init=/linuxrc";
24+
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x81000000,8M console=ttySAC0,115200 init=/linuxrc";
2525
};
2626

2727
spi {

‎arch/arm/boot/dts/highbank.dts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,37 @@
3030
#address-cells = <1>;
3131
#size-cells = <0>;
3232

33-
cpu@0 {
33+
cpu@900 {
3434
compatible = "arm,cortex-a9";
35-
reg = <0>;
35+
device_type = "cpu";
36+
reg = <0x900>;
3637
next-level-cache = <&L2>;
3738
clocks = <&a9pll>;
3839
clock-names = "cpu";
3940
};
4041

41-
cpu@1 {
42+
cpu@901 {
4243
compatible = "arm,cortex-a9";
43-
reg = <1>;
44+
device_type = "cpu";
45+
reg = <0x901>;
4446
next-level-cache = <&L2>;
4547
clocks = <&a9pll>;
4648
clock-names = "cpu";
4749
};
4850

49-
cpu@2 {
51+
cpu@902 {
5052
compatible = "arm,cortex-a9";
51-
reg = <2>;
53+
device_type = "cpu";
54+
reg = <0x902>;
5255
next-level-cache = <&L2>;
5356
clocks = <&a9pll>;
5457
clock-names = "cpu";
5558
};
5659

57-
cpu@3 {
60+
cpu@903 {
5861
compatible = "arm,cortex-a9";
59-
reg = <3>;
62+
device_type = "cpu";
63+
reg = <0x903>;
6064
next-level-cache = <&L2>;
6165
clocks = <&a9pll>;
6266
clock-names = "cpu";

‎arch/arm/boot/dts/imx23-olinuxino.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
hog_pins_a: hog@0 {
4040
reg = <0>;
4141
fsl,pinmux-ids = <
42-
0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */
42+
0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */
4343
>;
4444
fsl,drive-strength = <0>;
4545
fsl,voltage = <1>;
4646
fsl,pull-up = <0>;
4747
};
4848

49-
led_pin_gpio0_17: led_gpio0_17@0 {
49+
led_pin_gpio2_1: led_gpio2_1@0 {
5050
reg = <0>;
5151
fsl,pinmux-ids = <
52-
0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */
52+
0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */
5353
>;
5454
fsl,drive-strength = <0>;
5555
fsl,voltage = <1>;
@@ -110,7 +110,7 @@
110110
leds {
111111
compatible = "gpio-leds";
112112
pinctrl-names = "default";
113-
pinctrl-0 = <&led_pin_gpio0_17>;
113+
pinctrl-0 = <&led_pin_gpio2_1>;
114114

115115
user {
116116
label = "green";

‎arch/arm/boot/dts/imx31-bug.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
/ {
1616
model = "Buglabs i.MX31 Bug 1.x";
17-
compatible = "fsl,imx31-bug", "fsl,imx31";
17+
compatible = "buglabs,imx31-bug", "fsl,imx31";
1818

1919
memory {
2020
reg = <0x80000000 0x8000000>; /* 128M */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@
492492
compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
493493
reg = <0x53fcc000 0x4000>;
494494
interrupts = <83>;
495-
clocks = <&clks 158>, <&clks 157>;
495+
clocks = <&clks 87>, <&clks 86>;
496496
clock-names = "ipg", "per";
497497
status = "disabled";
498498
};

‎arch/arm/boot/dts/kirkwood-6282.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#size-cells = <0>;
4040
interrupts = <32>;
4141
clock-frequency = <100000>;
42+
clocks = <&gate_clk 7>;
4243
status = "disabled";
4344
};
4445
};

‎arch/arm/boot/dts/kirkwood-topkick.dts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,21 @@
8282
gpios = <&gpio1 16 1>;
8383
};
8484
};
85+
regulators {
86+
compatible = "simple-bus";
87+
#address-cells = <1>;
88+
#size-cells = <0>;
89+
90+
sata0_power: regulator@1 {
91+
compatible = "regulator-fixed";
92+
reg = <1>;
93+
regulator-name = "SATA0 Power";
94+
regulator-min-microvolt = <5000000>;
95+
regulator-max-microvolt = <5000000>;
96+
enable-active-high;
97+
regulator-always-on;
98+
regulator-boot-on;
99+
gpio = <&gpio1 4 0>;
100+
};
101+
};
85102
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
compatible = "marvell,orion-ehci";
145145
reg = <0x50000 0x1000>;
146146
interrupts = <19>;
147+
clocks = <&gate_clk 3>;
147148
status = "okay";
148149
};
149150

‎arch/arm/configs/mvebu_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ CONFIG_MVNETA=y
3333
CONFIG_MARVELL_PHY=y
3434
CONFIG_SERIAL_8250=y
3535
CONFIG_SERIAL_8250_CONSOLE=y
36-
CONFIG_SERIAL_OF_PLATFORM=y
37-
CONFIG_I2C=y
38-
CONFIG_I2C_MV64XXX=y
36+
CONFIG_SERIAL_8250_DW=y
3937
CONFIG_GPIOLIB=y
4038
CONFIG_GPIO_SYSFS=y
4139
# CONFIG_USB_SUPPORT is not set

0 commit comments

Comments
 (0)