Skip to content

Commit c64410f

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: "There is a small backlog of at91 patches here, the most significant is the addition of some sama5d2 Xplained nodes that were waiting on an MFD include file to get merged through another tree. We normally try to sort those out before the merge window opens, but the maintainer wasn't aware of that here and I decided to merge the changes this time as an exception. On OMAP a series of audio changes for dra7 missed the merge window but turned out to be necessary to fix a boot time imprecise external abort error and to get audio working. The other changes are the usual simple changes, here is a list sorted by platform: at91: removal of a useless defconfig option removal of some legacy DT pieces use of the proper watchdog compatible string update of the MAINTAINERS entries for some Atmel drivers drivers/scpi: hide get_scpi_ops in module from built-in code imx: add missing .irq_set_type for i.MX GPC irq_chip. fix the wrong spi-num-chipselects settings for Vybrid DSPI devices. fix a merge error in Vybrid dts regarding to ADC device property keystone: fix the optional PDSP firmware loading fix linking RAM setup for QMs fix crash with clk_ignore_unused mediatek: Enable SCPSYS power domain driver by default mvebu: fix QNAP TS219 power-off in dts fix legacy get_irqnr_and_base for dove and orion5x omap: fix l4 related boot time errors for dm81xx use lockless cldm/pwrdm api in omap4_boot_secondary remove t410 abort handler to avoid hiding other critical errors mark cpuidle tracepoints as _rcuidle fix module alias for omap-ocp2scp pxa: palm: Fix typos in PWM lookup table code renesas: missing __initconst annotation for r8a7793_boards_compat_dt rockchip: disable mmc-tuning on the veyron-minnie board adding the init state for the over-temperature-protection zx: only build power domain code when CONFIG_PM=y" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits) ARM: OMAP4+: SMP: use lockless clkdm/pwrdm api in omap4_boot_secondary arm: omap2+: add missing HWMOD_NO_IDLEST in 81xx hwmod data ARM: orion5x: Fix legacy get_irqnr_and_base ARM: dove: Fix legacy get_irqnr_and_base soc: Mediatek: Enable SCPSYS power domain driver by default ARM: dts: vfxxx: Fix dspi[01] spi-num-chipselects. ARM: dts: keystone: k2l: fix kernel crash when clk_ignore_unused is not in bootargs soc: ti: knav_qmss_queue: Fix linking RAM setup for queue managers soc: ti: use request_firmware_direct() as acc firmware is optional ARM: imx: add platform irq type setting in gpc ARM: dts: vfxxx: Fix erroneous property in esdhc0 node ARM: shmobile: r8a7793: proper constness with __initconst scpi: hide get_scpi_ops in module from built-in code ARM: zx: only build power domain code when CONFIG_PM=y ARM: pxa: palm: Fix typos in PWM lookup table code ARM: dts: Kirkwood: Fix QNAP TS219 power-off ARM: dts: rockchip: Add OTP gpio pinctrl to rk3288 tsadc node ARM: dts: rockchip: temporarily remove emmc hs200 speed from rk3288 minnie MAINTAINERS: Atmel drivers: change NAND and ISI entries ARM: at91/dt: sama5d2 Xplained: add several devices ...
2 parents a3b11c7 + a405fd1 commit c64410f

Some content is hidden

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

50 files changed

+280
-254
lines changed

‎Documentation/arm/keystone/Overview.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,6 @@ specified through DTS. Following are the DTS used:-
4949
The device tree documentation for the keystone machines are located at
5050
Documentation/devicetree/bindings/arm/keystone/keystone.txt
5151

52-
Known issues & workaround
53-
-------------------------
54-
55-
Some of the device drivers used on keystone are re-used from that from
56-
DaVinci and other TI SoCs. These device drivers may use clock APIs directly.
57-
Some of the keystone specific drivers such as netcp uses run time power
58-
management API instead to enable clock. As this API has limitations on
59-
keystone, following workaround is needed to boot Linux.
60-
61-
Add 'clk_ignore_unused' to the bootargs env variable in u-boot. Otherwise
62-
clock frameworks will try to disable clocks that are unused and disable
63-
the hardware. This is because netcp related power domain and clock
64-
domains are enabled in u-boot as run time power management API currently
65-
doesn't enable clocks for netcp due to a limitation. This workaround is
66-
expected to be removed in the future when proper API support becomes
67-
available. Until then, this work around is needed.
68-
69-
7052
Document Author
7153
---------------
7254
Murali Karicheri <m-karicheri2@ti.com>

‎MAINTAINERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,7 +1931,7 @@ S: Supported
19311931
F: drivers/i2c/busses/i2c-at91.c
19321932

19331933
ATMEL ISI DRIVER
1934-
M: Josh Wu <josh.wu@atmel.com>
1934+
M: Ludovic Desroches <ludovic.desroches@atmel.com>
19351935
L: linux-media@vger.kernel.org
19361936
S: Supported
19371937
F: drivers/media/platform/soc_camera/atmel-isi.c
@@ -1950,7 +1950,8 @@ S: Supported
19501950
F: drivers/net/ethernet/cadence/
19511951

19521952
ATMEL NAND DRIVER
1953-
M: Josh Wu <josh.wu@atmel.com>
1953+
M: Wenyou Yang <wenyou.yang@atmel.com>
1954+
M: Josh Wu <rainyfeeling@outlook.com>
19541955
L: linux-mtd@lists.infradead.org
19551956
S: Supported
19561957
F: drivers/mtd/nand/atmel_nand*

‎arch/arm/boot/dts/animeo_ip.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,21 @@
155155
label = "keyswitch_in";
156156
gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
157157
linux,code = <28>;
158-
gpio-key,wakeup;
158+
wakeup-source;
159159
};
160160

161161
error_in {
162162
label = "error_in";
163163
gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
164164
linux,code = <29>;
165-
gpio-key,wakeup;
165+
wakeup-source;
166166
};
167167

168168
btn {
169169
label = "btn";
170170
gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
171171
linux,code = <31>;
172-
gpio-key,wakeup;
172+
wakeup-source;
173173
};
174174
};
175175
};

‎arch/arm/boot/dts/at91-foxg20.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
label = "Button";
160160
gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
161161
linux,code = <0x103>;
162-
gpio-key,wakeup;
162+
wakeup-source;
163163
};
164164
};
165165
};

‎arch/arm/boot/dts/at91-kizbox.dts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@
2424
};
2525

2626
clocks {
27-
#address-cells = <1>;
28-
#size-cells = <1>;
29-
ranges;
30-
31-
main_clock: clock@0 {
32-
compatible = "atmel,osc", "fixed-clock";
33-
clock-frequency = <18432000>;
34-
};
35-
3627
main_xtal {
3728
clock-frequency = <18432000>;
3829
};
@@ -94,14 +85,14 @@
9485
label = "PB_RST";
9586
gpios = <&pioB 30 GPIO_ACTIVE_HIGH>;
9687
linux,code = <0x100>;
97-
gpio-key,wakeup;
88+
wakeup-source;
9889
};
9990

10091
user {
10192
label = "PB_USER";
10293
gpios = <&pioB 31 GPIO_ACTIVE_HIGH>;
10394
linux,code = <0x101>;
104-
gpio-key,wakeup;
95+
wakeup-source;
10596
};
10697
};
10798

‎arch/arm/boot/dts/at91-kizbox2.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,21 +171,21 @@
171171
label = "PB_PROG";
172172
gpios = <&pioE 27 GPIO_ACTIVE_LOW>;
173173
linux,code = <0x102>;
174-
gpio-key,wakeup;
174+
wakeup-source;
175175
};
176176

177177
reset {
178178
label = "PB_RST";
179179
gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
180180
linux,code = <0x100>;
181-
gpio-key,wakeup;
181+
wakeup-source;
182182
};
183183

184184
user {
185185
label = "PB_USER";
186186
gpios = <&pioE 31 GPIO_ACTIVE_HIGH>;
187187
linux,code = <0x101>;
188-
gpio-key,wakeup;
188+
wakeup-source;
189189
};
190190
};
191191

‎arch/arm/boot/dts/at91-kizboxmini.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@
9898
label = "PB_PROG";
9999
gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
100100
linux,code = <0x102>;
101-
gpio-key,wakeup;
101+
wakeup-source;
102102
};
103103

104104
reset {
105105
label = "PB_RST";
106106
gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
107107
linux,code = <0x100>;
108-
gpio-key,wakeup;
108+
wakeup-source;
109109
};
110110
};
111111

‎arch/arm/boot/dts/at91-qil_a9260.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
label = "user_pb";
184184
gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
185185
linux,code = <28>;
186-
gpio-key,wakeup;
186+
wakeup-source;
187187
};
188188
};
189189

‎arch/arm/boot/dts/at91-sama5d2_xplained.dts

Lines changed: 106 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
/dts-v1/;
4646
#include "sama5d2.dtsi"
4747
#include "sama5d2-pinfunc.h"
48+
#include <dt-bindings/mfd/atmel-flexcom.h>
4849

4950
/ {
5051
model = "Atmel SAMA5D2 Xplained";
@@ -59,15 +60,6 @@
5960
};
6061

6162
clocks {
62-
#address-cells = <1>;
63-
#size-cells = <1>;
64-
ranges;
65-
66-
main_clock: clock@0 {
67-
compatible = "atmel,osc", "fixed-clock";
68-
clock-frequency = <12000000>;
69-
};
70-
7163
slow_xtal {
7264
clock-frequency = <32768>;
7365
};
@@ -91,6 +83,22 @@
9183
status = "okay";
9284
};
9385

86+
sdmmc0: sdio-host@a0000000 {
87+
bus-width = <8>;
88+
pinctrl-names = "default";
89+
pinctrl-0 = <&pinctrl_sdmmc0_default>;
90+
non-removable;
91+
mmc-ddr-1_8v;
92+
status = "okay";
93+
};
94+
95+
sdmmc1: sdio-host@b0000000 {
96+
bus-width = <4>;
97+
pinctrl-names = "default";
98+
pinctrl-0 = <&pinctrl_sdmmc1_default>;
99+
status = "okay"; /* conflict with qspi0 */
100+
};
101+
94102
apb {
95103
spi0: spi@f8000000 {
96104
pinctrl-names = "default";
@@ -181,12 +189,49 @@
181189
};
182190
};
183191

192+
flx0: flexcom@f8034000 {
193+
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
194+
status = "disabled"; /* conflict with ISC_D2 & ISC_D3 data pins */
195+
196+
uart5: serial@200 {
197+
compatible = "atmel,at91sam9260-usart";
198+
reg = <0x200 0x200>;
199+
interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
200+
clocks = <&flx0_clk>;
201+
clock-names = "usart";
202+
pinctrl-names = "default";
203+
pinctrl-0 = <&pinctrl_flx0_default>;
204+
atmel,fifo-size = <32>;
205+
status = "okay";
206+
};
207+
};
208+
184209
uart3: serial@fc008000 {
185210
pinctrl-names = "default";
186211
pinctrl-0 = <&pinctrl_uart3_default>;
187212
status = "okay";
188213
};
189214

215+
flx4: flexcom@fc018000 {
216+
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
217+
status = "okay";
218+
219+
i2c2: i2c@600 {
220+
compatible = "atmel,sama5d2-i2c";
221+
reg = <0x600 0x200>;
222+
interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
223+
dmas = <0>, <0>;
224+
dma-names = "tx", "rx";
225+
#address-cells = <1>;
226+
#size-cells = <0>;
227+
clocks = <&flx4_clk>;
228+
pinctrl-names = "default";
229+
pinctrl-0 = <&pinctrl_flx4_default>;
230+
atmel,fifo-size = <16>;
231+
status = "okay";
232+
};
233+
};
234+
190235
i2c1: i2c@fc028000 {
191236
dmas = <0>, <0>;
192237
pinctrl-names = "default";
@@ -201,6 +246,18 @@
201246
};
202247

203248
pinctrl@fc038000 {
249+
pinctrl_flx0_default: flx0_default {
250+
pinmux = <PIN_PB28__FLEXCOM0_IO0>,
251+
<PIN_PB29__FLEXCOM0_IO1>;
252+
bias-disable;
253+
};
254+
255+
pinctrl_flx4_default: flx4_default {
256+
pinmux = <PIN_PD12__FLEXCOM4_IO0>,
257+
<PIN_PD13__FLEXCOM4_IO1>;
258+
bias-disable;
259+
};
260+
204261
pinctrl_i2c0_default: i2c0_default {
205262
pinmux = <PIN_PD21__TWD0>,
206263
<PIN_PD22__TWCK0>;
@@ -227,6 +284,46 @@
227284
bias-disable;
228285
};
229286

287+
pinctrl_sdmmc0_default: sdmmc0_default {
288+
cmd_data {
289+
pinmux = <PIN_PA1__SDMMC0_CMD>,
290+
<PIN_PA2__SDMMC0_DAT0>,
291+
<PIN_PA3__SDMMC0_DAT1>,
292+
<PIN_PA4__SDMMC0_DAT2>,
293+
<PIN_PA5__SDMMC0_DAT3>,
294+
<PIN_PA6__SDMMC0_DAT4>,
295+
<PIN_PA7__SDMMC0_DAT5>,
296+
<PIN_PA8__SDMMC0_DAT6>,
297+
<PIN_PA9__SDMMC0_DAT7>;
298+
bias-pull-up;
299+
};
300+
301+
ck_cd_rstn_vddsel {
302+
pinmux = <PIN_PA0__SDMMC0_CK>,
303+
<PIN_PA10__SDMMC0_RSTN>,
304+
<PIN_PA11__SDMMC0_VDDSEL>,
305+
<PIN_PA13__SDMMC0_CD>;
306+
bias-disable;
307+
};
308+
};
309+
310+
pinctrl_sdmmc1_default: sdmmc1_default {
311+
cmd_data {
312+
pinmux = <PIN_PA28__SDMMC1_CMD>,
313+
<PIN_PA18__SDMMC1_DAT0>,
314+
<PIN_PA19__SDMMC1_DAT1>,
315+
<PIN_PA20__SDMMC1_DAT2>,
316+
<PIN_PA21__SDMMC1_DAT3>;
317+
bias-pull-up;
318+
};
319+
320+
conf-ck_cd {
321+
pinmux = <PIN_PA22__SDMMC1_CK>,
322+
<PIN_PA30__SDMMC1_CD>;
323+
bias-disable;
324+
};
325+
};
326+
230327
pinctrl_spi0_default: spi0_default {
231328
pinmux = <PIN_PA14__SPI0_SPCK>,
232329
<PIN_PA15__SPI0_MOSI>,

‎arch/arm/boot/dts/at91-sama5d3_xplained.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
label = "PB_USER";
316316
gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
317317
linux,code = <0x104>;
318-
gpio-key,wakeup;
318+
wakeup-source;
319319
};
320320
};
321321

‎arch/arm/boot/dts/at91-sama5d4_xplained.dts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5";
5151

5252
chosen {
53-
bootargs = "ignore_loglevel earlyprintk";
5453
stdout-path = "serial0:115200n8";
5554
};
5655

@@ -59,15 +58,6 @@
5958
};
6059

6160
clocks {
62-
#address-cells = <1>;
63-
#size-cells = <1>;
64-
ranges;
65-
66-
main_clock: clock@0 {
67-
compatible = "atmel,osc", "fixed-clock";
68-
clock-frequency = <12000000>;
69-
};
70-
7161
slow_xtal {
7262
clock-frequency = <32768>;
7363
};
@@ -235,7 +225,7 @@
235225
label = "pb_user1";
236226
gpios = <&pioE 8 GPIO_ACTIVE_HIGH>;
237227
linux,code = <0x100>;
238-
gpio-key,wakeup;
228+
wakeup-source;
239229
};
240230
};
241231

‎arch/arm/boot/dts/at91-sama5d4ek.dts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5";
5151

5252
chosen {
53-
bootargs = "ignore_loglevel earlyprintk";
5453
stdout-path = "serial0:115200n8";
5554
};
5655

@@ -59,15 +58,6 @@
5958
};
6059

6160
clocks {
62-
#address-cells = <1>;
63-
#size-cells = <1>;
64-
ranges;
65-
66-
main_clock: clock@0 {
67-
compatible = "atmel,osc", "fixed-clock";
68-
clock-frequency = <12000000>;
69-
};
70-
7161
slow_xtal {
7262
clock-frequency = <32768>;
7363
};
@@ -304,7 +294,7 @@
304294
label = "pb_user1";
305295
gpios = <&pioE 13 GPIO_ACTIVE_HIGH>;
306296
linux,code = <0x100>;
307-
gpio-key,wakeup;
297+
wakeup-source;
308298
};
309299
};
310300

0 commit comments

Comments
 (0)