Skip to content

Commit 46c291e

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "This is a bit larger than normal, as we had not managed to send out a pull request before traveling for a week without my signing key. There are multiple code fixes for older bugs, all of which should get backported into stable kernels: - tango: one fix for multiplatform configurations broken on other platforms when tango is enabled - arm_scmi: device unregistration fix - iop32x: fix kernel oops from extraneous __init annotation - pxa: remove a double kfree - fsl qbman: close an interrupt clearing race The rest is the usual collection of smaller fixes for device tree files, on the renesas, allwinner, meson, omap, davinci, qualcomm and imx platforms. Some of these are for compile-time warnings, most are for board specific functionality that fails to work because of incorrect settings" * tag 'armsoc-fixes-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (30 commits) ARM: tango: Improve ARCH_MULTIPLATFORM compatibility firmware: arm_scmi: provide the mandatory device release callback ARM: iop32x/n2100: fix PCI IRQ mapping arm64: dts: add msm8996 compatible to gicv3 ARM: dts: am335x-shc.dts: fix wrong cd pin level ARM: dts: n900: fix mmc1 card detect gpio polarity ARM: dts: omap3-gta04: Fix graph_port warning ARM: pxa: ssp: unneeded to free devm_ allocated data ARM: dts: r8a7743: Convert to new LVDS DT bindings soc: fsl: qbman: avoid race in clearing QMan interrupt arm64: dts: renesas: r8a77965: Enable DMA for SCIF2 arm64: dts: renesas: r8a7796: Enable DMA for SCIF2 arm64: dts: renesas: r8a774a1: Enable DMA for SCIF2 ARM: dts: da850: fix interrupt numbers for clocksource dt-bindings: imx8mq: Number clocks consecutively arm64: dts: meson: Fix mmc cd-gpios polarity ARM: dts: imx6sx: correct backward compatible of gpt ARM: dts: imx: replace gpio-key,wakeup with wakeup-source property ARM: dts: vf610-bk4: fix incorrect #address-cells for dspi3 ARM: dts: meson8m2: mxiii-plus: mark the SD card detection GPIO active-low ...
2 parents 5bb513e + d0f9f16 commit 46c291e

Some content is hidden

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

46 files changed

+136
-102
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
pinctrl-names = "default";
216216
pinctrl-0 = <&mmc1_pins>;
217217
bus-width = <0x4>;
218-
cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
218+
cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
219219
cd-inverted;
220220
max-frequency = <26000000>;
221221
vmmc-supply = <&vmmcsd_fixed>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@
476476
clocksource: timer@20000 {
477477
compatible = "ti,da830-timer";
478478
reg = <0x20000 0x1000>;
479-
interrupts = <12>, <13>;
479+
interrupts = <21>, <22>;
480480
interrupt-names = "tint12", "tint34";
481481
clocks = <&pll0_auxclk>;
482482
};

‎arch/arm/boot/dts/imx6q-pistachio.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
power {
104104
label = "Power Button";
105105
gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
106-
gpio-key,wakeup;
106+
wakeup-source;
107107
linux,code = <KEY_POWER>;
108108
};
109109
};

‎arch/arm/boot/dts/imx6sll-evk.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
310310
cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;
311311
keep-power-in-suspend;
312-
enable-sdio-wakeup;
312+
wakeup-source;
313313
vmmc-supply = <&reg_sd3_vmmc>;
314314
status = "okay";
315315
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@
467467
};
468468

469469
gpt: gpt@2098000 {
470-
compatible = "fsl,imx6sx-gpt", "fsl,imx31-gpt";
470+
compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
471471
reg = <0x02098000 0x4000>;
472472
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
473473
clocks = <&clks IMX6SX_CLK_GPT_BUS>,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
compatible = "amlogic,meson6-dwmac", "snps,dwmac";
275275
reg = <0xc9410000 0x10000
276276
0xc1108108 0x4>;
277-
interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
277+
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
278278
interrupt-names = "macirq";
279279
status = "disabled";
280280
};

‎arch/arm/boot/dts/meson8b-ec100.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@
205205
cap-sd-highspeed;
206206
disable-wp;
207207

208-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
209-
cd-inverted;
208+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
210209

211210
vmmc-supply = <&vcc_3v3>;
212211
};

‎arch/arm/boot/dts/meson8b-odroidc1.dts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@
221221
/* Realtek RTL8211F (0x001cc916) */
222222
eth_phy: ethernet-phy@0 {
223223
reg = <0>;
224-
eee-broken-1000t;
225224
interrupt-parent = <&gpio_intc>;
226225
/* GPIOH_3 */
227226
interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
@@ -273,8 +272,7 @@
273272
cap-sd-highspeed;
274273
disable-wp;
275274

276-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
277-
cd-inverted;
275+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
278276

279277
vmmc-supply = <&tflash_vdd>;
280278
vqmmc-supply = <&tf_io>;

‎arch/arm/boot/dts/meson8m2-mxiii-plus.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@
206206
cap-sd-highspeed;
207207
disable-wp;
208208

209-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
210-
cd-inverted;
209+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
211210

212211
vmmc-supply = <&vcc_3v3>;
213212
};

‎arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
interrupts-extended = <
106106
&cpcap 15 0 &cpcap 14 0 &cpcap 28 0 &cpcap 19 0
107107
&cpcap 18 0 &cpcap 17 0 &cpcap 16 0 &cpcap 49 0
108-
&cpcap 48 1
108+
&cpcap 48 0
109109
>;
110110
interrupt-names =
111111
"id_ground", "id_float", "se0conn", "vbusvld",

‎arch/arm/boot/dts/omap3-gta04.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,11 +714,7 @@
714714

715715
vdda-supply = <&vdac>;
716716

717-
#address-cells = <1>;
718-
#size-cells = <0>;
719-
720717
port {
721-
reg = <0>;
722718
venc_out: endpoint {
723719
remote-endpoint = <&opa_in>;
724720
ti,channels = <1>;

‎arch/arm/boot/dts/omap3-n900.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@
814814
/* For debugging, it is often good idea to remove this GPIO.
815815
It means you can remove back cover (to reboot by removing
816816
battery) and still use the MMC card. */
817-
cd-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>; /* 160 */
817+
cd-gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* 160 */
818818
};
819819

820820
/* most boards use vaux3, only some old versions use vmmc2 instead */

‎arch/arm/boot/dts/omap3-n950-n9.dtsi

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,19 @@
370370
compatible = "ti,omap2-onenand";
371371
reg = <0 0 0x20000>; /* CS0, offset 0, IO size 128K */
372372

373+
/*
374+
* These timings are based on CONFIG_OMAP_GPMC_DEBUG=y reported
375+
* bootloader set values when booted with v4.19 using both N950
376+
* and N9 devices (OneNAND Manufacturer: Samsung):
377+
*
378+
* gpmc cs0 before gpmc_cs_program_settings:
379+
* cs0 GPMC_CS_CONFIG1: 0xfd001202
380+
* cs0 GPMC_CS_CONFIG2: 0x00181800
381+
* cs0 GPMC_CS_CONFIG3: 0x00030300
382+
* cs0 GPMC_CS_CONFIG4: 0x18001804
383+
* cs0 GPMC_CS_CONFIG5: 0x03171d1d
384+
* cs0 GPMC_CS_CONFIG6: 0x97080000
385+
*/
373386
gpmc,sync-read;
374387
gpmc,sync-write;
375388
gpmc,burst-length = <16>;
@@ -379,26 +392,27 @@
379392
gpmc,device-width = <2>;
380393
gpmc,mux-add-data = <2>;
381394
gpmc,cs-on-ns = <0>;
382-
gpmc,cs-rd-off-ns = <87>;
383-
gpmc,cs-wr-off-ns = <87>;
395+
gpmc,cs-rd-off-ns = <122>;
396+
gpmc,cs-wr-off-ns = <122>;
384397
gpmc,adv-on-ns = <0>;
385-
gpmc,adv-rd-off-ns = <10>;
386-
gpmc,adv-wr-off-ns = <10>;
387-
gpmc,oe-on-ns = <15>;
388-
gpmc,oe-off-ns = <87>;
398+
gpmc,adv-rd-off-ns = <15>;
399+
gpmc,adv-wr-off-ns = <15>;
400+
gpmc,oe-on-ns = <20>;
401+
gpmc,oe-off-ns = <122>;
389402
gpmc,we-on-ns = <0>;
390-
gpmc,we-off-ns = <87>;
391-
gpmc,rd-cycle-ns = <112>;
392-
gpmc,wr-cycle-ns = <112>;
393-
gpmc,access-ns = <81>;
403+
gpmc,we-off-ns = <122>;
404+
gpmc,rd-cycle-ns = <148>;
405+
gpmc,wr-cycle-ns = <148>;
406+
gpmc,access-ns = <117>;
394407
gpmc,page-burst-access-ns = <15>;
395408
gpmc,bus-turnaround-ns = <0>;
396409
gpmc,cycle2cycle-delay-ns = <0>;
397410
gpmc,wait-monitoring-ns = <0>;
398-
gpmc,clk-activation-ns = <5>;
399-
gpmc,wr-data-mux-bus-ns = <30>;
400-
gpmc,wr-access-ns = <81>;
401-
gpmc,sync-clk-ps = <15000>;
411+
gpmc,clk-activation-ns = <10>;
412+
gpmc,wr-data-mux-bus-ns = <40>;
413+
gpmc,wr-access-ns = <117>;
414+
415+
gpmc,sync-clk-ps = <15000>; /* TBC; Where this value came? */
402416

403417
/*
404418
* MTD partition table corresponding to Nokia's MeeGo 1.2

‎arch/arm/boot/dts/omap5-l4.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,8 +1046,6 @@
10461046
<SYSC_IDLE_SMART>,
10471047
<SYSC_IDLE_SMART_WKUP>;
10481048
ti,syss-mask = <1>;
1049-
ti,no-reset-on-init;
1050-
ti,no-idle-on-init;
10511049
/* Domains (V, P, C): core, core_pwrdm, l4per_clkdm */
10521050
clocks = <&l4per_clkctrl OMAP5_UART3_CLKCTRL 0>;
10531051
clock-names = "fck";

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

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,15 +1681,12 @@
16811681

16821682
du: display@feb00000 {
16831683
compatible = "renesas,du-r8a7743";
1684-
reg = <0 0xfeb00000 0 0x40000>,
1685-
<0 0xfeb90000 0 0x1c>;
1686-
reg-names = "du", "lvds.0";
1684+
reg = <0 0xfeb00000 0 0x40000>;
16871685
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
16881686
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
16891687
clocks = <&cpg CPG_MOD 724>,
1690-
<&cpg CPG_MOD 723>,
1691-
<&cpg CPG_MOD 726>;
1692-
clock-names = "du.0", "du.1", "lvds.0";
1688+
<&cpg CPG_MOD 723>;
1689+
clock-names = "du.0", "du.1";
16931690
status = "disabled";
16941691

16951692
ports {
@@ -1704,6 +1701,33 @@
17041701
port@1 {
17051702
reg = <1>;
17061703
du_out_lvds0: endpoint {
1704+
remote-endpoint = <&lvds0_in>;
1705+
};
1706+
};
1707+
};
1708+
};
1709+
1710+
lvds0: lvds@feb90000 {
1711+
compatible = "renesas,r8a7743-lvds";
1712+
reg = <0 0xfeb90000 0 0x1c>;
1713+
clocks = <&cpg CPG_MOD 726>;
1714+
power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
1715+
resets = <&cpg 726>;
1716+
status = "disabled";
1717+
1718+
ports {
1719+
#address-cells = <1>;
1720+
#size-cells = <0>;
1721+
1722+
port@0 {
1723+
reg = <0>;
1724+
lvds0_in: endpoint {
1725+
remote-endpoint = <&du_out_lvds0>;
1726+
};
1727+
};
1728+
port@1 {
1729+
reg = <1>;
1730+
lvds0_out: endpoint {
17071731
};
17081732
};
17091733
};

‎arch/arm/boot/dts/sun6i-a31.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
#clock-cells = <0>;
217217
compatible = "fixed-clock";
218218
clock-frequency = <24000000>;
219+
clock-output-names = "osc24M";
219220
};
220221

221222
osc32k: clk-32k {

‎arch/arm/boot/dts/sun8i-h3-beelink-x2.dts

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

5454
aliases {
5555
serial0 = &uart0;
56-
/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
56+
ethernet0 = &emac;
5757
ethernet1 = &sdiowifi;
5858
};
5959

‎arch/arm/boot/dts/vf610-bk4.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@
110110
bus-num = <3>;
111111
status = "okay";
112112
spi-slave;
113+
#address-cells = <0>;
113114

114-
slave@0 {
115+
slave {
115116
compatible = "lwn,bk4";
116117
spi-max-frequency = <30000000>;
117-
reg = <0>;
118118
};
119119
};
120120

‎arch/arm/mach-iop32x/n2100.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ void __init n2100_map_io(void)
7575
/*
7676
* N2100 PCI.
7777
*/
78-
static int __init
79-
n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
78+
static int n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
8079
{
8180
int irq;
8281

‎arch/arm/mach-tango/pm.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <linux/suspend.h>
44
#include <asm/suspend.h>
55
#include "smc.h"
6+
#include "pm.h"
67

78
static int tango_pm_powerdown(unsigned long arg)
89
{
@@ -24,10 +25,7 @@ static const struct platform_suspend_ops tango_pm_ops = {
2425
.valid = suspend_valid_only_mem,
2526
};
2627

27-
static int __init tango_pm_init(void)
28+
void __init tango_pm_init(void)
2829
{
2930
suspend_set_ops(&tango_pm_ops);
30-
return 0;
3131
}
32-
33-
late_initcall(tango_pm_init);

‎arch/arm/mach-tango/pm.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
3+
#ifdef CONFIG_SUSPEND
4+
void __init tango_pm_init(void);
5+
#else
6+
#define tango_pm_init NULL
7+
#endif

‎arch/arm/mach-tango/setup.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <asm/mach/arch.h>
33
#include <asm/hardware/cache-l2x0.h>
44
#include "smc.h"
5+
#include "pm.h"
56

67
static void tango_l2c_write(unsigned long val, unsigned int reg)
78
{
@@ -15,4 +16,5 @@ DT_MACHINE_START(TANGO_DT, "Sigma Tango DT")
1516
.dt_compat = tango_dt_compat,
1617
.l2c_aux_mask = ~0,
1718
.l2c_write_sec = tango_l2c_write,
19+
.init_late = tango_pm_init,
1820
MACHINE_END

‎arch/arm/plat-pxa/ssp.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,6 @@ static int pxa_ssp_remove(struct platform_device *pdev)
190190
if (ssp == NULL)
191191
return -ENODEV;
192192

193-
iounmap(ssp->mmio_base);
194-
195193
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
196194
release_mem_region(res->start, resource_size(res));
197195

@@ -201,7 +199,6 @@ static int pxa_ssp_remove(struct platform_device *pdev)
201199
list_del(&ssp->node);
202200
mutex_unlock(&ssp_lock);
203201

204-
kfree(ssp);
205202
return 0;
206203
}
207204

‎arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
reg = <0x3a3>;
189189
interrupt-parent = <&r_intc>;
190190
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
191+
x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
191192
};
192193
};
193194

‎arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
};
391391

392392
video-codec@1c0e000 {
393-
compatible = "allwinner,sun50i-h5-video-engine";
393+
compatible = "allwinner,sun50i-a64-video-engine";
394394
reg = <0x01c0e000 0x1000>;
395395
clocks = <&ccu CLK_BUS_VE>, <&ccu CLK_VE>,
396396
<&ccu CLK_DRAM_VE>;

‎arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@
187187
max-frequency = <100000000>;
188188
disable-wp;
189189

190-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
191-
cd-inverted;
190+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
192191

193192
vmmc-supply = <&vddao_3v3>;
194193
vqmmc-supply = <&vddio_boot>;

‎arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@
305305
max-frequency = <200000000>;
306306
disable-wp;
307307

308-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
309-
cd-inverted;
308+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
310309

311310
vmmc-supply = <&vddio_ao3v3>;
312311
vqmmc-supply = <&vddio_tf>;

‎arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@
238238
max-frequency = <100000000>;
239239
disable-wp;
240240

241-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
242-
cd-inverted;
241+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
243242

244243
vmmc-supply = <&vddao_3v3>;
245244
vqmmc-supply = <&vddio_card>;

0 commit comments

Comments
 (0)