Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / drivers / power / power_fsl.c

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index a663831589fdfe05a5756c592cd4ae5fcfc0fd6e..ac0b541d797088afc3056e7a4b83e9ee8adb9f6b 100644 (file)
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -2,23 +2,7 @@
  *  Copyright (C) 2011 Samsung Electronics
  *  Lukasz Majewski <l.majewski@samsung.com>
  *
- * 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>
@@ -52,10 +36,10 @@ int pmic_init(unsigned char bus)
 
        p->name = name;
        p->number_of_regs = PMIC_NUM_OF_REGS;
+       p->bus = bus;
 
 #if defined(CONFIG_POWER_SPI)
        p->interface = PMIC_SPI;
-       p->bus = CONFIG_FSL_PMIC_BUS;
        p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
        p->hw.spi.clk = CONFIG_FSL_PMIC_CLK;
        p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
@@ -66,7 +50,6 @@ int pmic_init(unsigned char bus)
        p->interface = PMIC_I2C;
        p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
        p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH;
-       p->bus = bus;
 #else
 #error "You must select CONFIG_POWER_SPI or CONFIG_PMIC_I2C"
 #endif