Skip to content

Commit 6a51272

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "Volume is a little higher than usual due to a set of gpio fixes for Davinci platforms that's been around a while, still seemed appropriate to not hold off until next merge window. Besides that it's the usual mix of minor fixes, mostly corrections of small stuff in device trees. Major stability-related one is the removal of a regulator from DT on Rock960, since DVFS caused undervoltage. I expect it'll be restored once they figure out the underlying issue" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits) MAINTAINERS: Remove unused Qualcomm SoC mailing list ARM: davinci: dm644x: set the GPIO base to 0 ARM: davinci: da830: set the GPIO base to 0 ARM: davinci: dm355: set the GPIO base to 0 ARM: davinci: dm646x: set the GPIO base to 0 ARM: davinci: dm365: set the GPIO base to 0 ARM: davinci: da850: set the GPIO base to 0 gpio: davinci: restore a way to manually specify the GPIO base ARM: davinci: dm644x: define gpio interrupts as separate resources ARM: davinci: dm355: define gpio interrupts as separate resources ARM: davinci: dm646x: define gpio interrupts as separate resources ARM: davinci: dm365: define gpio interrupts as separate resources ARM: davinci: da8xx: define gpio interrupts as separate resources ARM: dts: at91: sama5d2: use the divided clock for SMC ARM: dts: imx51-zii-rdu1: Remove EEPROM node ARM: dts: rockchip: Remove @0 from the veyron memory node arm64: dts: rockchip: Fix PCIe reset polarity for rk3399-puma-haikou. arm64: dts: qcom: msm8998: Reserve gpio ranges on MTP arm64: dts: sdm845-mtp: Reserve reserved gpios arm64: dts: ti: k3-am654: Fix wakeup_uart reg address ...
2 parents 292974c + bfed4d7 commit 6a51272

24 files changed

+176
-33
lines changed

‎MAINTAINERS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,7 +1923,6 @@ ARM/QUALCOMM SUPPORT
19231923
M: Andy Gross <andy.gross@linaro.org>
19241924
M: David Brown <david.brown@linaro.org>
19251925
L: linux-arm-msm@vger.kernel.org
1926-
L: linux-soc@vger.kernel.org
19271926
S: Maintained
19281927
F: Documentation/devicetree/bindings/soc/qcom/
19291928
F: arch/arm/boot/dts/qcom-*.dts
@@ -2931,7 +2930,6 @@ F: arch/mips/include/asm/mach-bcm47xx/*
29312930
BROADCOM BCM5301X ARM ARCHITECTURE
29322931
M: Hauke Mehrtens <hauke@hauke-m.de>
29332932
M: Rafał Miłecki <zajec5@gmail.com>
2934-
M: Jon Mason <jonmason@broadcom.com>
29352933
M: bcm-kernel-feedback-list@broadcom.com
29362934
L: linux-arm-kernel@lists.infradead.org
29372935
S: Maintained
@@ -3077,7 +3075,6 @@ F: drivers/net/ethernet/broadcom/genet/
30773075
BROADCOM IPROC ARM ARCHITECTURE
30783076
M: Ray Jui <rjui@broadcom.com>
30793077
M: Scott Branden <sbranden@broadcom.com>
3080-
M: Jon Mason <jonmason@broadcom.com>
30813078
M: bcm-kernel-feedback-list@broadcom.com
30823079
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
30833080
T: git git://github.com/broadcom/cygnus-linux.git

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
vmmc-supply = <&vmmc_fixed>;
229229
bus-width = <4>;
230230
wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */
231-
cd-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>; /* gpio_127 */
231+
cd-gpios = <&gpio4 31 GPIO_ACTIVE_LOW>; /* gpio_127 */
232232
};
233233

234234
&mmc3 {

‎arch/arm/boot/dts/am3517-som.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
compatible = "ti,wl1271";
164164
reg = <2>;
165165
interrupt-parent = <&gpio6>;
166-
interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; /* gpio_170 */
166+
interrupts = <10 IRQ_TYPE_EDGE_RISING>; /* gpio_170 */
167167
ref-clock-frequency = <26000000>;
168168
tcxo-clock-frequency = <26000000>;
169169
};

‎arch/arm/boot/dts/imx51-zii-rdu1.dts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,6 @@
492492
pinctrl-0 = <&pinctrl_i2c2>;
493493
status = "okay";
494494

495-
eeprom@50 {
496-
compatible = "atmel,24c04";
497-
pagesize = <16>;
498-
reg = <0x50>;
499-
};
500-
501495
hpa1: amp@60 {
502496
compatible = "ti,tpa6130a2";
503497
reg = <0x60>;

‎arch/arm/boot/dts/logicpd-som-lv.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
};
130130

131131
&mmc3 {
132-
interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
132+
interrupts-extended = <&intc 94 &omap3_pmx_core 0x136>;
133133
pinctrl-0 = <&mmc3_pins &wl127x_gpio>;
134134
pinctrl-names = "default";
135135
vmmc-supply = <&wl12xx_vmmc>;

‎arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* jumpering combinations for the long run.
3636
*/
3737
&mmc3 {
38-
interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
38+
interrupts-extended = <&intc 94 &omap3_pmx_core 0x136>;
3939
pinctrl-0 = <&mmc3_pins &mmc3_core2_pins>;
4040
pinctrl-names = "default";
4141
vmmc-supply = <&wl12xx_vmmc>;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
#include "rk3288.dtsi"
1111

1212
/ {
13-
memory@0 {
13+
/*
14+
* The default coreboot on veyron devices ignores memory@0 nodes
15+
* and would instead create another memory node.
16+
*/
17+
memory {
1418
device_type = "memory";
1519
reg = <0x0 0x0 0x0 0x80000000>;
1620
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@
314314
0x1 0x0 0x60000000 0x10000000
315315
0x2 0x0 0x70000000 0x10000000
316316
0x3 0x0 0x80000000 0x10000000>;
317-
clocks = <&mck>;
317+
clocks = <&h32ck>;
318318
status = "disabled";
319319

320320
nand_controller: nand-controller {

‎arch/arm/mach-davinci/da830.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,9 @@ static struct davinci_id da830_ids[] = {
759759
};
760760

761761
static struct davinci_gpio_platform_data da830_gpio_platform_data = {
762-
.ngpio = 128,
762+
.no_auto_base = true,
763+
.base = 0,
764+
.ngpio = 128,
763765
};
764766

765767
int __init da830_register_gpio(void)

‎arch/arm/mach-davinci/da850.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,9 @@ int __init da850_register_vpif_capture(struct vpif_capture_config
719719
}
720720

721721
static struct davinci_gpio_platform_data da850_gpio_platform_data = {
722-
.ngpio = 144,
722+
.no_auto_base = true,
723+
.base = 0,
724+
.ngpio = 144,
723725
};
724726

725727
int __init da850_register_gpio(void)

‎arch/arm/mach-davinci/devices-da8xx.c

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,46 @@ static struct resource da8xx_gpio_resources[] = {
701701
},
702702
{ /* interrupt */
703703
.start = IRQ_DA8XX_GPIO0,
704+
.end = IRQ_DA8XX_GPIO0,
705+
.flags = IORESOURCE_IRQ,
706+
},
707+
{
708+
.start = IRQ_DA8XX_GPIO1,
709+
.end = IRQ_DA8XX_GPIO1,
710+
.flags = IORESOURCE_IRQ,
711+
},
712+
{
713+
.start = IRQ_DA8XX_GPIO2,
714+
.end = IRQ_DA8XX_GPIO2,
715+
.flags = IORESOURCE_IRQ,
716+
},
717+
{
718+
.start = IRQ_DA8XX_GPIO3,
719+
.end = IRQ_DA8XX_GPIO3,
720+
.flags = IORESOURCE_IRQ,
721+
},
722+
{
723+
.start = IRQ_DA8XX_GPIO4,
724+
.end = IRQ_DA8XX_GPIO4,
725+
.flags = IORESOURCE_IRQ,
726+
},
727+
{
728+
.start = IRQ_DA8XX_GPIO5,
729+
.end = IRQ_DA8XX_GPIO5,
730+
.flags = IORESOURCE_IRQ,
731+
},
732+
{
733+
.start = IRQ_DA8XX_GPIO6,
734+
.end = IRQ_DA8XX_GPIO6,
735+
.flags = IORESOURCE_IRQ,
736+
},
737+
{
738+
.start = IRQ_DA8XX_GPIO7,
739+
.end = IRQ_DA8XX_GPIO7,
740+
.flags = IORESOURCE_IRQ,
741+
},
742+
{
743+
.start = IRQ_DA8XX_GPIO8,
704744
.end = IRQ_DA8XX_GPIO8,
705745
.flags = IORESOURCE_IRQ,
706746
},

‎arch/arm/mach-davinci/dm355.c

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,12 +548,44 @@ static struct resource dm355_gpio_resources[] = {
548548
},
549549
{ /* interrupt */
550550
.start = IRQ_DM355_GPIOBNK0,
551+
.end = IRQ_DM355_GPIOBNK0,
552+
.flags = IORESOURCE_IRQ,
553+
},
554+
{
555+
.start = IRQ_DM355_GPIOBNK1,
556+
.end = IRQ_DM355_GPIOBNK1,
557+
.flags = IORESOURCE_IRQ,
558+
},
559+
{
560+
.start = IRQ_DM355_GPIOBNK2,
561+
.end = IRQ_DM355_GPIOBNK2,
562+
.flags = IORESOURCE_IRQ,
563+
},
564+
{
565+
.start = IRQ_DM355_GPIOBNK3,
566+
.end = IRQ_DM355_GPIOBNK3,
567+
.flags = IORESOURCE_IRQ,
568+
},
569+
{
570+
.start = IRQ_DM355_GPIOBNK4,
571+
.end = IRQ_DM355_GPIOBNK4,
572+
.flags = IORESOURCE_IRQ,
573+
},
574+
{
575+
.start = IRQ_DM355_GPIOBNK5,
576+
.end = IRQ_DM355_GPIOBNK5,
577+
.flags = IORESOURCE_IRQ,
578+
},
579+
{
580+
.start = IRQ_DM355_GPIOBNK6,
551581
.end = IRQ_DM355_GPIOBNK6,
552582
.flags = IORESOURCE_IRQ,
553583
},
554584
};
555585

556586
static struct davinci_gpio_platform_data dm355_gpio_platform_data = {
587+
.no_auto_base = true,
588+
.base = 0,
557589
.ngpio = 104,
558590
};
559591

‎arch/arm/mach-davinci/dm365.c

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,49 @@ static struct resource dm365_gpio_resources[] = {
267267
},
268268
{ /* interrupt */
269269
.start = IRQ_DM365_GPIO0,
270+
.end = IRQ_DM365_GPIO0,
271+
.flags = IORESOURCE_IRQ,
272+
},
273+
{
274+
.start = IRQ_DM365_GPIO1,
275+
.end = IRQ_DM365_GPIO1,
276+
.flags = IORESOURCE_IRQ,
277+
},
278+
{
279+
.start = IRQ_DM365_GPIO2,
280+
.end = IRQ_DM365_GPIO2,
281+
.flags = IORESOURCE_IRQ,
282+
},
283+
{
284+
.start = IRQ_DM365_GPIO3,
285+
.end = IRQ_DM365_GPIO3,
286+
.flags = IORESOURCE_IRQ,
287+
},
288+
{
289+
.start = IRQ_DM365_GPIO4,
290+
.end = IRQ_DM365_GPIO4,
291+
.flags = IORESOURCE_IRQ,
292+
},
293+
{
294+
.start = IRQ_DM365_GPIO5,
295+
.end = IRQ_DM365_GPIO5,
296+
.flags = IORESOURCE_IRQ,
297+
},
298+
{
299+
.start = IRQ_DM365_GPIO6,
300+
.end = IRQ_DM365_GPIO6,
301+
.flags = IORESOURCE_IRQ,
302+
},
303+
{
304+
.start = IRQ_DM365_GPIO7,
270305
.end = IRQ_DM365_GPIO7,
271306
.flags = IORESOURCE_IRQ,
272307
},
273308
};
274309

275310
static struct davinci_gpio_platform_data dm365_gpio_platform_data = {
311+
.no_auto_base = true,
312+
.base = 0,
276313
.ngpio = 104,
277314
.gpio_unbanked = 8,
278315
};

‎arch/arm/mach-davinci/dm644x.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,34 @@ static struct resource dm644_gpio_resources[] = {
492492
},
493493
{ /* interrupt */
494494
.start = IRQ_GPIOBNK0,
495+
.end = IRQ_GPIOBNK0,
496+
.flags = IORESOURCE_IRQ,
497+
},
498+
{
499+
.start = IRQ_GPIOBNK1,
500+
.end = IRQ_GPIOBNK1,
501+
.flags = IORESOURCE_IRQ,
502+
},
503+
{
504+
.start = IRQ_GPIOBNK2,
505+
.end = IRQ_GPIOBNK2,
506+
.flags = IORESOURCE_IRQ,
507+
},
508+
{
509+
.start = IRQ_GPIOBNK3,
510+
.end = IRQ_GPIOBNK3,
511+
.flags = IORESOURCE_IRQ,
512+
},
513+
{
514+
.start = IRQ_GPIOBNK4,
495515
.end = IRQ_GPIOBNK4,
496516
.flags = IORESOURCE_IRQ,
497517
},
498518
};
499519

500520
static struct davinci_gpio_platform_data dm644_gpio_platform_data = {
521+
.no_auto_base = true,
522+
.base = 0,
501523
.ngpio = 71,
502524
};
503525

‎arch/arm/mach-davinci/dm646x.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,12 +442,24 @@ static struct resource dm646x_gpio_resources[] = {
442442
},
443443
{ /* interrupt */
444444
.start = IRQ_DM646X_GPIOBNK0,
445+
.end = IRQ_DM646X_GPIOBNK0,
446+
.flags = IORESOURCE_IRQ,
447+
},
448+
{
449+
.start = IRQ_DM646X_GPIOBNK1,
450+
.end = IRQ_DM646X_GPIOBNK1,
451+
.flags = IORESOURCE_IRQ,
452+
},
453+
{
454+
.start = IRQ_DM646X_GPIOBNK2,
445455
.end = IRQ_DM646X_GPIOBNK2,
446456
.flags = IORESOURCE_IRQ,
447457
},
448458
};
449459

450460
static struct davinci_gpio_platform_data dm646x_gpio_platform_data = {
461+
.no_auto_base = true,
462+
.base = 0,
451463
.ngpio = 43,
452464
};
453465

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,9 @@ static void modem_pm(struct uart_port *port, unsigned int state, unsigned old)
750750
struct modem_private_data *priv = port->private_data;
751751
int ret;
752752

753+
if (!priv)
754+
return;
755+
753756
if (IS_ERR(priv->regulator))
754757
return;
755758

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ static void omap44xx_prm_reconfigure_io_chain(void)
351351
* to occur, WAKEUPENABLE bits must be set in the pad mux registers, and
352352
* omap44xx_prm_reconfigure_io_chain() must be called. No return value.
353353
*/
354-
static void __init omap44xx_prm_enable_io_wakeup(void)
354+
static void omap44xx_prm_enable_io_wakeup(void)
355355
{
356356
s32 inst = omap4_prmst_get_prm_dev_inst();
357357

‎arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,3 +241,7 @@
241241
};
242242
};
243243
};
244+
245+
&tlmm {
246+
gpio-reserved-ranges = <0 4>, <81 4>;
247+
};

‎arch/arm64/boot/dts/qcom/sdm845-mtp.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,10 @@
352352
status = "okay";
353353
};
354354

355+
&tlmm {
356+
gpio-reserved-ranges = <0 4>, <81 4>;
357+
};
358+
355359
&uart9 {
356360
status = "okay";
357361
};

‎arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
};
154154

155155
&pcie0 {
156-
ep-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_LOW>;
156+
ep-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
157157
num-lanes = <4>;
158158
pinctrl-names = "default";
159159
pinctrl-0 = <&pcie_clkreqn_cpm>;

‎arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@
5757
regulator-always-on;
5858
vin-supply = <&vcc_sys>;
5959
};
60-
61-
vdd_log: vdd-log {
62-
compatible = "pwm-regulator";
63-
pwms = <&pwm2 0 25000 0>;
64-
regulator-name = "vdd_log";
65-
regulator-min-microvolt = <800000>;
66-
regulator-max-microvolt = <1400000>;
67-
regulator-always-on;
68-
regulator-boot-on;
69-
vin-supply = <&vcc_sys>;
70-
};
71-
7260
};
7361

7462
&cpu_l0 {

‎arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi

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

3737
wkup_uart0: serial@42300000 {
3838
compatible = "ti,am654-uart";
39-
reg = <0x00 0x42300000 0x00 0x100>;
39+
reg = <0x42300000 0x100>;
4040
reg-shift = <2>;
4141
reg-io-width = <4>;
4242
interrupts = <GIC_SPI 697 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)