tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 7fbb6157 b2096a5e

options
unified split
Changed files
+20 -20
arch
arm
boot
dts
sun4i-a10.dtsi
sun8i-h3-orangepi-one.dts
sun8i-v3s-licheepi-zero-dock.dts
mach-ep93xx
core.c
mach-ixp4xx
avila-setup.c
dsmg600-setup.c
fsg-setup.c
ixdp425-setup.c
nas100d-setup.c
nslu2-setup.c
mach-pxa
palmz72.c
viper.c
mach-sa1100
simpad.c
arm64
boot
dts
hisilicon
hi6220-hikey.dts
drivers
firmware
qcom_scm-32.c
+3 -3
arch/arm/boot/dts/sun4i-a10.dtsi
··· 76 76 allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi"; 77 77 clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_HDMI0>, 78 78 <&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>, 80 80 <&ccu CLK_TCON0_CH1>, <&ccu CLK_HDMI>, 81 81 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>; 82 82 status = "disabled"; ··· 88 88 allwinner,pipeline = "de_fe0-de_be0-lcd0"; 89 89 clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_DE_BE0>, 90 90 <&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>, 92 92 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>; 93 93 status = "disabled"; 94 94 }; ··· 99 99 allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0"; 100 100 clocks = <&ccu CLK_AHB_TVE0>, <&ccu CLK_AHB_LCD0>, 101 101 <&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>, 103 103 <&ccu CLK_TCON0_CH1>, <&ccu CLK_DRAM_TVE0>, 104 104 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>; 105 105 status = "disabled";
+1
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
··· 117 117 phy-handle = <&int_mii_phy>; 118 118 phy-mode = "mii"; 119 119 allwinner,leds-active-low; 120 + status = "okay"; 120 121 }; 121 122 122 123 &hdmi {
+1 -1
arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts
··· 51 51 52 52 leds { 53 53 /* The LEDs use PG0~2 pins, which conflict with MMC1 */ 54 - status = "disbaled"; 54 + status = "disabled"; 55 55 }; 56 56 }; 57 57
+1 -1
arch/arm/mach-ep93xx/core.c
··· 323 323 324 324 /* All EP93xx devices use the same two GPIO pins for I2C bit-banging */ 325 325 static struct gpiod_lookup_table ep93xx_i2c_gpiod_table = { 326 - .dev_id = "i2c-gpio", 326 + .dev_id = "i2c-gpio.0", 327 327 .table = { 328 328 /* Use local offsets on gpiochip/port "G" */ 329 329 GPIO_LOOKUP_IDX("G", 1, NULL, 0,
+1 -1
arch/arm/mach-ixp4xx/avila-setup.c
··· 51 51 }; 52 52 53 53 static struct gpiod_lookup_table avila_i2c_gpiod_table = { 54 - .dev_id = "i2c-gpio", 54 + .dev_id = "i2c-gpio.0", 55 55 .table = { 56 56 GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", AVILA_SDA_PIN, 57 57 NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+1 -1
arch/arm/mach-ixp4xx/dsmg600-setup.c
··· 70 70 }; 71 71 72 72 static struct gpiod_lookup_table dsmg600_i2c_gpiod_table = { 73 - .dev_id = "i2c-gpio", 73 + .dev_id = "i2c-gpio.0", 74 74 .table = { 75 75 GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", DSMG600_SDA_PIN, 76 76 NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+1 -1
arch/arm/mach-ixp4xx/fsg-setup.c
··· 56 56 }; 57 57 58 58 static struct gpiod_lookup_table fsg_i2c_gpiod_table = { 59 - .dev_id = "i2c-gpio", 59 + .dev_id = "i2c-gpio.0", 60 60 .table = { 61 61 GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", FSG_SDA_PIN, 62 62 NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+1 -1
arch/arm/mach-ixp4xx/ixdp425-setup.c
··· 124 124 #endif /* CONFIG_MTD_NAND_PLATFORM */ 125 125 126 126 static struct gpiod_lookup_table ixdp425_i2c_gpiod_table = { 127 - .dev_id = "i2c-gpio", 127 + .dev_id = "i2c-gpio.0", 128 128 .table = { 129 129 GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", IXDP425_SDA_PIN, 130 130 NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+1 -1
arch/arm/mach-ixp4xx/nas100d-setup.c
··· 102 102 }; 103 103 104 104 static struct gpiod_lookup_table nas100d_i2c_gpiod_table = { 105 - .dev_id = "i2c-gpio", 105 + .dev_id = "i2c-gpio.0", 106 106 .table = { 107 107 GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NAS100D_SDA_PIN, 108 108 NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+1 -1
arch/arm/mach-ixp4xx/nslu2-setup.c
··· 70 70 }; 71 71 72 72 static struct gpiod_lookup_table nslu2_i2c_gpiod_table = { 73 - .dev_id = "i2c-gpio", 73 + .dev_id = "i2c-gpio.0", 74 74 .table = { 75 75 GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NSLU2_SDA_PIN, 76 76 NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+1 -1
arch/arm/mach-pxa/palmz72.c
··· 322 322 }; 323 323 324 324 static struct gpiod_lookup_table palmz72_i2c_gpiod_table = { 325 - .dev_id = "i2c-gpio", 325 + .dev_id = "i2c-gpio.0", 326 326 .table = { 327 327 GPIO_LOOKUP_IDX("gpio-pxa", 118, NULL, 0, 328 328 GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+2 -2
arch/arm/mach-pxa/viper.c
··· 460 460 461 461 /* i2c */ 462 462 static struct gpiod_lookup_table viper_i2c_gpiod_table = { 463 - .dev_id = "i2c-gpio", 463 + .dev_id = "i2c-gpio.1", 464 464 .table = { 465 465 GPIO_LOOKUP_IDX("gpio-pxa", VIPER_RTC_I2C_SDA_GPIO, 466 466 NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN), ··· 789 789 __setup("tpm=", viper_tpm_setup); 790 790 791 791 struct gpiod_lookup_table viper_tpm_i2c_gpiod_table = { 792 - .dev_id = "i2c-gpio", 792 + .dev_id = "i2c-gpio.2", 793 793 .table = { 794 794 GPIO_LOOKUP_IDX("gpio-pxa", VIPER_TPM_I2C_SDA_GPIO, 795 795 NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
+1 -1
arch/arm/mach-sa1100/simpad.c
··· 327 327 * i2c 328 328 */ 329 329 static struct gpiod_lookup_table simpad_i2c_gpiod_table = { 330 - .dev_id = "i2c-gpio", 330 + .dev_id = "i2c-gpio.0", 331 331 .table = { 332 332 GPIO_LOOKUP_IDX("gpio", 21, NULL, 0, 333 333 GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-1
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
··· 299 299 /* GPIO blocks 16 thru 19 do not appear to be routed to pins */ 300 300 301 301 dwmmc_0: dwmmc0@f723d000 { 302 - max-frequency = <150000000>; 303 302 cap-mmc-highspeed; 304 303 mmc-hs200-1_8v; 305 304 non-removable;
+4 -4
drivers/firmware/qcom_scm-32.c
··· 147 147 "smc #0 @ switch to secure world\n" 148 148 : "=r" (r0) 149 149 : "r" (r0), "r" (r1), "r" (r2) 150 - : "r3"); 150 + : "r3", "r12"); 151 151 } while (r0 == QCOM_SCM_INTERRUPTED); 152 152 153 153 return r0; ··· 263 263 "smc #0 @ switch to secure world\n" 264 264 : "=r" (r0) 265 265 : "r" (r0), "r" (r1), "r" (r2) 266 - : "r3"); 266 + : "r3", "r12"); 267 267 return r0; 268 268 } 269 269 ··· 298 298 "smc #0 @ switch to secure world\n" 299 299 : "=r" (r0) 300 300 : "r" (r0), "r" (r1), "r" (r2), "r" (r3) 301 - ); 301 + : "r12"); 302 302 return r0; 303 303 } 304 304 ··· 328 328 "smc #0 @ switch to secure world\n" 329 329 : "=r" (r0), "=r" (r1) 330 330 : "r" (r0), "r" (r1) 331 - : "r2", "r3"); 331 + : "r2", "r3", "r12"); 332 332 } while (r0 == QCOM_SCM_INTERRUPTED); 333 333 334 334 version = r1;