Skip to content

Commit

Permalink
Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/conne…
Browse files Browse the repository at this point in the history 
…ctivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-3.14.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y

* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  ARM: dts: am57xx-evm/beagle-x15: remove cpsw, mdio, usb and mmc sleep pinmux

Signed-off-by: Texas Instruments Auto Merger <[email protected]>
  • Loading branch information
Texas Instruments Auto Merger committed Mar 6, 2015
2 parents 406ea53 + bd92519 commit 60f19e0
Showing 1 changed file with 2 additions and 144 deletions.
146 changes: 2 additions & 144 deletions arch/arm/boot/dts/am57xx-beagle-x15.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@

extcon: extcon {
compatible = "linux,extcon-gpio";
pinctrl-names = "default";
pinctrl-0 = <&extcon_pins_default>;

gpios = <&gpio7 24 GPIO_ACTIVE_HIGH>;
cable-name = "USB-HOST";
Expand Down Expand Up @@ -219,18 +217,6 @@
>;
};

mmc1_pins_sleep: mmc1_pins_sleep {
pinctrl-single,pins = <
0x354 (PIN_INPUT | MUX_MODE15)
0x358 (PIN_INPUT | MUX_MODE15)
0x35c (PIN_INPUT | MUX_MODE15)
0x360 (PIN_INPUT | MUX_MODE15)
0x364 (PIN_INPUT | MUX_MODE15)
0x368 (PIN_INPUT | MUX_MODE15)
0x36c (PIN_INPUT | MUX_MODE15)
>;
};

mmc1_pins_hs: mmc1_pins_hs {
pinctrl-single,pins = <
0x354 (PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_clk.clk */
Expand All @@ -257,21 +243,6 @@
>;
};

mmc2_pins_sleep: mmc2_pins_sleep {
pinctrl-single,pins = <
0x9c (PIN_INPUT | MUX_MODE15)
0xb0 (PIN_INPUT | MUX_MODE15)
0xa0 (PIN_INPUT | MUX_MODE15)
0xa4 (PIN_INPUT | MUX_MODE15)
0xa8 (PIN_INPUT | MUX_MODE15)
0xac (PIN_INPUT | MUX_MODE15)
0x8c (PIN_INPUT | MUX_MODE15)
0x90 (PIN_INPUT | MUX_MODE15)
0x94 (PIN_INPUT | MUX_MODE15)
0x98 (PIN_INPUT | MUX_MODE15)
>;
};

mmc2_pins_hs: mmc2_pins_hs {
pinctrl-single,pins = <
0x9c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */
Expand All @@ -287,86 +258,6 @@
>;
};

cpsw_pins_default: cpsw_pins_default {
pinctrl-single,pins = <
/* Slave 1 */
0x250 (PIN_OUTPUT | MUX_MODE0) /* rgmii1_tclk */
0x254 (PIN_OUTPUT | MUX_MODE0) /* rgmii1_tctl */
0x258 (PIN_OUTPUT | MUX_MODE0) /* rgmii1_td3 */
0x25c (PIN_OUTPUT | MUX_MODE0) /* rgmii1_td2 */
0x260 (PIN_OUTPUT | MUX_MODE0) /* rgmii1_td1 */
0x264 (PIN_OUTPUT | MUX_MODE0) /* rgmii1_td0 */
0x268 (PIN_INPUT | MUX_MODE0) /* rgmii1_rclk */
0x26c (PIN_INPUT | MUX_MODE0) /* rgmii1_rctl */
0x270 (PIN_INPUT | MUX_MODE0) /* rgmii1_rd3 */
0x274 (PIN_INPUT | MUX_MODE0) /* rgmii1_rd2 */
0x278 (PIN_INPUT | MUX_MODE0) /* rgmii1_rd1 */
0x27c (PIN_INPUT | MUX_MODE0) /* rgmii1_rd0 */

/* Slave 2 */
0x198 (PIN_OUTPUT | MUX_MODE3) /* rgmii2_tclk */
0x19c (PIN_OUTPUT | MUX_MODE3) /* rgmii2_tctl */
0x1a0 (PIN_OUTPUT | MUX_MODE3) /* rgmii2_td3 */
0x1a4 (PIN_OUTPUT | MUX_MODE3) /* rgmii2_td2 */
0x1a8 (PIN_OUTPUT | MUX_MODE3) /* rgmii2_td1 */
0x1ac (PIN_OUTPUT | MUX_MODE3) /* rgmii2_td0 */
0x1b0 (PIN_INPUT | MUX_MODE3) /* rgmii2_rclk */
0x1b4 (PIN_INPUT | MUX_MODE3) /* rgmii2_rctl */
0x1b8 (PIN_INPUT | MUX_MODE3) /* rgmii2_rd3 */
0x1bc (PIN_INPUT | MUX_MODE3) /* rgmii2_rd2 */
0x1c0 (PIN_INPUT | MUX_MODE3) /* rgmii2_rd1 */
0x1c4 (PIN_INPUT | MUX_MODE3) /* rgmii2_rd0 */
>;

};

cpsw_pins_sleep: cpsw_pins_sleep {
pinctrl-single,pins = <
/* Slave 1 */
0x250 (PIN_INPUT | MUX_MODE15)
0x254 (PIN_INPUT | MUX_MODE15)
0x258 (PIN_INPUT | MUX_MODE15)
0x25c (PIN_INPUT | MUX_MODE15)
0x260 (PIN_INPUT | MUX_MODE15)
0x264 (PIN_INPUT | MUX_MODE15)
0x268 (PIN_INPUT | MUX_MODE15)
0x26c (PIN_INPUT | MUX_MODE15)
0x270 (PIN_INPUT | MUX_MODE15)
0x274 (PIN_INPUT | MUX_MODE15)
0x278 (PIN_INPUT | MUX_MODE15)
0x27c (PIN_INPUT | MUX_MODE15)

/* Slave 1 */
0x198 (PIN_INPUT | MUX_MODE15)
0x19c (PIN_INPUT | MUX_MODE15)
0x1a0 (PIN_INPUT | MUX_MODE15)
0x1a4 (PIN_INPUT | MUX_MODE15)
0x1a8 (PIN_INPUT | MUX_MODE15)
0x1ac (PIN_INPUT | MUX_MODE15)
0x1b0 (PIN_INPUT | MUX_MODE15)
0x1b4 (PIN_INPUT | MUX_MODE15)
0x1b8 (PIN_INPUT | MUX_MODE15)
0x1bc (PIN_INPUT | MUX_MODE15)
0x1c0 (PIN_INPUT | MUX_MODE15)
0x1c4 (PIN_INPUT | MUX_MODE15)
>;
};

davinci_mdio_pins_default: davinci_mdio_pins_default {
pinctrl-single,pins = <
/* MDIO */
0x23c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_mclk */
0x240 (PIN_INPUT_PULLUP | MUX_MODE0) /* mdio_d */
>;
};

davinci_mdio_pins_sleep: davinci_mdio_pins_sleep {
pinctrl-single,pins = <
0x23c (PIN_INPUT | MUX_MODE15)
0x240 (PIN_INPUT | MUX_MODE15)
>;
};

mcp79410_pins_default: mcp79410_pins_default {
pinctrl-single,pins = <
0x424 (PIN_INPUT_PULLUP | MUX_MODE1) /* wakeup3.sys_nirq1 */
Expand All @@ -381,24 +272,6 @@
>;
};

usb1_pins: pinmux_usb1_pins {
pinctrl-single,pins = <
0x280 (PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */
>;
};

usb2_pins: pinmux_usb2_pins {
pinctrl-single,pins = <
0x284 (PIN_INPUT_SLEW | MUX_MODE0) /* usb2_drvvbus */
>;
};

extcon_pins_default: extcon_pins_default {
pinctrl-single,pins = <
0x3e8 (PIN_INPUT | MUX_MODE14) /* uart1_ctsn.gpio7_24 */
>;
};

clkout2_pins_default: clkout2_pins_default {
pinctrl-single,pins = <
0x294 (PIN_OUTPUT_PULLDOWN | MUX_MODE9) /* xref_clk0.clkout2 */
Expand Down Expand Up @@ -668,9 +541,6 @@

&mac {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_pins_default>;
pinctrl-1 = <&cpsw_pins_sleep>;
dual_emac;
};

Expand All @@ -686,17 +556,10 @@
dual_emac_res_vlan = <2>;
};

&davinci_mdio {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_pins_default>;
pinctrl-1 = <&davinci_mdio_pins_sleep>;
};

&mmc1 {
status = "okay";
pinctrl-names = "default", "sleep", "hs";
pinctrl-names = "default", "hs";
pinctrl-0 = <&mmc1_pins_default>;
pinctrl-1 = <&mmc1_pins_sleep>;
pinctrl-2 = <&mmc1_pins_hs>;
vmmc-supply = <&ldo1_reg>;
vmmc_aux-supply = <&vdd_3v3>;
Expand All @@ -707,9 +570,8 @@

&mmc2 {
status = "okay";
pinctrl-names = "default", "sleep", "hs";
pinctrl-names = "default", "hs";
pinctrl-0 = <&mmc2_pins_default>;
pinctrl-1 = <&mmc2_pins_sleep>;
pinctrl-2 = <&mmc2_pins_hs>;
vmmc-supply = <&vdd_3v3>;
bus-width = <8>;
Expand Down Expand Up @@ -839,8 +701,6 @@

&usb1 {
dr_mode = "host";
pinctrl-names = "default";
pinctrl-0 = <&usb1_pins>;
};

&omap_dwc3_2 {
Expand All @@ -853,8 +713,6 @@
* If R321 is DNI and R320 is populated, this should be "host"
*/
dr_mode = "peripheral";
pinctrl-names = "default";
pinctrl-0 = <&usb2_pins>;
};

&mcasp3 {
Expand Down

0 comments on commit 60f19e0

Please sign in to comment.