|
@@ -27,7 +27,6 @@
|
|
|
#include <linux/mtd/nand.h>
|
|
|
#include <linux/mtd/fsmc.h>
|
|
|
#include <linux/pinctrl/machine.h>
|
|
|
-#include <linux/pinctrl/consumer.h>
|
|
|
#include <linux/pinctrl/pinconf-generic.h>
|
|
|
#include <linux/dma-mapping.h>
|
|
|
#include <linux/platform_data/clk-u300.h>
|
|
@@ -1543,39 +1542,6 @@ static struct pinctrl_map __initdata u300_pinmux_map[] = {
|
|
|
pin_highz_conf),
|
|
|
};
|
|
|
|
|
|
-struct u300_mux_hog {
|
|
|
- struct device *dev;
|
|
|
- struct pinctrl *p;
|
|
|
-};
|
|
|
-
|
|
|
-static struct u300_mux_hog u300_mux_hogs[] = {
|
|
|
- {
|
|
|
- .dev = &uart0_device.dev,
|
|
|
- },
|
|
|
- {
|
|
|
- .dev = &mmcsd_device.dev,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static int __init u300_pinctrl_fetch(void)
|
|
|
-{
|
|
|
- int i;
|
|
|
-
|
|
|
- for (i = 0; i < ARRAY_SIZE(u300_mux_hogs); i++) {
|
|
|
- struct pinctrl *p;
|
|
|
-
|
|
|
- p = pinctrl_get_select_default(u300_mux_hogs[i].dev);
|
|
|
- if (IS_ERR(p)) {
|
|
|
- pr_err("u300: could not get pinmux hog for dev %s\n",
|
|
|
- dev_name(u300_mux_hogs[i].dev));
|
|
|
- continue;
|
|
|
- }
|
|
|
- u300_mux_hogs[i].p = p;
|
|
|
- }
|
|
|
- return 0;
|
|
|
-}
|
|
|
-subsys_initcall(u300_pinctrl_fetch);
|
|
|
-
|
|
|
/*
|
|
|
* Notice that AMBA devices are initialized before platform devices.
|
|
|
*
|