On 09/10/2014 08:37 AM, Mugunthan V N wrote:
> Adding CPSW phy-id, CPSW and MDIO pinmux configuration for active and
> sleep states and enable them in board evm dts file.
>
> Signed-off-by: Mugunthan V N <mugunthanvnm@xxxxxx>
> ---
> arch/arm/boot/dts/dra7-evm.dts | 107 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 107 insertions(+)
>
> diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
> index 50f8022..e5c4e33 100644
> --- a/arch/arm/boot/dts/dra7-evm.dts
> +++ b/arch/arm/boot/dts/dra7-evm.dts
> @@ -151,6 +151,87 @@
> 0xd0 (PIN_OUTPUT | MUX_MODE0) /* gpmc_be0n_cle */
> >;
> };
> +
> + cpsw_default: cpsw_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 */
Cant we do this based on emac0 and emac1?
> +
> + /* Slave 2 */
> + 0x198 (PIN_OUTPUT | MUX_MODE3) /* rgmii2_tclk */
NAK. reason comment style -> we use the style:
/* mode0_name.mode3_name */
> + 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_sleep: cpsw_sleep {
> + pinctrl-single,pins = <
> + /* Slave 1 */
> + 0x250 (MUX_MODE15)
> + 0x254 (MUX_MODE15)
> + 0x258 (MUX_MODE15)
> + 0x25c (MUX_MODE15)
> + 0x260 (MUX_MODE15)
> + 0x264 (MUX_MODE15)
> + 0x268 (MUX_MODE15)
> + 0x26c (MUX_MODE15)
> + 0x270 (MUX_MODE15)
> + 0x274 (MUX_MODE15)
> + 0x278 (MUX_MODE15)
> + 0x27c (MUX_MODE15)
> +
> + /* Slave 1 */
^^ Slave 1?
> + 0x198 (MUX_MODE15)
> + 0x19c (MUX_MODE15)
> + 0x1a0 (MUX_MODE15)
> + 0x1a4 (MUX_MODE15)
> + 0x1a8 (MUX_MODE15)
> + 0x1ac (MUX_MODE15)
> + 0x1b0 (MUX_MODE15)
> + 0x1b4 (MUX_MODE15)
> + 0x1b8 (MUX_MODE15)
> + 0x1bc (MUX_MODE15)
> + 0x1c0 (MUX_MODE15)
> + 0x1c4 (MUX_MODE15)
> + >;
> + };
> +
> + davinci_mdio_default: davinci_mdio_default {
> + pinctrl-single,pins = <
> + /* MDIO */
^^ you can drop the comment. it is redundant.
> + 0x23c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_data */
> + 0x240 (PIN_INPUT_PULLUP | MUX_MODE0) /* mdio_clk */
> + >;
> + };
> +
> + davinci_mdio_sleep: davinci_mdio_sleep {
> + pinctrl-single,pins = <
> + 0x23c (MUX_MODE15)
> + 0x240 (MUX_MODE15)
> + >;
> + };
> +
> };
>
> &i2c1 {
> @@ -504,3 +585,29 @@
> &usb2_phy2 {
> phy-supply = <&ldousb_reg>;
> };
> +
> +&mac {
> + status = "okay";
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&cpsw_default>;
> + pinctrl-1 = <&cpsw_sleep>;
> + dual_emac;
> +};
> +
> +&cpsw_emac0 {
> + phy_id = <&davinci_mdio>, <2>;
> + phy-mode = "rgmii";
> + dual_emac_res_vlan = <1>;
> +};
> +
> +&cpsw_emac1 {
> + phy_id = <&davinci_mdio>, <3>;
> + phy-mode = "rgmii";
> + dual_emac_res_vlan = <2>;
> +};
> +
> +&davinci_mdio {
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&davinci_mdio_default>;
> + pinctrl-1 = <&davinci_mdio_sleep>;
> +};
>
--
Regards,
Nishanth Menon
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
