Skip to content

Commit d849122

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Olof Johansson: "A collection of fixes from the last few weeks. Most of them are smaller tweaks and fixes to DT and hardware descriptions for boards. Some of the more significant ones are: - eMMC and RGMII stability tweaks for rk3288 - DDC fixes for Rock PI 4 - Audio fixes for two TI am335x eval boards - D_CAN clock fix for am335x - Compilation fixes for clang - !HOTPLUG_CPU compilation fix for one of the new platforms this release (milbeaut) - A revert of a gpio fix for nomadik that instead was fixed in the gpio subsystem - Whitespace fix for the DT JSON schema (no tabs allowed)" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (25 commits) ARM: milbeaut: fix build with !CONFIG_HOTPLUG_CPU ARM: iop: don't use using 64-bit DMA masks ARM: orion: don't use using 64-bit DMA masks Revert "ARM: dts: nomadik: Fix polarity of SPI CS" dt-bindings: cpu: Fix JSON schema arm/mach-at91/pm : fix possible object reference leak ARM: dts: at91: Fix typo in ISC_D0 on PC9 ARM: dts: Fix dcan clkctrl clock for am3 reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets ARM: dts: rockchip: Remove #address/#size-cells from rk3288-veyron gpio-keys ARM: dts: rockchip: Remove #address/#size-cells from rk3288 mipi_dsi ARM: dts: rockchip: Fix gpu opp node names for rk3288 ARM: dts: am335x-evmsk: Correct the regulators for the audio codec ARM: dts: am335x-evm: Correct the regulators for the audio codec ARM: OMAP2+: add missing of_node_put after of_device_is_available ARM: OMAP1: ams-delta: Fix broken GPIO ID allocation arm64: dts: stratix10: add the sysmgr-syscon property from the gmac's arm64: dts: rockchip: fix rk3328 sdmmc0 write errors arm64: dts: rockchip: fix rk3328 rgmii high tx error rate ...
2 parents 429fba1 + 9a8f320 commit d849122

File tree

24 files changed

+131
-82
lines changed

24 files changed

+131
-82
lines changed

‎Documentation/devicetree/bindings/arm/cpus.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ patternProperties:
228228
- renesas,r9a06g032-smp
229229
- rockchip,rk3036-smp
230230
- rockchip,rk3066-smp
231-
- socionext,milbeaut-m10v-smp
231+
- socionext,milbeaut-m10v-smp
232232
- ste,dbx500-smp
233233

234234
cpu-release-addr:

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

+22-4
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,24 @@
5757
enable-active-high;
5858
};
5959

60+
/* TPS79501 */
61+
v1_8d_reg: fixedregulator-v1_8d {
62+
compatible = "regulator-fixed";
63+
regulator-name = "v1_8d";
64+
vin-supply = <&vbat>;
65+
regulator-min-microvolt = <1800000>;
66+
regulator-max-microvolt = <1800000>;
67+
};
68+
69+
/* TPS79501 */
70+
v3_3d_reg: fixedregulator-v3_3d {
71+
compatible = "regulator-fixed";
72+
regulator-name = "v3_3d";
73+
vin-supply = <&vbat>;
74+
regulator-min-microvolt = <3300000>;
75+
regulator-max-microvolt = <3300000>;
76+
};
77+
6078
matrix_keypad: matrix_keypad0 {
6179
compatible = "gpio-matrix-keypad";
6280
debounce-delay-ms = <5>;
@@ -499,10 +517,10 @@
499517
status = "okay";
500518

501519
/* Regulators */
502-
AVDD-supply = <&vaux2_reg>;
503-
IOVDD-supply = <&vaux2_reg>;
504-
DRVDD-supply = <&vaux2_reg>;
505-
DVDD-supply = <&vbat>;
520+
AVDD-supply = <&v3_3d_reg>;
521+
IOVDD-supply = <&v3_3d_reg>;
522+
DRVDD-supply = <&v3_3d_reg>;
523+
DVDD-supply = <&v1_8d_reg>;
506524
};
507525
};
508526

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

+22-4
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,24 @@
7373
enable-active-high;
7474
};
7575

76+
/* TPS79518 */
77+
v1_8d_reg: fixedregulator-v1_8d {
78+
compatible = "regulator-fixed";
79+
regulator-name = "v1_8d";
80+
vin-supply = <&vbat>;
81+
regulator-min-microvolt = <1800000>;
82+
regulator-max-microvolt = <1800000>;
83+
};
84+
85+
/* TPS78633 */
86+
v3_3d_reg: fixedregulator-v3_3d {
87+
compatible = "regulator-fixed";
88+
regulator-name = "v3_3d";
89+
vin-supply = <&vbat>;
90+
regulator-min-microvolt = <3300000>;
91+
regulator-max-microvolt = <3300000>;
92+
};
93+
7694
leds {
7795
pinctrl-names = "default";
7896
pinctrl-0 = <&user_leds_s0>;
@@ -501,10 +519,10 @@
501519
status = "okay";
502520

503521
/* Regulators */
504-
AVDD-supply = <&vaux2_reg>;
505-
IOVDD-supply = <&vaux2_reg>;
506-
DRVDD-supply = <&vaux2_reg>;
507-
DVDD-supply = <&vbat>;
522+
AVDD-supply = <&v3_3d_reg>;
523+
IOVDD-supply = <&v3_3d_reg>;
524+
DRVDD-supply = <&v3_3d_reg>;
525+
DVDD-supply = <&v1_8d_reg>;
508526
};
509527
};
510528

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1762,7 +1762,7 @@
17621762
reg = <0xcc000 0x4>;
17631763
reg-names = "rev";
17641764
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
1765-
clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>;
1765+
clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>;
17661766
clock-names = "fck";
17671767
#address-cells = <1>;
17681768
#size-cells = <1>;
@@ -1785,7 +1785,7 @@
17851785
reg = <0xd0000 0x4>;
17861786
reg-names = "rev";
17871787
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
1788-
clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>;
1788+
clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>;
17891789
clock-names = "fck";
17901790
#address-cells = <1>;
17911791
#size-cells = <1>;

‎arch/arm/boot/dts/rk3288-tinker.dtsi

+2-1
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
};
255255

256256
vccio_sd: LDO_REG5 {
257+
regulator-boot-on;
257258
regulator-min-microvolt = <1800000>;
258259
regulator-max-microvolt = <3300000>;
259260
regulator-name = "vccio_sd";
@@ -430,7 +431,7 @@
430431
bus-width = <4>;
431432
cap-mmc-highspeed;
432433
cap-sd-highspeed;
433-
card-detect-delay = <200>;
434+
broken-cd;
434435
disable-wp; /* wp not hooked up */
435436
pinctrl-names = "default";
436437
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;

‎arch/arm/boot/dts/rk3288-veyron.dtsi

-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525

2626
gpio_keys: gpio-keys {
2727
compatible = "gpio-keys";
28-
#address-cells = <1>;
29-
#size-cells = <0>;
3028

3129
pinctrl-names = "default";
3230
pinctrl-0 = <&pwr_key_l>;

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

+9-11
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
compatible = "arm,cortex-a12";
7171
reg = <0x501>;
7272
resets = <&cru SRST_CORE1>;
73-
operating-points = <&cpu_opp_table>;
73+
operating-points-v2 = <&cpu_opp_table>;
7474
#cooling-cells = <2>; /* min followed by max */
7575
clock-latency = <40000>;
7676
clocks = <&cru ARMCLK>;
@@ -80,7 +80,7 @@
8080
compatible = "arm,cortex-a12";
8181
reg = <0x502>;
8282
resets = <&cru SRST_CORE2>;
83-
operating-points = <&cpu_opp_table>;
83+
operating-points-v2 = <&cpu_opp_table>;
8484
#cooling-cells = <2>; /* min followed by max */
8585
clock-latency = <40000>;
8686
clocks = <&cru ARMCLK>;
@@ -90,7 +90,7 @@
9090
compatible = "arm,cortex-a12";
9191
reg = <0x503>;
9292
resets = <&cru SRST_CORE3>;
93-
operating-points = <&cpu_opp_table>;
93+
operating-points-v2 = <&cpu_opp_table>;
9494
#cooling-cells = <2>; /* min followed by max */
9595
clock-latency = <40000>;
9696
clocks = <&cru ARMCLK>;
@@ -1119,8 +1119,6 @@
11191119
clock-names = "ref", "pclk";
11201120
power-domains = <&power RK3288_PD_VIO>;
11211121
rockchip,grf = <&grf>;
1122-
#address-cells = <1>;
1123-
#size-cells = <0>;
11241122
status = "disabled";
11251123

11261124
ports {
@@ -1282,27 +1280,27 @@
12821280
gpu_opp_table: gpu-opp-table {
12831281
compatible = "operating-points-v2";
12841282

1285-
opp@100000000 {
1283+
opp-100000000 {
12861284
opp-hz = /bits/ 64 <100000000>;
12871285
opp-microvolt = <950000>;
12881286
};
1289-
opp@200000000 {
1287+
opp-200000000 {
12901288
opp-hz = /bits/ 64 <200000000>;
12911289
opp-microvolt = <950000>;
12921290
};
1293-
opp@300000000 {
1291+
opp-300000000 {
12941292
opp-hz = /bits/ 64 <300000000>;
12951293
opp-microvolt = <1000000>;
12961294
};
1297-
opp@400000000 {
1295+
opp-400000000 {
12981296
opp-hz = /bits/ 64 <400000000>;
12991297
opp-microvolt = <1100000>;
13001298
};
1301-
opp@500000000 {
1299+
opp-500000000 {
13021300
opp-hz = /bits/ 64 <500000000>;
13031301
opp-microvolt = <1200000>;
13041302
};
1305-
opp@600000000 {
1303+
opp-600000000 {
13061304
opp-hz = /bits/ 64 <600000000>;
13071305
opp-microvolt = <1250000>;
13081306
};

‎arch/arm/boot/dts/sama5d2-pinfunc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@
518518
#define PIN_PC9__GPIO PINMUX_PIN(PIN_PC9, 0, 0)
519519
#define PIN_PC9__FIQ PINMUX_PIN(PIN_PC9, 1, 3)
520520
#define PIN_PC9__GTSUCOMP PINMUX_PIN(PIN_PC9, 2, 1)
521-
#define PIN_PC9__ISC_D0 PINMUX_PIN(PIN_PC9, 2, 1)
521+
#define PIN_PC9__ISC_D0 PINMUX_PIN(PIN_PC9, 3, 1)
522522
#define PIN_PC9__TIOA4 PINMUX_PIN(PIN_PC9, 4, 2)
523523
#define PIN_PC10 74
524524
#define PIN_PC10__GPIO PINMUX_PIN(PIN_PC10, 0, 0)

‎arch/arm/boot/dts/ste-nomadik-nhk15.dts

+4-5
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,12 @@
213213
gpio-sck = <&gpio0 5 GPIO_ACTIVE_HIGH>;
214214
gpio-mosi = <&gpio0 4 GPIO_ACTIVE_HIGH>;
215215
/*
216-
* This chipselect is active high. Just setting the flags
217-
* to GPIO_ACTIVE_HIGH is not enough for the SPI DT bindings,
218-
* it will be ignored, only the special "spi-cs-high" flag
219-
* really counts.
216+
* It's not actually active high, but the frameworks assume
217+
* the polarity of the passed-in GPIO is "normal" (active
218+
* high) then actively drives the line low to select the
219+
* chip.
220220
*/
221221
cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
222-
spi-cs-high;
223222
num-chipselects = <1>;
224223

225224
/*

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void)
591591

592592
np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");
593593
if (!np)
594-
goto securam_fail;
594+
goto securam_fail_no_ref_dev;
595595

596596
pdev = of_find_device_by_node(np);
597597
of_node_put(np);
598598
if (!pdev) {
599599
pr_warn("%s: failed to find securam device!\n", __func__);
600-
goto securam_fail;
600+
goto securam_fail_no_ref_dev;
601601
}
602602

603603
sram_pool = gen_pool_get(&pdev->dev, NULL);
@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)
620620
return 0;
621621

622622
securam_fail:
623+
put_device(&pdev->dev);
624+
securam_fail_no_ref_dev:
623625
iounmap(pm_data.sfrbu);
624626
pm_data.sfrbu = NULL;
625627
return ret;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = {
300300
}
301301
};
302302

303-
static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);
303+
static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(32);
304304
static struct iop_adma_platform_data iop13xx_adma_0_data = {
305305
.hw_id = 0,
306306
.pool_size = PAGE_SIZE,
@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = {
324324
.resource = iop13xx_adma_0_resources,
325325
.dev = {
326326
.dma_mask = &iop13xx_adma_dmamask,
327-
.coherent_dma_mask = DMA_BIT_MASK(64),
327+
.coherent_dma_mask = DMA_BIT_MASK(32),
328328
.platform_data = (void *) &iop13xx_adma_0_data,
329329
},
330330
};
@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = {
336336
.resource = iop13xx_adma_1_resources,
337337
.dev = {
338338
.dma_mask = &iop13xx_adma_dmamask,
339-
.coherent_dma_mask = DMA_BIT_MASK(64),
339+
.coherent_dma_mask = DMA_BIT_MASK(32),
340340
.platform_data = (void *) &iop13xx_adma_1_data,
341341
},
342342
};
@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = {
348348
.resource = iop13xx_adma_2_resources,
349349
.dev = {
350350
.dma_mask = &iop13xx_adma_dmamask,
351-
.coherent_dma_mask = DMA_BIT_MASK(64),
351+
.coherent_dma_mask = DMA_BIT_MASK(32),
352352
.platform_data = (void *) &iop13xx_adma_2_data,
353353
},
354354
};

‎arch/arm/mach-iop13xx/tpmi.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ static struct resource iop13xx_tpmi_3_resources[] = {
152152
}
153153
};
154154

155-
u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64);
155+
u64 iop13xx_tpmi_mask = DMA_BIT_MASK(32);
156156
static struct platform_device iop13xx_tpmi_0_device = {
157157
.name = "iop-tpmi",
158158
.id = 0,
159159
.num_resources = ARRAY_SIZE(iop13xx_tpmi_0_resources),
160160
.resource = iop13xx_tpmi_0_resources,
161161
.dev = {
162162
.dma_mask = &iop13xx_tpmi_mask,
163-
.coherent_dma_mask = DMA_BIT_MASK(64),
163+
.coherent_dma_mask = DMA_BIT_MASK(32),
164164
},
165165
};
166166

@@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = {
171171
.resource = iop13xx_tpmi_1_resources,
172172
.dev = {
173173
.dma_mask = &iop13xx_tpmi_mask,
174-
.coherent_dma_mask = DMA_BIT_MASK(64),
174+
.coherent_dma_mask = DMA_BIT_MASK(32),
175175
},
176176
};
177177

@@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = {
182182
.resource = iop13xx_tpmi_2_resources,
183183
.dev = {
184184
.dma_mask = &iop13xx_tpmi_mask,
185-
.coherent_dma_mask = DMA_BIT_MASK(64),
185+
.coherent_dma_mask = DMA_BIT_MASK(32),
186186
},
187187
};
188188

@@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = {
193193
.resource = iop13xx_tpmi_3_resources,
194194
.dev = {
195195
.dma_mask = &iop13xx_tpmi_mask,
196-
.coherent_dma_mask = DMA_BIT_MASK(64),
196+
.coherent_dma_mask = DMA_BIT_MASK(32),
197197
},
198198
};
199199

‎arch/arm/mach-milbeaut/platsmp.c

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ static void m10v_smp_init(unsigned int max_cpus)
6565
writel(KERNEL_UNBOOT_FLAG, m10v_smp_base + cpu * 4);
6666
}
6767

68+
#ifdef CONFIG_HOTPLUG_CPU
6869
static void m10v_cpu_die(unsigned int l_cpu)
6970
{
7071
gic_cpu_if_down(0);
@@ -83,12 +84,15 @@ static int m10v_cpu_kill(unsigned int l_cpu)
8384

8485
return 1;
8586
}
87+
#endif
8688

8789
static struct smp_operations m10v_smp_ops __initdata = {
8890
.smp_prepare_cpus = m10v_smp_init,
8991
.smp_boot_secondary = m10v_boot_secondary,
92+
#ifdef CONFIG_HOTPLUG_CPU
9093
.cpu_die = m10v_cpu_die,
9194
.cpu_kill = m10v_cpu_kill,
95+
#endif
9296
};
9397
CPU_METHOD_OF_DECLARE(m10v_smp, "socionext,milbeaut-m10v-smp", &m10v_smp_ops);
9498

‎arch/arm/mach-omap1/board-ams-delta.c

+2
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ static struct resource latch1_resources[] = {
182182

183183
static struct bgpio_pdata latch1_pdata = {
184184
.label = LATCH1_LABEL,
185+
.base = -1,
185186
.ngpio = LATCH1_NGPIO,
186187
};
187188

@@ -219,6 +220,7 @@ static struct resource latch2_resources[] = {
219220

220221
static struct bgpio_pdata latch2_pdata = {
221222
.label = LATCH2_LABEL,
223+
.base = -1,
222224
.ngpio = LATCH2_NGPIO,
223225
};
224226

‎arch/arm/mach-omap2/display.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,10 @@ static int __init omapdss_init_of(void)
250250
if (!node)
251251
return 0;
252252

253-
if (!of_device_is_available(node))
253+
if (!of_device_is_available(node)) {
254+
of_node_put(node);
254255
return 0;
256+
}
255257

256258
pdev = of_find_device_by_node(node);
257259

0 commit comments

Comments
 (0)