Skip to content

Commit 4486695

Browse files
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 set of fixes that have trickled in over the last couple of weeks: - MAINTAINER update for Cavium/Marvell ThunderX2 - stm32 tweaks to pinmux for Joystick/Camera, and RAM allocation for CAN interfaces - i.MX fixes for voltage regulator GPIO mappings, fixes voltage scaling issues - More i.MX fixes for various issues on i.MX eval boards: interrupt storm due to u-boot leaving pins in new states, fixing power button config, a couple of compatible-string corrections. - Powerdown and Suspend/Resume fixes for Allwinner A83-based tablets - A few documentation tweaks and a fix of a memory leak in the reset subsystem" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: MAINTAINERS: update Cavium ThunderX2 maintainers ARM: dts: stm32: change joystick pinctrl definition on stm32mp157c-ev1 ARM: dts: stm32: remove OV5640 pinctrl definition on stm32mp157c-ev1 ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157 arm64: dts: zii-ultra: fix ARM regulator GPIO handle ARM: sunxi: Fix CPU powerdown on A83T ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend arm64: dts: imx8mn: fix compatible string for sdma arm64: dts: imx8mm: fix compatible string for sdma reset: fix reset_control_ops kerneldoc comment ARM: dts: imx6-logicpd: Re-enable SNVS power key soc: imx: gpc: fix initialiser format ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts arm64: dts: ls1028a: fix a compatible issue reset: fix reset_control_get_exclusive kerneldoc comment reset: fix reset_control_lookup kerneldoc comment reset: fix of_reset_control_get_count kerneldoc comment reset: fix of_reset_simple_xlate kerneldoc comment reset: Fix memory leak in reset_control_array_put()
2 parents dd89262 + 002d3c6 commit 4486695

File tree

16 files changed

+44
-32
lines changed

16 files changed

+44
-32
lines changed

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ Jason Gunthorpe <[email protected]> <[email protected]>
108108
109109
110110
111+
112+
113+
114+
111115
Jean Tourrilhes <[email protected]>
112116
113117
Jeff Garzik <[email protected]>

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3738,7 +3738,6 @@ F: drivers/crypto/cavium/cpt/
37383738

37393739
CAVIUM THUNDERX2 ARM64 SOC
37403740
M: Robert Richter <[email protected]>
3741-
M: Jayachandran C <[email protected]>
37423741
L: [email protected] (moderated for non-subscribers)
37433742
S: Maintained
37443743
F: arch/arm64/boot/dts/cavium/thunder2-99xx*

arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,10 @@
328328
pinctrl-0 = <&pinctrl_pwm3>;
329329
};
330330

331+
&snvs_pwrkey {
332+
status = "okay";
333+
};
334+
331335
&ssi2 {
332336
status = "okay";
333337
};

arch/arm/boot/dts/imx6qdl-sabreauto.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@
230230
accelerometer@1c {
231231
compatible = "fsl,mma8451";
232232
reg = <0x1c>;
233+
pinctrl-names = "default";
234+
pinctrl-0 = <&pinctrl_mma8451_int>;
233235
interrupt-parent = <&gpio6>;
234236
interrupts = <31 IRQ_TYPE_LEVEL_LOW>;
235237
};
@@ -628,6 +630,12 @@
628630
>;
629631
};
630632

633+
pinctrl_mma8451_int: mma8451intgrp {
634+
fsl,pins = <
635+
MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0xb0b1
636+
>;
637+
};
638+
631639
pinctrl_pwm3: pwm1grp {
632640
fsl,pins = <
633641
MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1

arch/arm/boot/dts/stm32mp157c-ev1.dts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,12 @@
183183

184184
ov5640: camera@3c {
185185
compatible = "ovti,ov5640";
186-
pinctrl-names = "default";
187-
pinctrl-0 = <&ov5640_pins>;
188186
reg = <0x3c>;
189187
clocks = <&clk_ext_camera>;
190188
clock-names = "xclk";
191189
DOVDD-supply = <&v2v8>;
192-
powerdown-gpios = <&stmfx_pinctrl 18 GPIO_ACTIVE_HIGH>;
193-
reset-gpios = <&stmfx_pinctrl 19 GPIO_ACTIVE_LOW>;
190+
powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>;
191+
reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>;
194192
rotation = <180>;
195193
status = "okay";
196194

@@ -223,15 +221,8 @@
223221

224222
joystick_pins: joystick {
225223
pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4";
226-
drive-push-pull;
227224
bias-pull-down;
228225
};
229-
230-
ov5640_pins: camera {
231-
pins = "agpio2", "agpio3"; /* stmfx pins 18 & 19 */
232-
drive-push-pull;
233-
output-low;
234-
};
235226
};
236227
};
237228
};

arch/arm/boot/dts/stm32mp157c.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@
932932
interrupt-names = "int0", "int1";
933933
clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>;
934934
clock-names = "hclk", "cclk";
935-
bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>;
935+
bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>;
936936
status = "disabled";
937937
};
938938

@@ -945,7 +945,7 @@
945945
interrupt-names = "int0", "int1";
946946
clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>;
947947
clock-names = "hclk", "cclk";
948-
bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>;
948+
bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>;
949949
status = "disabled";
950950
};
951951

arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@
192192
vqmmc-supply = <&reg_dldo1>;
193193
non-removable;
194194
wakeup-source;
195+
keep-power-in-suspend;
195196
status = "okay";
196197

197198
brcmf: wifi@1 {

arch/arm/mach-sunxi/mc_smp.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,14 +481,18 @@ static void sunxi_mc_smp_cpu_die(unsigned int l_cpu)
481481
static int sunxi_cpu_powerdown(unsigned int cpu, unsigned int cluster)
482482
{
483483
u32 reg;
484+
int gating_bit = cpu;
484485

485486
pr_debug("%s: cluster %u cpu %u\n", __func__, cluster, cpu);
486487
if (cpu >= SUNXI_CPUS_PER_CLUSTER || cluster >= SUNXI_NR_CLUSTERS)
487488
return -EINVAL;
488489

490+
if (is_a83t && cpu == 0)
491+
gating_bit = 4;
492+
489493
/* gate processor power */
490494
reg = readl(prcm_base + PRCM_PWROFF_GATING_REG(cluster));
491-
reg |= PRCM_PWROFF_GATING_REG_CORE(cpu);
495+
reg |= PRCM_PWROFF_GATING_REG_CORE(gating_bit);
492496
writel(reg, prcm_base + PRCM_PWROFF_GATING_REG(cluster));
493497
udelay(20);
494498

arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
status = "okay";
128128

129129
i2c-mux@77 {
130-
compatible = "nxp,pca9847";
130+
compatible = "nxp,pca9547";
131131
reg = <0x77>;
132132
#address-cells = <1>;
133133
#size-cells = <0>;

arch/arm64/boot/dts/freescale/imx8mm.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@
394394
};
395395

396396
sdma2: dma-controller@302c0000 {
397-
compatible = "fsl,imx8mm-sdma", "fsl,imx7d-sdma";
397+
compatible = "fsl,imx8mm-sdma", "fsl,imx8mq-sdma";
398398
reg = <0x302c0000 0x10000>;
399399
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
400400
clocks = <&clk IMX8MM_CLK_SDMA2_ROOT>,
@@ -405,7 +405,7 @@
405405
};
406406

407407
sdma3: dma-controller@302b0000 {
408-
compatible = "fsl,imx8mm-sdma", "fsl,imx7d-sdma";
408+
compatible = "fsl,imx8mm-sdma", "fsl,imx8mq-sdma";
409409
reg = <0x302b0000 0x10000>;
410410
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
411411
clocks = <&clk IMX8MM_CLK_SDMA3_ROOT>,
@@ -737,7 +737,7 @@
737737
};
738738

739739
sdma1: dma-controller@30bd0000 {
740-
compatible = "fsl,imx8mm-sdma", "fsl,imx7d-sdma";
740+
compatible = "fsl,imx8mm-sdma", "fsl,imx8mq-sdma";
741741
reg = <0x30bd0000 0x10000>;
742742
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
743743
clocks = <&clk IMX8MM_CLK_SDMA1_ROOT>,

0 commit comments

Comments
 (0)