]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ARM: dts: dra72-evm: remove cpsw gpio hogging and add mode-gpios
authorMugunthan V N <mugunthanvnm@ti.com>
Mon, 21 Sep 2015 14:53:51 +0000 (20:23 +0530)
committerTony Lindgren <tony@atomide.com>
Tue, 20 Oct 2015 16:16:21 +0000 (09:16 -0700)
With the current implementation of GPIO hogging and with
gpio-pcf857x is built as module, ethernet doesn't work on boot
and doesn't throw any error/warning to user. Ethernet becomes
operational when inserting gpio-pcf857x module, even this time
there is no error/warning logs to user that ethernet is
operational.

When using with NFS rootfs and gpio-pcf857x as module, board
doesn't boot as it doesn't get any ip address and doesn't throw
any error/warning. To over come this, now cpsw driver tries to
get mode-gpios. When gpio-pcf857x is built as module it will
throw error, so that user can decide either to built in
gpio-pcf857x to continue with nfs boot or choose alternate rootfs
filesystem like sd/ramdisk.

When using mmc/ramdisk as root fs, cpsw will probe defer and
re-probes again when gpio-pcf857x module is inserted and ethernet
becomes operational.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/dra72-evm.dts

index 27e414295accb01a6fd15c8812abe33518a25b13..d6104d5f0c0181ac8a880db0b67e29a3d65aaf19 100644 (file)
                interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
                interrupt-controller;
                #interrupt-cells = <2>;
-
-               cpsw_sel_s0 {
-                       gpio-hog;
-                       gpios = <4 GPIO_ACTIVE_HIGH>;
-                       output-low;
-               };
        };
 
        tlv320aic3106: tlv320aic3106@19 {
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
        slaves = <1>;
+       mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_HIGH>;
 };
 
 &cpsw_emac0 {