Merge branch 'master' of git://git.denx.de/u-boot-arm

diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 72e9bb2e972af3d86d4e0c40ae4b62c860c3c348..c2c0e2e8c7f5d66964ec158e85f591d85e244c17 100644 (file)
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -25,6 +25,8 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <linux/fb.h>
+#include <phy.h>
+#include <input.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -55,7 +57,7 @@ static iomux_v3_cfg_t const uart1_pads[] = {
        MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 
-iomux_v3_cfg_t const usdhc1_pads[] = {
+static iomux_v3_cfg_t const usdhc1_pads[] = {
        MX6_PAD_SD1_CLK__SD1_CLK   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
        MX6_PAD_SD1_CMD__SD1_CMD   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
        MX6_PAD_SD1_DAT0__SD1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),

diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 0b45ffad672f940bcf4d45a27db65d0853b0a73f..4129bdabfbef945c22fe50f1c0a72ed93a39fdd2 100644 (file)
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -9,5 +9,6 @@ obj-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
 obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
 obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 obj-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
+obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
 obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o
 obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o

diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c
new file mode 100644 (file)
index 0000000..22c1f15
--- /dev/null
+++ b/drivers/power/pmic/pmic_pfuze100.c
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2014 Gateworks Corporation
+ * Tim Harvey <tharvey@gateworks.com>
+ *
+ * SPDX-License-Identifier:      GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <i2c.h>
+#include <power/pmic.h>
+#include <power/pfuze100_pmic.h>
+
+int pmic_init(unsigned char bus)
+{
+       static const char name[] = "PFUZE100_PMIC";
+       struct pmic *p = pmic_alloc();
+
+       if (!p) {
+               printf("%s: POWER allocation error!\n", __func__);
+               return -ENOMEM;
+       }
+
+       p->name = name;
+       p->interface = PMIC_I2C;
+       p->number_of_regs = PMIC_NUM_OF_REGS;
+       p->hw.i2c.addr = CONFIG_POWER_PFUZE100_I2C_ADDR;
+       p->hw.i2c.tx_num = 1;
+       p->bus = bus;
+
+       return 0;
+}

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 111372c9fd08f9d0817a84e95fdae9b84fcda208..652cf3bab707fbf952f597489cfb516031ef59c8 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -612,6 +612,8 @@ struct fb_videomode {
        u32 flag;
 };
 
+int board_video_skip(void);
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_FB_H */

diff --git a/include/mmc.h b/include/mmc.h
index e95a2376d20001ff71e667daf4505e92afc688a7..b65ad9e41e95e11f0bbfbb58f615d21b6599f098 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -354,4 +354,6 @@ struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode);
 int mmc_legacy_init(int verbose);
 #endif
 
+int board_mmc_init(bd_t *bis);
+
 #endif /* _MMC_H_ */

diff --git a/include/phy.h b/include/phy.h
index 1f22fa180c6247ee162b554e88780d516b6bba3a..d3ecd6378b3b97b718748ad06a8346a8dc409f03 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -234,6 +234,8 @@ int phy_smsc_init(void);
 int phy_teranetics_init(void);
 int phy_vitesse_init(void);
 
+int board_phy_config(struct phy_device *phydev);
+
 /* PHY UIDs for various PHYs that are referenced in external code */
 #define PHY_UID_TN2020 0x00a19410
 

diff --git a/include/power/pfuze100_pmic.h b/include/power/pfuze100_pmic.h
new file mode 100644 (file)
index 0000000..2a9032a
--- /dev/null
+++ b/include/power/pfuze100_pmic.h
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (C) 2014 Gateworks Corporation
+ *  Tim Harvey <tharvey@gateworks.com>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __PFUZE100_PMIC_H_
+#define __PFUZE100_PMIC_H_
+
+/* PFUZE100 registers */
+enum {
+       PFUZE100_DEVICEID       = 0x00,
+       PFUZE100_REVID          = 0x03,
+       PFUZE100_FABID          = 0x04,
+
+       PFUZE100_SW1ABVOL       = 0x20,
+       PFUZE100_SW1CVOL        = 0x2e,
+       PFUZE100_SW2VOL         = 0x35,
+       PFUZE100_SW3AVOL        = 0x3c,
+       PFUZE100_SW3BVOL        = 0x43,
+       PFUZE100_SW4VOL         = 0x4a,
+       PFUZE100_SWBSTCON1      = 0x66,
+       PFUZE100_VREFDDRCON     = 0x6a,
+       PFUZE100_VSNVSVOL       = 0x6b,
+       PFUZE100_VGEN1VOL       = 0x6c,
+       PFUZE100_VGEN2VOL       = 0x6d,
+       PFUZE100_VGEN3VOL       = 0x6e,
+       PFUZE100_VGEN4VOL       = 0x6f,
+       PFUZE100_VGEN5VOL       = 0x70,
+       PFUZE100_VGEN6VOL       = 0x71,
+
+       PMIC_NUM_OF_REGS        = 0x7f,
+};
+
+/*
+ * LDO Configuration
+ */
+
+/* VGEN1/2 Voltage Configuration */
+#define LDOA_0_80V     0
+#define LDOA_0_85V     1
+#define LDOA_0_90V     2
+#define LDOA_0_95V     3
+#define LDOA_1_00V     4
+#define LDOA_1_05V     5
+#define LDOA_1_10V     6
+#define LDOA_1_15V     7
+#define LDOA_1_20V     8
+#define LDOA_1_25V     9
+#define LDOA_1_30V     10
+#define LDOA_1_35V     11
+#define LDOA_1_40V     12
+#define LDOA_1_45V     13
+#define LDOA_1_50V     14
+#define LDOA_1_55V     15
+
+/* VGEN3/4/5/6 Voltage Configuration */
+#define LDOB_1_80V     0
+#define LDOB_1_90V     1
+#define LDOB_2_00V     2
+#define LDOB_2_10V     3
+#define LDOB_2_20V     4
+#define LDOB_2_30V     5
+#define LDOB_2_40V     6
+#define LDOB_2_50V     7
+#define LDOB_2_60V     8
+#define LDOB_2_70V     9
+#define LDOB_2_80V     10
+#define LDOB_2_90V     11
+#define LDOB_3_00V     12
+#define LDOB_3_10V     13
+#define LDOB_3_20V     14
+#define LDOB_3_30V     15
+
+#define LDO_VOL_MASK   0xf
+#define LDO_EN         4
+
+/*
+ * Boost Regulator
+ */
+
+/* SWBST Output Voltage */
+#define SWBST_5_00V    0
+#define SWBST_5_05V    1
+#define SWBST_5_10V    2
+#define SWBST_5_15V    3
+
+#define SWBST_VOL_MASK 0x3
+#define SWBST_MODE_MASK        0x6
+#define SWBST_MODE_OFF (2 << 0)
+#define SWBST_MODE_PFM (2 << 1)
+#define SWBST_MODE_AUTO        (2 << 2)
+#define SWBST_MODE_APS (2 << 3)
+
+#endif