Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fbb6157 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b2096a5e e5dd6154

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

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";

			clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_HDMI0>,

				 <&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,

				 <&ccu CLK_TCON0_CH1>, <&ccu CLK_HDMI>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";
@@ -88,7 +88,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0";

			clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_DE_BE0>,

				 <&ccu CLK_AHB_DE_FE0>, <&ccu CLK_DE_BE0>,

				 <&ccu CLK_AHB_DE_FE0>, <&ccu CLK_TCON0_CH0>,

				 <&ccu CLK_DE_FE0>, <&ccu CLK_TCON0_CH0>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";

		};
@@ -99,7 +99,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";

			clocks = <&ccu CLK_AHB_TVE0>, <&ccu CLK_AHB_LCD0>,

				 <&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,

				 <&ccu CLK_TCON0_CH1>, <&ccu CLK_DRAM_TVE0>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";

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

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&hdmi {

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


	leds {

		/* The LEDs use PG0~2 pins, which conflict with MMC1 */

		status = "disbaled";

		status = "disabled";

	};

};

arch/arm/mach-ep93xx/core.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr) 


/* All EP93xx devices use the same two GPIO pins for I2C bit-banging */

static struct gpiod_lookup_table ep93xx_i2c_gpiod_table = {

	.dev_id		= "i2c-gpio",

	.dev_id		= "i2c-gpio.0",

	.table		= {

		/* Use local offsets on gpiochip/port "G" */

		GPIO_LOOKUP_IDX("G", 1, NULL, 0,

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static struct platform_device avila_flash = { 
};



static struct gpiod_lookup_table avila_i2c_gpiod_table = {

	.dev_id		= "i2c-gpio",

	.dev_id		= "i2c-gpio.0",

	.table		= {

		GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", AVILA_SDA_PIN,

				NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),