dw_mmc: cleanups

[u-boot] / drivers / spi / tegra20_sflash.c

diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 9322ce7f64102b61100039feb071716f243ab65e..b5d561be34108dade5a7450391ff9824461d03c9 100644 (file)
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -3,23 +3,7 @@
  * With help from the mpc8xxx SPI driver
  * With more help from omap3_spi SPI driver
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -132,8 +116,6 @@ struct spi_slave *tegra20_spi_setup_slave(unsigned int bus, unsigned int cs,
                printf("SPI error: malloc of SPI structure failed\n");
                return NULL;
        }
-       spi->slave.bus = bus;
-       spi->slave.cs = cs;
        spi->ctrl = &spi_ctrls[bus];
        if (!spi->ctrl) {
                printf("SPI error: could not find controller for bus %d\n",
@@ -226,9 +208,9 @@ int tegra20_spi_claim_bus(struct spi_slave *slave)
         * SPI pins on Tegra20 are muxed - change pinmux later due to UART
         * issue.
         */
-       pinmux_set_func(PINGRP_GMD, PMUX_FUNC_SFLASH);
-       pinmux_tristate_disable(PINGRP_LSPI);
-       pinmux_set_func(PINGRP_GMC, PMUX_FUNC_SFLASH);
+       pinmux_set_func(PMUX_PINGRP_GMD, PMUX_FUNC_SFLASH);
+       pinmux_tristate_disable(PMUX_PINGRP_LSPI);
+       pinmux_set_func(PMUX_PINGRP_GMC, PMUX_FUNC_SFLASH);
 
        return 0;
 }