lkml.org 
[lkml]   [2017]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/6] ARM: dts: keystone-k2g-evm: Fix botched up merge
    Date
    spi1 and ecap0 pinmuxes ended up under root node instead of k2g_pinctrl
    node. Fix this by moving them under k2g_pinctrl node.

    Signed-off-by: Vignesh R <vigneshr@ti.com>
    ---
    arch/arm/boot/dts/keystone-k2g-evm.dts | 30 ++++++++++++++----------------
    1 file changed, 14 insertions(+), 16 deletions(-)

    diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts
    index 656af194a518..298a50555e46 100644
    --- a/arch/arm/boot/dts/keystone-k2g-evm.dts
    +++ b/arch/arm/boot/dts/keystone-k2g-evm.dts
    @@ -45,22 +45,6 @@
    regulator-max-microvolt = <3300000>;
    regulator-always-on;
    };
    -
    - ecap0_pins: ecap0_pins {
    - pinctrl-single,pins = <
    - K2G_CORE_IOPAD(0x1374) (BUFFER_CLASS_B | MUX_MODE4) /* pr1_mdio_data.ecap0_in_apwm0_out */
    - >;
    - };
    -
    - spi1_pins: pinmux_spi1_pins {
    - pinctrl-single,pins = <
    - K2G_CORE_IOPAD(0x11a4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_scs0.spi1_scs0 */
    - K2G_CORE_IOPAD(0x11ac) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_clk.spi1_clk */
    - K2G_CORE_IOPAD(0x11b0) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_miso.spi1_miso */
    - K2G_CORE_IOPAD(0x11b4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_mosi.spi1_mosi */
    - >;
    - };
    -
    };

    &k2g_pinctrl {
    @@ -105,6 +89,20 @@
    >;
    };

    + ecap0_pins: ecap0_pins {
    + pinctrl-single,pins = <
    + K2G_CORE_IOPAD(0x1374) (BUFFER_CLASS_B | MUX_MODE4) /* pr1_mdio_data.ecap0_in_apwm0_out */
    + >;
    + };
    +
    + spi1_pins: pinmux_spi1_pins {
    + pinctrl-single,pins = <
    + K2G_CORE_IOPAD(0x11a4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_scs0.spi1_scs0 */
    + K2G_CORE_IOPAD(0x11ac) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_clk.spi1_clk */
    + K2G_CORE_IOPAD(0x11b0) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_miso.spi1_miso */
    + K2G_CORE_IOPAD(0x11b4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_mosi.spi1_mosi */
    + >;
    + };
    };

    &uart0 {
    --
    2.15.0
    \
     
     \ /
      Last update: 2017-11-23 08:52    [W:4.442 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site