Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ SUBARCH := arm
SUBARCH := arm
export KBUILD_BUILDHOST := $(SUBARCH)
ARCH ?= $(SUBARCH)
CROSS_COMPILE ?= /media/Main_Storage/android_toolchains/arm-eabi-4.4.3/bin/arm-eabi-
CROSS_COMPILE ?= /root/arm-eabi-4.4.3/bin/arm-eabi-

# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)
Expand Down Expand Up @@ -370,9 +370,8 @@ LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include \

KBUILD_CPPFLAGS := -D__KERNEL__

KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
KBUILD_CFLAGS := -Wno-trigraphs \
-fno-strict-aliasing -fno-common \
-Werror-implicit-function-declaration \
-Wno-format-security \
-fno-delete-null-pointer-checks
KBUILD_AFLAGS_KERNEL :=
Expand Down
6 changes: 1 addition & 5 deletions README
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
Current Errors during pico compilation

arch/arm/mach-msm/board-pico.c:1821: error: 'pico_init' undeclared here (not in a function)


No more compilation errors :-)
106 changes: 89 additions & 17 deletions arch/arm/configs/pico_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ CONFIG_MACH_PICO=y
# CONFIG_ARCH_MSM7X30_SMD is not set
# CONFIG_FB_MSM_MIPI_VIDEO_ONLY is not set
# CONFIG_MSM_STACKED_MEMORY is not set
CONFIG_PHYS_OFFSET=0x13000000
CONFIG_PHYS_OFFSET=0x12C00000
CONFIG_MSM_AMSS_VERSION=6225
# CONFIG_MSM_AMSS_VERSION_6210 is not set
# CONFIG_MSM_AMSS_VERSION_6220 is not set
Expand Down Expand Up @@ -847,24 +847,82 @@ CONFIG_EXTRA_FIRMWARE=""
CONFIG_GENLOCK=y
CONFIG_GENLOCK_MISCDEVICE=y
# CONFIG_CONNECTOR is not set
# CONFIG_MTD is not set
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_TESTS is not set
# CONFIG_MTD_CONCAT is not set
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
# CONFIG_MTD_AR7_PARTS is not set

#
# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
#
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_MG_DISK is not set
# CONFIG_BLK_DEV_RBD is not set
# CONFIG_SENSORS_LIS3LV02D is not set
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLKDEVS=y
CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
# CONFIG_RFD_FTL is not set
# CONFIG_SSFDC is not set
# CONFIG_SM_FTL is not set
# CONFIG_MTD_OOPS is not set

#
# RAM/ROM/Flash chip drivers
#
# CONFIG_MTD_CFI is not set
# CONFIG_MTD_JEDECPROBE is not set
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
CONFIG_MTD_CFI_I1=y
CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_CFI_I4 is not set
# CONFIG_MTD_CFI_I8 is not set
# CONFIG_MTD_RAM is not set
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_ABSENT is not set

#
# Mapping drivers for chip access
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_PLATRAM is not set

#
# Self-contained MTD device drivers
#
CONFIG_MTD_MSM_NAND=y
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PHRAM is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_BLOCK2MTD is not set

#
# Disk-On-Chip Device Drivers
#
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND is not set
# CONFIG_MTD_ONENAND is not set

#
# LPDDR flash memory drivers
#
# CONFIG_MTD_LPDDR is not set
# CONFIG_MTD_UBI is not set
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
CONFIG_ANDROID_PMEM=y
Expand Down Expand Up @@ -1350,7 +1408,7 @@ CONFIG_MFD_SUPPORT=y
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
# CONFIG_MFD_TPS6586X is not set
CONFIG_MARIMBA_CORE=y
# CONFIG_MARIMBA_CORE is not set
# CONFIG_MARIMBA_CODEC is not set
# CONFIG_TIMPANI_CODEC is not set
# CONFIG_TWL4030_CORE is not set
Expand Down Expand Up @@ -1897,6 +1955,7 @@ CONFIG_LEDS_MSM_PDM=y
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_BD2802 is not set
CONFIG_LEDS_MSM_PMIC=y
CONFIG_LEDS_PMIC8029=y
# CONFIG_LEDS_LT3593 is not set
# CONFIG_LEDS_TRIGGERS is not set
# CONFIG_LEDS_PM8029 is not set
Expand Down Expand Up @@ -2005,7 +2064,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE=16
CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE=8
CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
# CONFIG_MDM9K_ERROR_CORRECTION is not set
# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT=y
CONFIG_ANDROID_TIMED_OUTPUT=y
# CONFIG_ANDROID_TIMED_GPIO is not set
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
Expand Down Expand Up @@ -2115,6 +2174,19 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
CONFIG_YAFFS_FS=y
CONFIG_YAFFS_YAFFS1=y
# CONFIG_YAFFS_9BYTE_TAGS is not set
# CONFIG_YAFFS_DOES_ECC is not set
CONFIG_YAFFS_YAFFS2=y
CONFIG_YAFFS_AUTO_YAFFS2=y
CONFIG_YAFFS_DISABLE_TAGS_ECC=y
# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set
# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set
# CONFIG_YAFFS_DISABLE_BACKGROUND is not set
CONFIG_YAFFS_XATTR=y
# CONFIG_JFFS2_FS is not set
# CONFIG_LOGFS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
Expand Down
34 changes: 28 additions & 6 deletions arch/arm/mach-msm/board-pico.c
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ static struct msm_otg_platform_data msm_otg_pdata = {
};
#endif

#ifdef CONFIG_USB_ANDROID
#ifdef CONFIG_USB_G_ANDROID //cute_prince: CONFIG_USB_ANDROID is depreciated in Kernel 3.x. Used CONFIG_USB_G_ANDROID instead
static int pico_phy_init_seq[] =
{
0x2C, 0x31,
Expand Down Expand Up @@ -389,6 +389,28 @@ static struct platform_device wifi_bt_slp_clk = {
};
#endif

//cute_prince: PMIC8029 LED Fixed
static struct pm8029_led_config pm_led_config[] = {
{
.name = "button-backlight",
.bank = PMIC8029_GPIO1,
.init_pwm_brightness = 200,
},
};

static struct pm8029_led_platform_data pm8029_leds_data = {
.led_config = pm_led_config,
.num_leds = ARRAY_SIZE(pm_led_config),
};

static struct platform_device pm8029_leds = {
.name = "leds-pm8029",
.id = -1,
.dev = {
.platform_data = &pm8029_leds_data,
},
};

static struct msm_pm_platform_data msm7x27a_pm_data[MSM_PM_SLEEP_MODE_NR] = {
[MSM_PM_SLEEP_MODE_POWER_COLLAPSE] = {
.idle_supported = 1,
Expand Down Expand Up @@ -1219,10 +1241,10 @@ static struct platform_device *pico_devices[] __initdata = {
&msm_device_nand,
&msm_gsbi0_qup_i2c_device,
&msm_gsbi1_qup_i2c_device,
//FIXME: &htc_battery_pdev,
&htc_battery_pdev, //cute_prince: Fixed htc_battery_pdev
&android_pmem_device,
&android_pmem_adsp_device,
//FIXME: &usb_gadget_fserial_device,
&usb_gadget_fserial_device, //cute_prince: Fixed usb_gadget_fserial_device
&msm_device_adspdec,
#ifdef CONFIG_BATTERY_MSM
&msm_batt_device,
Expand Down Expand Up @@ -1252,7 +1274,7 @@ static struct platform_device *pico_devices[] __initdata = {
&pico_rfkill,
&msm_device_uart_dm1,
#endif
//FIXME: &pm8029_leds,
&pm8029_leds, //cute_prince: Fixed PMIC8029 LED
};


Expand Down Expand Up @@ -1893,9 +1915,9 @@ static void __init pico_init(void)
pico_wifi_init();

#ifdef CONFIG_MSM_RPC_VIBRATOR
//FIXME: msm_init_pmic_vibrator();
msm_init_pmic_vibrator(3000); //cute_prince: Fixed msm_init_pmic_vibrator()
#endif
#ifdef CONFIG_USB_ANDROID
#ifdef CONFIG_USB_G_ANDROID //cute_prince: CONFIG_USB_ANDROID is depreciated in Kernel 3.x. Used CONFIG_USB_G_ANDROID instead
pico_add_usb_devices();
#endif
#ifdef CONFIG_MSM_HTC_DEBUG_INFO
Expand Down
14 changes: 13 additions & 1 deletion arch/arm/mach-msm/devices-msm7x27a.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <asm/mach/mmc.h>
#include <mach/rpc_hsusb.h>
#include <mach/socinfo.h>

#include <mach/usb_gadget_fserial.h>
#include "devices.h"
#include "devices-msm7x2xa.h"
#include "footswitch.h"
Expand Down Expand Up @@ -184,6 +184,18 @@ static struct resource resources_hsusb_host[] = {
},
};

static struct usb_gadget_fserial_platform_data fserial_pdata = {
.no_ports = 2,
};

struct platform_device usb_gadget_fserial_device = {
.name = "usb_fserial",
.id = -1,
.dev = {
.platform_data = &fserial_pdata,
},
};

struct platform_device msm_device_hsusb_host = {
.name = "msm_hsusb_host",
.id = 0,
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-msm/devices.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ extern struct platform_device msm_device_hsic_host;
extern struct platform_device msm_device_hsusb;

extern struct platform_device msm_device_otg;
extern struct platform_device usb_gadget_fserial_device;

extern struct platform_device msm8960_device_otg;
extern struct platform_device msm8960_device_gadget_peripheral;
Expand Down
25 changes: 25 additions & 0 deletions arch/arm/mach-msm/devices_htc.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
#include <asm/setup.h>
#include <linux/mtd/nand.h>


static char *df_serialno = "000000000000";
static char *board_sn;
#define MFG_GPIO_TABLE_MAX_SIZE 0x400
static unsigned char mfg_gpio_table[MFG_GPIO_TABLE_MAX_SIZE];

Expand Down Expand Up @@ -383,6 +386,28 @@ int board_build_flag(void)

EXPORT_SYMBOL(board_build_flag);

static int __init board_serialno_setup(char *serialno)
{
char *str;

/* use default serial number when mode is factory2 */
if (board_mfg_mode() == 1 || !strlen(serialno))
str = df_serialno;
else
str = serialno;
#ifdef CONFIG_USB_FUNCTION
msm_hsusb_pdata.serial_number = str;
#endif
board_sn = str;
return 1;
}
__setup("androidboot.serialno=", board_serialno_setup);

char *board_serialno(void)
{
return board_sn;
}

/* ISL29028 ID values */
#define ATAG_PS_TYPE 0x4d534D77
int ps_type;
Expand Down
38 changes: 38 additions & 0 deletions arch/arm/mach-msm/include/mach/msm_hsusb.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,44 @@ struct msm_otg_platform_data {
struct pm_qos_request_list pm_qos_req_dma;
};

struct msm_hsusb_platform_data {
__u16 version;
unsigned phy_info;
__u16 vendor_id;
char *product_name;
char *serial_number;
char *manufacturer_name;
struct usb_composition *compositions;
int num_compositions;
struct usb_function_map *function_map;
int num_functions;
/* gpio mux function used for LPM */
int (*config_gpio)(int config);
/* ROC info for AHB Mode */
unsigned int soc_version;

int *phy_init_seq;
void (*phy_reset)(void __iomem *addr);
/* 1 : uart, 0 : usb */
void (*usb_uart_switch)(int uart);

unsigned int core_clk;

int vreg5v_required;

u32 swfi_latency;

void (*change_phy_voltage)(int);
void (*usb_host_switch)(int host);
void (*configure_ac_9v_gpio)(int);

u8 accessory_detect;
u8 accessory_type;
unsigned int usb_id_pin_gpio;
unsigned int usb_id2_pin_gpio;
unsigned int ac_9v_gpio;
};

struct msm_usb_host_platform_data {
unsigned phy_info;
unsigned int power_budget;
Expand Down
8 changes: 8 additions & 0 deletions drivers/leds/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,14 @@ config LEDS_PM8058
This option enables support for LEDs connected to PM8058
LED driver chips accessed via the SSBI bus and rpc.

config LEDS_PMIC8029
tristate "LED Support for Qualcomm PMIC8029"
default n
help
This option enables support for LEDs connected over PMIC8029
(Power Management IC) chip on Qualcomm reference boards,
for example SURF and FFAs.

config LEDS_MAX8957_FLASH
tristate "FLASH LED Support for Maxim MAX8957 PMIC"
depends on MFD_MAX8957
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ obj-$(CONFIG_LEDS_MC13783) += leds-mc13783.o
obj-$(CONFIG_LEDS_NS2) += leds-ns2.o
obj-$(CONFIG_LEDS_NETXBIG) += leds-netxbig.o
obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o
obj-$(CONFIG_LEDS_PM8029) += leds-pm8029.o
obj-$(CONFIG_LEDS_PMIC8029) += leds-pm8029.o
#obj-$(CONFIG_LEDS_PM8058) += leds-pmic8058.o
obj-$(CONFIG_LEDS_PM8058) += leds-pm8058.o
obj-$(CONFIG_MICROP_COMMON) += leds-microp.o
Expand Down
Loading