提交 ca04b3cc 编写于 作者: L Linus Torvalds

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 small collection of fixes, sort of the usual at this point, all for
  i.MX or OMAP:

   - Enable ULPI drivers on i.MX to avoid a hang

   - Pinctrl fix for touchscreen on i.MX51 ZII RDU1

   - Fixes for ethernet clock references on am3517

   - mmc0 write protect detection fix for am335x

   - kzalloc->kcalloc conversion in an OMAP driver

   - USB metastability fix for USB on dra7

   - Fix touchscreen wakeup on am437x"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: imx_v4_v5_defconfig: Select ULPI support
  ARM: imx_v6_v7_defconfig: Select ULPI support
  ARM: dts: omap3: Fix am3517 mdio and emac clock references
  ARM: dts: am335x-bone-common: Fix mmc0 Write Protect
  bus: ti-sysc: Use 2-factor allocator arguments
  ARM: dts: dra7: Disable metastability workaround for USB2
  ARM: dts: imx51-zii-rdu1: fix touchscreen pinctrl
  ARM: dts: am437x: make edt-ft5x06 a wakeup source
...@@ -168,7 +168,6 @@ ...@@ -168,7 +168,6 @@
AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat3.mmc0_dat3 */ AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_dat3.mmc0_dat3 */
AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_cmd.mmc0_cmd */ AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_cmd.mmc0_cmd */
AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_clk.mmc0_clk */ AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc0_clk.mmc0_clk */
AM33XX_IOPAD(0x9a0, PIN_INPUT | MUX_MODE4) /* mcasp0_aclkr.mmc0_sdwp */
>; >;
}; };
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
ti,davinci-ctrl-ram-size = <0x2000>; ti,davinci-ctrl-ram-size = <0x2000>;
ti,davinci-rmii-en = /bits/ 8 <1>; ti,davinci-rmii-en = /bits/ 8 <1>;
local-mac-address = [ 00 00 00 00 00 00 ]; local-mac-address = [ 00 00 00 00 00 00 ];
clocks = <&emac_ick>;
clock-names = "ick";
}; };
davinci_mdio: ethernet@5c030000 { davinci_mdio: ethernet@5c030000 {
...@@ -49,6 +51,8 @@ ...@@ -49,6 +51,8 @@
bus_freq = <1000000>; bus_freq = <1000000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&emac_fck>;
clock-names = "fck";
}; };
uart4: serial@4809e000 { uart4: serial@4809e000 {
......
...@@ -610,6 +610,8 @@ ...@@ -610,6 +610,8 @@
touchscreen-size-x = <480>; touchscreen-size-x = <480>;
touchscreen-size-y = <272>; touchscreen-size-y = <272>;
wakeup-source;
}; };
tlv320aic3106: tlv320aic3106@1b { tlv320aic3106: tlv320aic3106@1b {
......
...@@ -1580,7 +1580,6 @@ ...@@ -1580,7 +1580,6 @@
dr_mode = "otg"; dr_mode = "otg";
snps,dis_u3_susphy_quirk; snps,dis_u3_susphy_quirk;
snps,dis_u2_susphy_quirk; snps,dis_u2_susphy_quirk;
snps,dis_metastability_quirk;
}; };
}; };
...@@ -1608,6 +1607,7 @@ ...@@ -1608,6 +1607,7 @@
dr_mode = "otg"; dr_mode = "otg";
snps,dis_u3_susphy_quirk; snps,dis_u3_susphy_quirk;
snps,dis_u2_susphy_quirk; snps,dis_u2_susphy_quirk;
snps,dis_metastability_quirk;
}; };
}; };
......
...@@ -770,7 +770,7 @@ ...@@ -770,7 +770,7 @@
pinctrl_ts: tsgrp { pinctrl_ts: tsgrp {
fsl,pins = < fsl,pins = <
MX51_PAD_CSI1_D8__GPIO3_12 0x85 MX51_PAD_CSI1_D8__GPIO3_12 0x04
MX51_PAD_CSI1_D9__GPIO3_13 0x85 MX51_PAD_CSI1_D9__GPIO3_13 0x85
>; >;
}; };
......
...@@ -141,9 +141,11 @@ CONFIG_USB_STORAGE=y ...@@ -141,9 +141,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_USB_CHIPIDEA_ULPI=y
CONFIG_NOP_USB_XCEIV=y CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_ETH=m CONFIG_USB_ETH=m
CONFIG_USB_ULPI_BUS=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_PLTFM=y
......
...@@ -302,6 +302,7 @@ CONFIG_USB_STORAGE=y ...@@ -302,6 +302,7 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_USB_CHIPIDEA_ULPI=y
CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_FTDI_SIO=m
...@@ -338,6 +339,7 @@ CONFIG_USB_GADGETFS=m ...@@ -338,6 +339,7 @@ CONFIG_USB_GADGETFS=m
CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_MASS_STORAGE=m CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_G_SERIAL=m CONFIG_USB_G_SERIAL=m
CONFIG_USB_ULPI_BUS=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_PLTFM=y
......
...@@ -169,9 +169,9 @@ static int sysc_get_clocks(struct sysc *ddata) ...@@ -169,9 +169,9 @@ static int sysc_get_clocks(struct sysc *ddata)
const char *name; const char *name;
int nr_fck = 0, nr_ick = 0, i, error = 0; int nr_fck = 0, nr_ick = 0, i, error = 0;
ddata->clock_roles = devm_kzalloc(ddata->dev, ddata->clock_roles = devm_kcalloc(ddata->dev,
sizeof(*ddata->clock_roles) *
SYSC_MAX_CLOCKS, SYSC_MAX_CLOCKS,
sizeof(*ddata->clock_roles),
GFP_KERNEL); GFP_KERNEL);
if (!ddata->clock_roles) if (!ddata->clock_roles)
return -ENOMEM; return -ENOMEM;
...@@ -200,8 +200,8 @@ static int sysc_get_clocks(struct sysc *ddata) ...@@ -200,8 +200,8 @@ static int sysc_get_clocks(struct sysc *ddata)
return -EINVAL; return -EINVAL;
} }
ddata->clocks = devm_kzalloc(ddata->dev, ddata->clocks = devm_kcalloc(ddata->dev,
sizeof(*ddata->clocks) * ddata->nr_clocks, ddata->nr_clocks, sizeof(*ddata->clocks),
GFP_KERNEL); GFP_KERNEL);
if (!ddata->clocks) if (!ddata->clocks)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册