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

Commit aebbfafc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC platform updates from Arnd Bergmann:
 "The APM X-Gene platform is now maintained by folks from Ampere
  computing that took over the product line a while ago, this gets
  reflected in the MAINTAINERS file.

  Cleanups continue on the older mach-davinci and mach-pxa platform, to
  get them to be more like the modern ones. For pxa, we now remove the
  Raumfeld platform code as it now works with device tree based booting.

  i.MX adds a couple new features for the i.MX7ULP SoC

  Mediatek gains support for a new SoC: MT7629 is a new wireless router
  platform, following MT7623.

  Aside from those, there are the usual minor cleanups and bugfixes
  across several platforms"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (49 commits)
  MAINTAINERS: Update Ampere email address
  usb: ohci-da8xx: remove unused callbacks from platform data
  ARM: davinci: da830-evm: remove legacy usb helpers
  ARM: davinci: omapl138-hawk: remove legacy usb helpers
  usb: ohci-da8xx: add vbus and overcurrent gpios
  ARM: davinci: da830-evm: use gpio lookup entries for usb gpios
  ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios
  usb: ohci-da8xx: add a helper pointer to &pdev->dev
  usb: ohci-da8xx: add a new line after local variables
  arm64: meson: enable g12a clock controller
  MAINTAINERS: Add entry for uDPU board
  ARM: davinci: da850-evm: use GPIO hogs instead of the legacy API
  arm: mediatek: add MT7629 smp bring up code
  Revert "ARM: mediatek: add MT7623a smp bringup code"
  dt-bindings: soc: fix typo of MT8173 power dt-bindings
  ARM: meson: remove COMMON_CLK_AMLOGIC selection
  arm64: meson: remove COMMON_CLK_AMLOGIC selection
  ARM: lpc32xx: remove platform data of ARM PL111 LCD controller
  ARM: lpc32xx: remove platform data of ARM PL180 SD/MMC controller
  ARM: lpc32xx: Use kmemdup to replace duplicating its implementation
  ...
parents fa29f5ba 49b35cd5

MAINTAINERS

+22 −22
Original line number Diff line number Diff line
@@ -1036,26 +1036,26 @@ F: drivers/net/appletalk/ 
F:	net/appletalk/



APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT

M:	Duc Dang <dhdang@apm.com>

M:	Khuong Dinh <khuong@os.amperecomputing.com>

S:	Supported

F:	arch/arm64/boot/dts/apm/



APPLIED MICRO (APM) X-GENE SOC EDAC

M:	Loc Ho <lho@apm.com>

M:	Khuong Dinh <khuong@os.amperecomputing.com>

S:	Supported

F:	drivers/edac/xgene_edac.c

F:	Documentation/devicetree/bindings/edac/apm-xgene-edac.txt



APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER

M:	Iyappan Subramanian <isubramanian@apm.com>

M:	Keyur Chudgar <kchudgar@apm.com>

M:	Iyappan Subramanian <iyappan@os.amperecomputing.com>

M:	Keyur Chudgar <keyur@os.amperecomputing.com>

S:	Supported

F:	drivers/net/ethernet/apm/xgene-v2/



APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER

M:	Iyappan Subramanian <isubramanian@apm.com>

M:	Keyur Chudgar <kchudgar@apm.com>

M:	Quan Nguyen <qnguyen@apm.com>

M:	Iyappan Subramanian <iyappan@os.amperecomputing.com>

M:	Keyur Chudgar <keyur@os.amperecomputing.com>

M:	Quan Nguyen <quan@os.amperecomputing.com>

S:	Supported

F:	drivers/net/ethernet/apm/xgene/

F:	drivers/net/phy/mdio-xgene.c
@@ -1063,7 +1063,7 @@ F: Documentation/devicetree/bindings/net/apm-xgene-enet.txt 
F:	Documentation/devicetree/bindings/net/apm-xgene-mdio.txt



APPLIED MICRO (APM) X-GENE SOC PMU

M:	Tai Nguyen <ttnguyen@apm.com>

M:	Khuong Dinh <khuong@os.amperecomputing.com>

S:	Supported

F:	drivers/perf/xgene_pmu.c

F:	Documentation/perf/xgene-pmu.txt
@@ -1530,21 +1530,14 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE 
M:	Shawn Guo <shawnguo@kernel.org>

M:	Sascha Hauer <s.hauer@pengutronix.de>

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

R:	Fabio Estevam <fabio.estevam@nxp.com>

R:	Fabio Estevam <festevam@gmail.com>

R:	NXP Linux Team <linux-imx@nxp.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

F:	arch/arm/mach-imx/

F:	arch/arm/mach-mxs/

F:	arch/arm/boot/dts/imx*

F:	arch/arm/configs/imx*_defconfig

F:	arch/arm64/boot/dts/freescale/imx*

F:	drivers/clk/imx/

F:	drivers/firmware/imx/

F:	drivers/soc/imx/

F:	include/linux/firmware/imx/

F:	include/soc/imx/

N:	imx

N:	mxs

X:	drivers/media/i2c/



ARM/FREESCALE VYBRID ARM ARCHITECTURE

M:	Shawn Guo <shawnguo@kernel.org>
@@ -2108,6 +2101,8 @@ Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next

S:	Supported

F:	arch/arm/boot/dts/emev2*

F:	arch/arm/boot/dts/gr-peach*

F:	arch/arm/boot/dts/iwg20d-q7*

F:	arch/arm/boot/dts/r7s*

F:	arch/arm/boot/dts/r8a*

F:	arch/arm/boot/dts/r9a*
@@ -9888,6 +9883,11 @@ S: Maintained 
F:	drivers/mtd/nand/raw/meson_*

F:	Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt



METHODE UDPU SUPPORT

M:	Vladimir Vid <vladimir.vid@sartura.hr>

S:	Maintained

F:	arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts



MICROBLAZE ARCHITECTURE

M:	Michal Simek <monstr@monstr.eu>

W:	http://www.monstr.eu/fdt/
@@ -11613,7 +11613,7 @@ F: Documentation/devicetree/bindings/pci/altera-pcie.txt 
F:	drivers/pci/controller/pcie-altera.c



PCI DRIVER FOR APPLIEDMICRO XGENE

M:	Tanmay Inamdar <tinamdar@apm.com>

M:	Toan Le <toan@os.amperecomputing.com>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained
@@ -11791,7 +11791,7 @@ F: Documentation/devicetree/bindings/pci/altera-pcie-msi.txt 
F:	drivers/pci/controller/pcie-altera-msi.c



PCI MSI DRIVER FOR APPLIEDMICRO XGENE

M:	Duc Dang <dhdang@apm.com>

M:	Toan Le <toan@os.amperecomputing.com>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained
@@ -14759,7 +14759,7 @@ S: Maintained 
F:	drivers/tty/serial/8250/8250_dw.c



SYNOPSYS DESIGNWARE APB GPIO DRIVER

M:	Hoan Tran <hotran@apm.com>

M:	Hoan Tran <hoan@os.amperecomputing.com>

L:	linux-gpio@vger.kernel.org

S:	Maintained

F:	drivers/gpio/gpio-dwapb.c

arch/arm/configs/pxa_defconfig

+0 −4
Original line number Diff line number Diff line
@@ -66,9 +66,6 @@ CONFIG_MACH_MIOA701=y 
CONFIG_PXA_EZX=y

CONFIG_MACH_MP900C=y

CONFIG_ARCH_PXA_PALM=y

CONFIG_MACH_RAUMFELD_RC=y

CONFIG_MACH_RAUMFELD_CONNECTOR=y

CONFIG_MACH_RAUMFELD_SPEAKER=y

CONFIG_PXA_SHARPSL=y

CONFIG_MACH_POODLE=y

CONFIG_MACH_CORGI=y
@@ -498,7 +495,6 @@ CONFIG_SND_PXA2XX_SOC_E800=m 
CONFIG_SND_PXA2XX_SOC_EM_X270=m

CONFIG_SND_PXA2XX_SOC_PALM27X=y

CONFIG_SND_SOC_ZYLONITE=m

CONFIG_SND_SOC_RAUMFELD=m

CONFIG_SND_PXA2XX_SOC_HX4700=m

CONFIG_SND_PXA2XX_SOC_MAGICIAN=m

CONFIG_SND_PXA2XX_SOC_MIOA701=m

arch/arm/configs/raumfeld_defconfig

deleted100644 → 0
+0 −197
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_PXA=y

CONFIG_MACH_RAUMFELD_RC=y

CONFIG_MACH_RAUMFELD_CONNECTOR=y

CONFIG_MACH_RAUMFELD_SPEAKER=y

CONFIG_NO_HZ=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_CMDLINE="console=ttyS0,115200 rw"

CONFIG_CPU_FREQ=y

CONFIG_CPU_IDLE=y

CONFIG_PM=y

CONFIG_APM_EMULATION=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_SYN_COOKIES=y

CONFIG_IPV6=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_NFTL=y

CONFIG_NFTL_RW=y

CONFIG_MTD_BLOCK2MTD=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_MARVELL=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_ISL29003=y

CONFIG_IIO=y

CONFIG_AD5446=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMSC911X=y

CONFIG_LIBERTAS=y

CONFIG_LIBERTAS_SDIO=m

CONFIG_USB_USBNET=y

# CONFIG_USB_NET_AX8817X is not set

# CONFIG_USB_NET_NET1080 is not set

CONFIG_USB_NET_MCS7830=y

# CONFIG_USB_NET_CDC_SUBSET is not set

# CONFIG_USB_NET_ZAURUS is not set

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_EETI=m

CONFIG_INPUT_MISC=y

CONFIG_INPUT_GPIO_ROTARY_ENCODER=y

CONFIG_SERIAL_PXA=y

CONFIG_SERIAL_PXA_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_PXA=y

CONFIG_SPI=y

CONFIG_SPI_DEBUG=y

CONFIG_SPI_GPIO=y

CONFIG_SPI_SPIDEV=y

CONFIG_DEBUG_GPIO=y

CONFIG_W1_MASTER_GPIO=m

CONFIG_POWER_SUPPLY=y

CONFIG_PDA_POWER=y

CONFIG_BATTERY_DS2760=m

CONFIG_SENSORS_LIS3_SPI=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_DEBUG=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_MAX8660=y

CONFIG_FB=y

CONFIG_FB_PXA=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_PWM=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_PXA2XX_SOC=y

CONFIG_SND_SOC_RAUMFELD=y

CONFIG_HID_DRAGONRISE=y

CONFIG_HID_GYRATION=y

CONFIG_HID_TWINHAN=y

CONFIG_HID_NTRIG=y

CONFIG_HID_PANTHERLORD=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_GREENASIA=y

CONFIG_HID_SMARTJOYPLUS=y

CONFIG_HID_TOPSEED=y

CONFIG_HID_THRUSTMASTER=y

CONFIG_HID_ZEROPLUS=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_FREECOM=y

CONFIG_USB_STORAGE_ISD200=y

CONFIG_USB_STORAGE_USBAT=y

CONFIG_USB_STORAGE_SDDR09=y

CONFIG_USB_STORAGE_SDDR55=y

CONFIG_MMC=y

CONFIG_MMC_PXA=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_LT3593=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PXA=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XIP=y

CONFIG_EXT3_FS=y

CONFIG_FSCACHE=y

CONFIG_FSCACHE_STATS=y

CONFIG_CACHEFILES=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NFS_FSCACHE=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_737=y

CONFIG_NLS_CODEPAGE_775=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_CODEPAGE_852=y

CONFIG_NLS_CODEPAGE_855=y

CONFIG_NLS_CODEPAGE_857=y

CONFIG_NLS_CODEPAGE_860=y

CONFIG_NLS_CODEPAGE_861=y

CONFIG_NLS_CODEPAGE_862=y

CONFIG_NLS_CODEPAGE_863=y

CONFIG_NLS_CODEPAGE_864=y

CONFIG_NLS_CODEPAGE_865=y

CONFIG_NLS_CODEPAGE_866=y

CONFIG_NLS_CODEPAGE_869=y

CONFIG_NLS_CODEPAGE_936=y

CONFIG_NLS_CODEPAGE_950=y

CONFIG_NLS_CODEPAGE_932=y

CONFIG_NLS_CODEPAGE_949=y

CONFIG_NLS_CODEPAGE_874=y

CONFIG_NLS_ISO8859_8=y

CONFIG_NLS_CODEPAGE_1250=y

CONFIG_NLS_CODEPAGE_1251=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_2=y

CONFIG_NLS_ISO8859_3=y

CONFIG_NLS_ISO8859_4=y

CONFIG_NLS_ISO8859_5=y

CONFIG_NLS_ISO8859_6=y

CONFIG_NLS_ISO8859_7=y

CONFIG_NLS_ISO8859_9=y

CONFIG_NLS_ISO8859_13=y

CONFIG_NLS_ISO8859_14=y

CONFIG_NLS_ISO8859_15=y

CONFIG_NLS_KOI8_R=y

CONFIG_NLS_KOI8_U=y

CONFIG_NLS_UTF8=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

arch/arm/mach-davinci/board-da830-evm.c

+13 −73
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/platform_device.h>

#include <linux/i2c.h>

#include <linux/platform_data/pcf857x.h>

#include <linux/platform_data/at24.h>

#include <linux/property.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/spi/spi.h>
@@ -52,62 +52,19 @@ static const short da830_evm_usb11_pins[] = { 
	-1

};



static da8xx_ocic_handler_t da830_evm_usb_ocic_handler;



static int da830_evm_usb_set_power(unsigned port, int on)

{

	gpio_set_value(ON_BD_USB_DRV, on);

	return 0;

}



static int da830_evm_usb_get_power(unsigned port)

{

	return gpio_get_value(ON_BD_USB_DRV);

}



static int da830_evm_usb_get_oci(unsigned port)

{

	return !gpio_get_value(ON_BD_USB_OVC);

}



static irqreturn_t da830_evm_usb_ocic_irq(int, void *);



static int da830_evm_usb_ocic_notify(da8xx_ocic_handler_t handler)

{

	int irq 	= gpio_to_irq(ON_BD_USB_OVC);

	int error	= 0;



	if (handler != NULL) {

		da830_evm_usb_ocic_handler = handler;



		error = request_irq(irq, da830_evm_usb_ocic_irq,

				    IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

				    "OHCI over-current indicator", NULL);

		if (error)

			pr_err("%s: could not request IRQ to watch over-current indicator changes\n",

			       __func__);

	} else

		free_irq(irq, NULL);



	return error;

}

static struct gpiod_lookup_table da830_evm_usb_gpio_lookup = {

	.dev_id		= "ohci-da8xx",

	.table = {

		GPIO_LOOKUP("davinci_gpio", ON_BD_USB_DRV, "vbus", 0),

		GPIO_LOOKUP("davinci_gpio", ON_BD_USB_OVC, "oc", 0),

	},

};



static struct da8xx_ohci_root_hub da830_evm_usb11_pdata = {

	.set_power	= da830_evm_usb_set_power,

	.get_power	= da830_evm_usb_get_power,

	.get_oci	= da830_evm_usb_get_oci,

	.ocic_notify	= da830_evm_usb_ocic_notify,



	/* TPS2065 switch @ 5V */

	.potpgt		= (3 + 1) / 2,	/* 3 ms max */

};



static irqreturn_t da830_evm_usb_ocic_irq(int irq, void *dev_id)

{

	da830_evm_usb_ocic_handler(&da830_evm_usb11_pdata, 1);

	return IRQ_HANDLED;

}



static __init void da830_evm_usb_init(void)

{

	int ret;
@@ -142,21 +99,7 @@ static __init void da830_evm_usb_init(void) 
		return;

	}



	ret = gpio_request(ON_BD_USB_DRV, "ON_BD_USB_DRV");

	if (ret) {

		pr_err("%s: failed to request GPIO for USB 1.1 port power control: %d\n",

		       __func__, ret);

		return;

	}

	gpio_direction_output(ON_BD_USB_DRV, 0);



	ret = gpio_request(ON_BD_USB_OVC, "ON_BD_USB_OVC");

	if (ret) {

		pr_err("%s: failed to request GPIO for USB 1.1 port over-current indicator: %d\n",

		       __func__, ret);

		return;

	}

	gpio_direction_input(ON_BD_USB_OVC);

	gpiod_add_lookup_table(&da830_evm_usb_gpio_lookup);



	ret = da8xx_register_usb11(&da830_evm_usb11_pdata);

	if (ret)
@@ -457,12 +400,9 @@ static struct nvmem_cell_lookup da830_evm_nvmem_cell_lookup = { 
	.con_id		= "mac-address",

};



static struct at24_platform_data da830_evm_i2c_eeprom_info = {

	.byte_len	= SZ_256K / 8,

	.page_size	= 64,

	.flags		= AT24_FLAG_ADDR16,

	.setup		= davinci_get_mac_addr,

	.context	= (void *)0x7f00,

static const struct property_entry da830_evm_i2c_eeprom_properties[] = {

	PROPERTY_ENTRY_U32("pagesize", 64),

	{ }

};



static int __init da830_evm_ui_expander_setup(struct i2c_client *client,
@@ -496,7 +436,7 @@ static struct pcf857x_platform_data __initdata da830_evm_ui_expander_info = { 
static struct i2c_board_info __initdata da830_evm_i2c_devices[] = {

	{

		I2C_BOARD_INFO("24c256", 0x50),

		.platform_data	= &da830_evm_i2c_eeprom_info,

		.properties = da830_evm_i2c_eeprom_properties,

	},

	{

		I2C_BOARD_INFO("tlv320aic3x", 0x18),

arch/arm/mach-davinci/board-da850-evm.c

+14 −36
Original line number Diff line number Diff line
@@ -150,32 +150,6 @@ static struct spi_board_info da850evm_spi_info[] = { 
	},

};



#ifdef CONFIG_MTD

static void da850_evm_m25p80_notify_add(struct mtd_info *mtd)

{

	char *mac_addr = davinci_soc_info.emac_pdata->mac_addr;

	size_t retlen;



	if (!strcmp(mtd->name, "MAC-Address")) {

		mtd_read(mtd, 0, ETH_ALEN, &retlen, mac_addr);

		if (retlen == ETH_ALEN)

			pr_info("Read MAC addr from SPI Flash: %pM\n",

				mac_addr);

	}

}



static struct mtd_notifier da850evm_spi_notifier = {

	.add	= da850_evm_m25p80_notify_add,

};



static void da850_evm_setup_mac_addr(void)

{

	register_mtd_user(&da850evm_spi_notifier);

}

#else

static void da850_evm_setup_mac_addr(void) { }

#endif



static struct mtd_partition da850_evm_norflash_partition[] = {

	{

		.name           = "bootloaders + env",
@@ -1064,6 +1038,17 @@ static const short da850_evm_rmii_pins[] = { 
	-1

};



static struct gpiod_hog da850_evm_emac_gpio_hogs[] = {

	{

		.chip_label	= "davinci_gpio",

		.chip_hwnum	= DA850_MII_MDIO_CLKEN_PIN,

		.line_name	= "mdio_clk_en",

		.lflags		= 0,

		/* dflags set in da850_evm_config_emac() */

	},

	{ }

};



static int __init da850_evm_config_emac(void)

{

	void __iomem *cfg_chip3_base;
@@ -1102,14 +1087,9 @@ static int __init da850_evm_config_emac(void) 
	if (ret)

		pr_warn("%s:GPIO(2,6) mux setup failed\n", __func__);



	ret = gpio_request(DA850_MII_MDIO_CLKEN_PIN, "mdio_clk_en");

	if (ret) {

		pr_warn("Cannot open GPIO %d\n", DA850_MII_MDIO_CLKEN_PIN);

		return ret;

	}



	/* Enable/Disable MII MDIO clock */

	gpio_direction_output(DA850_MII_MDIO_CLKEN_PIN, rmii_en);

	da850_evm_emac_gpio_hogs[0].dflags = rmii_en ? GPIOD_OUT_HIGH

						     : GPIOD_OUT_LOW;

	gpiod_add_hogs(da850_evm_emac_gpio_hogs);



	soc_info->emac_pdata->phy_id = DA850_EVM_PHY_ID;
@@ -1494,8 +1474,6 @@ static __init void da850_evm_init(void) 
	if (ret)

		pr_warn("%s: SATA registration failed: %d\n", __func__, ret);



	da850_evm_setup_mac_addr();



	ret = da8xx_register_rproc();

	if (ret)

		pr_warn("%s: dsp/rproc registration failed: %d\n",