From: Tony Lindgren <tony@atomide.com>
Date: Mon, 25 Jan 2016 18:46:21 +0000 (-0800)
Subject: Merge branch 'enable-devices' into omap-for-v4.5/fixes
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7e3b1207705c10ada363bbc7d0235730ce1f5b79;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'enable-devices' into omap-for-v4.5/fixes
---

7e3b1207705c10ada363bbc7d0235730ce1f5b79
diff --cc arch/arm/boot/dts/omap5-board-common.dtsi
index 41e80e7f20be,888412c63f97..902657d6713b
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@@ -223,23 -213,16 +223,23 @@@
  		>;
  	};
  
 +	/* TI trees use GPIO mode; msecure mode does not work reliably? */
 +	palmas_msecure_pins: palmas_msecure_pins {
 +		pinctrl-single,pins = <
 +			OMAP5_IOPAD(0x180, PIN_OUTPUT | MUX_MODE6) /* gpio8_234 */
 +		>;
 +	};
 +
  	usbhost_pins: pinmux_usbhost_pins {
  		pinctrl-single,pins = <
- 			0x84 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe */
- 			0x86 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_data */
+ 			OMAP5_IOPAD(0x0c4, PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe */
+ 			OMAP5_IOPAD(0x0c6, PIN_INPUT | MUX_MODE0) /* usbb2_hsic_data */
  
- 			0x19e (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_strobe */
- 			0x1a0 (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_data */
+ 			OMAP5_IOPAD(0x1de, PIN_INPUT | MUX_MODE0) /* usbb3_hsic_strobe */
+ 			OMAP5_IOPAD(0x1e0, PIN_INPUT | MUX_MODE0) /* usbb3_hsic_data */
  
- 			0x70 (PIN_OUTPUT | MUX_MODE6) /* gpio3_80 HUB_NRESET */
- 			0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 ETH_NRESET */
+ 			OMAP5_IOPAD(0x0b0, PIN_OUTPUT | MUX_MODE6) /* gpio3_80 HUB_NRESET */
+ 			OMAP5_IOPAD(0x0ae, PIN_OUTPUT | MUX_MODE6) /* gpio3_79 ETH_NRESET */
  		>;
  	};
  
@@@ -295,15 -278,9 +295,15 @@@
  			&usbhost_wkup_pins
  	>;
  
 +	palmas_sys_nirq_pins: pinmux_palmas_sys_nirq_pins {
 +		pinctrl-single,pins = <
 +			OMAP5_IOPAD(0x068, PIN_INPUT_PULLUP | MUX_MODE0) /* sys_nirq1 */
 +		>;
 +	};
 +
  	usbhost_wkup_pins: pinmux_usbhost_wkup_pins {
  		pinctrl-single,pins = <
- 			0x1A (PIN_OUTPUT | MUX_MODE0) /* fref_clk1_out, USB hub clk */
+ 			OMAP5_IOPAD(0x05a, PIN_OUTPUT | MUX_MODE0) /* fref_clk1_out, USB hub clk */
  		>;
  	};
  
diff --cc arch/arm/mach-omap2/devices.c
index f0f9901d90b0,9cda974a3009..d7f1d69daf6d
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -65,24 -66,34 +65,8 @@@ static int __init omap3_l3_init(void
  }
  omap_postcore_initcall(omap3_l3_init);
  
 -#if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE)
 -static inline void __init omap_init_mbox(void)
 -{
 -	struct omap_hwmod *oh;
 -	struct platform_device *pdev;
 -	struct omap_mbox_pdata *pdata;
 -
 -	oh = omap_hwmod_lookup("mailbox");
 -	if (!oh) {
 -		pr_err("%s: unable to find hwmod\n", __func__);
 -		return;
 -	}
 -	if (!oh->dev_attr) {
 -		pr_err("%s: hwmod doesn't have valid attrs\n", __func__);
 -		return;
 -	}
 -
 -	pdata = (struct omap_mbox_pdata *)oh->dev_attr;
 -	pdev = omap_device_build("omap-mailbox", -1, oh, pdata, sizeof(*pdata));
 -	WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",
 -						__func__, PTR_ERR(pdev));
 -}
 -#else
 -static inline void omap_init_mbox(void) { }
 -#endif /* CONFIG_OMAP2PLUS_MBOX */
 -
  static inline void omap_init_sti(void) {}
  
- #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
- 
- static struct platform_device omap_pcm = {
- 	.name	= "omap-pcm-audio",
- 	.id	= -1,
- };
- 
- static void omap_init_audio(void)
- {
- 	platform_device_register(&omap_pcm);
- }
- 
- #else
- static inline void omap_init_audio(void) {}
- #endif
- 
  #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
  
  #include <linux/platform_data/spi-omap2-mcspi.h>
@@@ -212,13 -223,13 +196,12 @@@ static int __init omap2_init_devices(vo
  	if (!of_have_populated_dt())
  		pinctrl_provide_dummies();
  
- 	/*
- 	 * please keep these calls, and their implementations above,
- 	 * in alphabetical order so they're easier to sort through.
- 	 */
- 	omap_init_audio();
  	/* If dtb is there, the devices will be created dynamically */
  	if (!of_have_populated_dt()) {
+ 		/*
+ 		 * please keep these calls, and their implementations above,
+ 		 * in alphabetical order so they're easier to sort through.
+ 		 */
 -		omap_init_mbox();
  		omap_init_mcspi();
  		omap_init_sham();
  		omap_init_aes();