Skip to content

Commit 7fbb615

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: "A few more fixes for v4.17: - a fix for a crash in scm_call_atomic on qcom platforms - display fix for Allwinner A10 - a fix that re-enables ethernet on Allwinner H3 (C.H.I.P et al) - a fix for eMMC corruption on hikey - i2c-gpio descriptor tables for ixp4xx ... plus a small typo fix" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: Fix i2c-gpio GPIO descriptor tables arm64: dts: hikey: Fix eMMC corruption regression firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1() ARM: sun8i: v3s: fix spelling mistake: "disbaled" -> "disabled" ARM: dts: sun4i: Fix incorrect clocks for displays ARM: dts: sun8i: h3: Re-enable EMAC on Orange Pi One
2 parents b2096a5 + e5dd615 commit 7fbb615

File tree

15 files changed

+20
-20
lines changed

15 files changed

+20
-20
lines changed

‎arch/arm/boot/dts/sun4i-a10.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";
7777
clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_HDMI0>,
7878
<&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,
79-
<&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,
79+
<&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,
8080
<&ccu CLK_TCON0_CH1>, <&ccu CLK_HDMI>,
8181
<&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;
8282
status = "disabled";
@@ -88,7 +88,7 @@
8888
allwinner,pipeline = "de_fe0-de_be0-lcd0";
8989
clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_DE_BE0>,
9090
<&ccu CLK_AHB_DE_FE0>, <&ccu CLK_DE_BE0>,
91-
<&ccu CLK_AHB_DE_FE0>, <&ccu CLK_TCON0_CH0>,
91+
<&ccu CLK_DE_FE0>, <&ccu CLK_TCON0_CH0>,
9292
<&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;
9393
status = "disabled";
9494
};
@@ -99,7 +99,7 @@
9999
allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";
100100
clocks = <&ccu CLK_AHB_TVE0>, <&ccu CLK_AHB_LCD0>,
101101
<&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,
102-
<&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,
102+
<&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,
103103
<&ccu CLK_TCON0_CH1>, <&ccu CLK_DRAM_TVE0>,
104104
<&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;
105105
status = "disabled";

‎arch/arm/boot/dts/sun8i-h3-orangepi-one.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
phy-handle = <&int_mii_phy>;
118118
phy-mode = "mii";
119119
allwinner,leds-active-low;
120+
status = "okay";
120121
};
121122

122123
&hdmi {

‎arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts

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

5252
leds {
5353
/* The LEDs use PG0~2 pins, which conflict with MMC1 */
54-
status = "disbaled";
54+
status = "disabled";
5555
};
5656
};
5757

‎arch/arm/mach-ep93xx/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr)
323323

324324
/* All EP93xx devices use the same two GPIO pins for I2C bit-banging */
325325
static struct gpiod_lookup_table ep93xx_i2c_gpiod_table = {
326-
.dev_id = "i2c-gpio",
326+
.dev_id = "i2c-gpio.0",
327327
.table = {
328328
/* Use local offsets on gpiochip/port "G" */
329329
GPIO_LOOKUP_IDX("G", 1, NULL, 0,

‎arch/arm/mach-ixp4xx/avila-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static struct platform_device avila_flash = {
5151
};
5252

5353
static struct gpiod_lookup_table avila_i2c_gpiod_table = {
54-
.dev_id = "i2c-gpio",
54+
.dev_id = "i2c-gpio.0",
5555
.table = {
5656
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", AVILA_SDA_PIN,
5757
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

‎arch/arm/mach-ixp4xx/dsmg600-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static struct platform_device dsmg600_flash = {
7070
};
7171

7272
static struct gpiod_lookup_table dsmg600_i2c_gpiod_table = {
73-
.dev_id = "i2c-gpio",
73+
.dev_id = "i2c-gpio.0",
7474
.table = {
7575
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", DSMG600_SDA_PIN,
7676
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

‎arch/arm/mach-ixp4xx/fsg-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static struct platform_device fsg_flash = {
5656
};
5757

5858
static struct gpiod_lookup_table fsg_i2c_gpiod_table = {
59-
.dev_id = "i2c-gpio",
59+
.dev_id = "i2c-gpio.0",
6060
.table = {
6161
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", FSG_SDA_PIN,
6262
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

‎arch/arm/mach-ixp4xx/ixdp425-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ static struct platform_device ixdp425_flash_nand = {
124124
#endif /* CONFIG_MTD_NAND_PLATFORM */
125125

126126
static struct gpiod_lookup_table ixdp425_i2c_gpiod_table = {
127-
.dev_id = "i2c-gpio",
127+
.dev_id = "i2c-gpio.0",
128128
.table = {
129129
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", IXDP425_SDA_PIN,
130130
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

‎arch/arm/mach-ixp4xx/nas100d-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static struct platform_device nas100d_leds = {
102102
};
103103

104104
static struct gpiod_lookup_table nas100d_i2c_gpiod_table = {
105-
.dev_id = "i2c-gpio",
105+
.dev_id = "i2c-gpio.0",
106106
.table = {
107107
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NAS100D_SDA_PIN,
108108
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

‎arch/arm/mach-ixp4xx/nslu2-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static struct platform_device nslu2_flash = {
7070
};
7171

7272
static struct gpiod_lookup_table nslu2_i2c_gpiod_table = {
73-
.dev_id = "i2c-gpio",
73+
.dev_id = "i2c-gpio.0",
7474
.table = {
7575
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NSLU2_SDA_PIN,
7676
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

‎arch/arm/mach-pxa/palmz72.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ static struct soc_camera_link palmz72_iclink = {
322322
};
323323

324324
static struct gpiod_lookup_table palmz72_i2c_gpiod_table = {
325-
.dev_id = "i2c-gpio",
325+
.dev_id = "i2c-gpio.0",
326326
.table = {
327327
GPIO_LOOKUP_IDX("gpio-pxa", 118, NULL, 0,
328328
GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

‎arch/arm/mach-pxa/viper.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ static struct platform_device smc91x_device = {
460460

461461
/* i2c */
462462
static struct gpiod_lookup_table viper_i2c_gpiod_table = {
463-
.dev_id = "i2c-gpio",
463+
.dev_id = "i2c-gpio.1",
464464
.table = {
465465
GPIO_LOOKUP_IDX("gpio-pxa", VIPER_RTC_I2C_SDA_GPIO,
466466
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
@@ -789,7 +789,7 @@ static int __init viper_tpm_setup(char *str)
789789
__setup("tpm=", viper_tpm_setup);
790790

791791
struct gpiod_lookup_table viper_tpm_i2c_gpiod_table = {
792-
.dev_id = "i2c-gpio",
792+
.dev_id = "i2c-gpio.2",
793793
.table = {
794794
GPIO_LOOKUP_IDX("gpio-pxa", VIPER_TPM_I2C_SDA_GPIO,
795795
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

‎arch/arm/mach-sa1100/simpad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ static struct platform_device simpad_gpio_leds = {
327327
* i2c
328328
*/
329329
static struct gpiod_lookup_table simpad_i2c_gpiod_table = {
330-
.dev_id = "i2c-gpio",
330+
.dev_id = "i2c-gpio.0",
331331
.table = {
332332
GPIO_LOOKUP_IDX("gpio", 21, NULL, 0,
333333
GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

‎arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@
299299
/* GPIO blocks 16 thru 19 do not appear to be routed to pins */
300300

301301
dwmmc_0: dwmmc0@f723d000 {
302-
max-frequency = <150000000>;
303302
cap-mmc-highspeed;
304303
mmc-hs200-1_8v;
305304
non-removable;

‎drivers/firmware/qcom_scm-32.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static u32 smc(u32 cmd_addr)
147147
"smc #0 @ switch to secure world\n"
148148
: "=r" (r0)
149149
: "r" (r0), "r" (r1), "r" (r2)
150-
: "r3");
150+
: "r3", "r12");
151151
} while (r0 == QCOM_SCM_INTERRUPTED);
152152

153153
return r0;
@@ -263,7 +263,7 @@ static s32 qcom_scm_call_atomic1(u32 svc, u32 cmd, u32 arg1)
263263
"smc #0 @ switch to secure world\n"
264264
: "=r" (r0)
265265
: "r" (r0), "r" (r1), "r" (r2)
266-
: "r3");
266+
: "r3", "r12");
267267
return r0;
268268
}
269269

@@ -298,7 +298,7 @@ static s32 qcom_scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2)
298298
"smc #0 @ switch to secure world\n"
299299
: "=r" (r0)
300300
: "r" (r0), "r" (r1), "r" (r2), "r" (r3)
301-
);
301+
: "r12");
302302
return r0;
303303
}
304304

@@ -328,7 +328,7 @@ u32 qcom_scm_get_version(void)
328328
"smc #0 @ switch to secure world\n"
329329
: "=r" (r0), "=r" (r1)
330330
: "r" (r0), "r" (r1)
331-
: "r2", "r3");
331+
: "r2", "r3", "r12");
332332
} while (r0 == QCOM_SCM_INTERRUPTED);
333333

334334
version = r1;

0 commit comments

Comments
 (0)