Skip to content

Commit decad3e

Browse files
torvaldstorvalds
committed
Merge tag 'arm-soc-fixes-v5.13-2' 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 been coming in over the last few weeks, the usual mix of fixes: - DT fixups for TI K3 - SATA drive detection fix for TI DRA7 - Power management fixes and a few build warning removals for OMAP - OP-TEE fix to use standard API for UUID exporting - DT fixes for a handful of i.MX boards And a few other smaller items" * tag 'arm-soc-fixes-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (29 commits) arm64: meson: select COMMON_CLK soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe() ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act ARM: dts: imx: emcon-avari: Fix nxp,pca8574 #gpio-cells ARM: dts: imx7d-pico: Fix the 'tuning-step' property ARM: dts: imx7d-meerkat96: Fix the 'tuning-step' property arm64: dts: freescale: sl28: var1: fix RGMII clock and voltage arm64: dts: freescale: sl28: var4: fix RGMII clock and voltage ARM: imx: pm-imx27: Include "common.h" arm64: dts: zii-ultra: fix 12V_MAIN voltage arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance arm64: dts: ls1028a: fix memory node bus: ti-sysc: Fix am335x resume hang for usb otg module ARM: OMAP2+: Fix build warning when mmc_omap is not built ARM: OMAP1: isp1301-omap: Add missing gpiod_add_lookup_table function ARM: OMAP1: Fix use of possibly uninitialized irq variable optee: use export_uuid() to copy client UUID arm64: dts: ti: k3*: Introduce reg definition for interrupt routers arm64: dts: ti: k3-am65|j721e|am64: Map the dma / navigator subsystem via explicit ranges ...
2 parents bd7b12a + b9c112f commit decad3e

31 files changed

+160
-126
lines changed

‎arch/arm/boot/dts/imx6dl-yapp4-common.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,13 @@
105105
phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
106106
phy-reset-duration = <20>;
107107
phy-supply = <&sw2_reg>;
108-
phy-handle = <&ethphy0>;
109108
status = "okay";
110109

110+
fixed-link {
111+
speed = <1000>;
112+
full-duplex;
113+
};
114+
111115
mdio {
112116
#address-cells = <1>;
113117
#size-cells = <0>;

‎arch/arm/boot/dts/imx6q-dhcom-som.dtsi

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,18 @@
406406
vin-supply = <&sw1_reg>;
407407
};
408408

409+
&reg_pu {
410+
vin-supply = <&sw1_reg>;
411+
};
412+
413+
&reg_vdd1p1 {
414+
vin-supply = <&sw2_reg>;
415+
};
416+
417+
&reg_vdd2p5 {
418+
vin-supply = <&sw2_reg>;
419+
};
420+
409421
&uart1 {
410422
pinctrl-names = "default";
411423
pinctrl-0 = <&pinctrl_uart1>;

‎arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
compatible = "nxp,pca8574";
127127
reg = <0x3a>;
128128
gpio-controller;
129-
#gpio-cells = <1>;
129+
#gpio-cells = <2>;
130130
};
131131
};
132132

‎arch/arm/boot/dts/imx7d-meerkat96.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
pinctrl-names = "default";
194194
pinctrl-0 = <&pinctrl_usdhc1>;
195195
keep-power-in-suspend;
196-
tuning-step = <2>;
196+
fsl,tuning-step = <2>;
197197
vmmc-supply = <&reg_3p3v>;
198198
no-1-8-v;
199199
broken-cd;

‎arch/arm/boot/dts/imx7d-pico.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
352352
cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
353353
bus-width = <4>;
354-
tuning-step = <2>;
354+
fsl,tuning-step = <2>;
355355
vmmc-supply = <&reg_3p3v>;
356356
wakeup-source;
357357
no-1-8-v;

‎arch/arm/mach-imx/pm-imx27.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/suspend.h>
1313
#include <linux/io.h>
1414

15+
#include "common.h"
1516
#include "hardware.h"
1617

1718
static int mx27_suspend_enter(suspend_state_t state)

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -458,20 +458,6 @@ static struct gpiod_lookup_table leds_gpio_table = {
458458

459459
#ifdef CONFIG_LEDS_TRIGGERS
460460
DEFINE_LED_TRIGGER(ams_delta_camera_led_trigger);
461-
462-
static int ams_delta_camera_power(struct device *dev, int power)
463-
{
464-
/*
465-
* turn on camera LED
466-
*/
467-
if (power)
468-
led_trigger_event(ams_delta_camera_led_trigger, LED_FULL);
469-
else
470-
led_trigger_event(ams_delta_camera_led_trigger, LED_OFF);
471-
return 0;
472-
}
473-
#else
474-
#define ams_delta_camera_power NULL
475461
#endif
476462

477463
static struct platform_device ams_delta_audio_device = {

‎arch/arm/mach-omap1/board-h2.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static int tps_setup(struct i2c_client *client, void *context)
320320
{
321321
if (!IS_BUILTIN(CONFIG_TPS65010))
322322
return -ENOSYS;
323-
323+
324324
tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V |
325325
TPS_LDO1_ENABLE | TPS_VLDO1_3_0V);
326326

@@ -394,6 +394,8 @@ static void __init h2_init(void)
394394
BUG_ON(gpio_request(H2_NAND_RB_GPIO_PIN, "NAND ready") < 0);
395395
gpio_direction_input(H2_NAND_RB_GPIO_PIN);
396396

397+
gpiod_add_lookup_table(&isp1301_gpiod_table);
398+
397399
omap_cfg_reg(L3_1610_FLASH_CS2B_OE);
398400
omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
399401

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,13 @@ static int __init omap_pm_init(void)
655655
irq = INT_7XX_WAKE_UP_REQ;
656656
else if (cpu_is_omap16xx())
657657
irq = INT_1610_WAKE_UP_REQ;
658-
if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup",
659-
NULL))
660-
pr_err("Failed to request irq %d (peripheral wakeup)\n", irq);
658+
else
659+
irq = -1;
660+
661+
if (irq >= 0) {
662+
if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup", NULL))
663+
pr_err("Failed to request irq %d (peripheral wakeup)\n", irq);
664+
}
661665

662666
/* Program new power ramp-up time
663667
* (0 for most boards since we don't lower voltage when in deep sleep)

‎arch/arm/mach-omap2/board-n8x0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ static int n8x0_mmc_get_cover_state(struct device *dev, int slot)
322322

323323
static void n8x0_mmc_callback(void *data, u8 card_mask)
324324
{
325+
#ifdef CONFIG_MMC_OMAP
325326
int bit, *openp, index;
326327

327328
if (board_is_n800()) {
@@ -339,7 +340,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask)
339340
else
340341
*openp = 0;
341342

342-
#ifdef CONFIG_MMC_OMAP
343343
omap_mmc_notify_cover_event(mmc_device, index, *openp);
344344
#else
345345
pr_warn("MMC: notify cover event not available\n");

0 commit comments

Comments
 (0)