Skip to content

Commit

Permalink
shooter: add cable detect platform data
Browse files Browse the repository at this point in the history
also
* fix msm_adc_channels_data
* fix pmic8058-xoadc htc port
* add kernel config for htc accessory
* remove duplicate ssbi3 data
  • Loading branch information
Kali- committed Apr 13, 2012
1 parent b7a9af1 commit 2627fb7
Show file tree
Hide file tree
Showing 8 changed files with 195 additions and 64 deletions.
7 changes: 4 additions & 3 deletions arch/arm/configs/shooter_defconfig
Expand Up @@ -435,7 +435,7 @@ CONFIG_MSM_PIL_TZAPPS=y
CONFIG_MSM_SCM=y CONFIG_MSM_SCM=y
CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SUBSYSTEM_RESTART=y
CONFIG_MSM_SYSMON_COMM=y CONFIG_MSM_SYSMON_COMM=y
# CONFIG_MSM_BUSPM_DEV is not set CONFIG_MSM_BUSPM_DEV=y
CONFIG_MSM_TZ_LOG=y CONFIG_MSM_TZ_LOG=y
CONFIG_MSM_RPM_LOG=y CONFIG_MSM_RPM_LOG=y
# CONFIG_MSM_RPM_STATS_LOG is not set # CONFIG_MSM_RPM_STATS_LOG is not set
Expand Down Expand Up @@ -1133,6 +1133,7 @@ CONFIG_INPUT_ISL29029=y
CONFIG_TPS65200=y CONFIG_TPS65200=y
CONFIG_AMP_TPA2051D3=y CONFIG_AMP_TPA2051D3=y
CONFIG_CABLE_DETECT_8X60=y CONFIG_CABLE_DETECT_8X60=y
CONFIG_CABLE_DETECT_ACCESSORY=y
# CONFIG_C2PORT is not set # CONFIG_C2PORT is not set


# #
Expand Down Expand Up @@ -1573,8 +1574,8 @@ CONFIG_SPI_QUP=y
# #
CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_DEBUG_GPIO=y # CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_SYSFS is not set


# #
# Memory mapped GPIO drivers: # Memory mapped GPIO drivers:
Expand Down
7 changes: 4 additions & 3 deletions arch/arm/configs/shooter_u_defconfig
Expand Up @@ -435,7 +435,7 @@ CONFIG_MSM_PIL_TZAPPS=y
CONFIG_MSM_SCM=y CONFIG_MSM_SCM=y
CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_SUBSYSTEM_RESTART=y
CONFIG_MSM_SYSMON_COMM=y CONFIG_MSM_SYSMON_COMM=y
# CONFIG_MSM_BUSPM_DEV is not set CONFIG_MSM_BUSPM_DEV=y
CONFIG_MSM_TZ_LOG=y CONFIG_MSM_TZ_LOG=y
CONFIG_MSM_RPM_LOG=y CONFIG_MSM_RPM_LOG=y
# CONFIG_MSM_RPM_STATS_LOG is not set # CONFIG_MSM_RPM_STATS_LOG is not set
Expand Down Expand Up @@ -1133,6 +1133,7 @@ CONFIG_INPUT_ISL29029=y
CONFIG_TPS65200=y CONFIG_TPS65200=y
CONFIG_AMP_TPA2051D3=y CONFIG_AMP_TPA2051D3=y
CONFIG_CABLE_DETECT_8X60=y CONFIG_CABLE_DETECT_8X60=y
CONFIG_CABLE_DETECT_ACCESSORY=y
# CONFIG_C2PORT is not set # CONFIG_C2PORT is not set


# #
Expand Down Expand Up @@ -1573,8 +1574,8 @@ CONFIG_SPI_QUP=y
# #
CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_DEBUG_GPIO=y # CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_SYSFS is not set


# #
# Memory mapped GPIO drivers: # Memory mapped GPIO drivers:
Expand Down

21 comments on commit 2627fb7

@johnnyslt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm trying to compile this on :

ubuntu 11.10 64bit
Android NDK r7c - toolchain

for shooter_u

but it fails at :

CC drivers/mfd/pmic8058.o
drivers/mfd/pmic8058.c:817: error: rtc_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:817: error: rtc_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:731: error: othc0_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:731: error: othc0_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:740: error: othc1_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:740: error: othc1_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:751: error: othc2_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:751: error: othc2_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:673: error: misc_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:673: error: misc_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:700: error: thermal_alarm_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:700: error: thermal_alarm_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:760: error: batt_alarm_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:760: error: batt_alarm_cell_resources causes a section type conflict
drivers/mfd/pmic8058.c:642: error: pm8058_charger_resources causes a section type conflict
drivers/mfd/pmic8058.c:642: error: pm8058_charger_resources causes a section type conflict
make[2]: *** [drivers/mfd/pmic8058.o] Error 1
make[1]: *** [drivers/mfd] Error 2
make: *** [drivers] Error 2

is this a known problem or am I doing something wrong?

@Kali-
Copy link
Member Author

@Kali- Kali- commented on 2627fb7 Apr 14, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try my kernel config

make shooter_defconfig or make shooter_u_defconfig

@Kali-
Copy link
Member Author

@Kali- Kali- commented on 2627fb7 Apr 14, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't expect this kernel will be ready for production

@johnnyslt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make shooter_u_defconfig - is what i've used

or do mean the one from ur repo?

@Kali-
Copy link
Member Author

@Kali- Kali- commented on 2627fb7 Apr 14, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from this repo

@johnnyslt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, i've used shooter_u_defconfig from this repo, and it gave me the above error

does it finishes building for you?

@Kali-
Copy link
Member Author

@Kali- Kali- commented on 2627fb7 Apr 14, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes
i'm using aosp ics toolchain

@johnnyslt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i've managed to build it by commenting all the "__devinitconst" in "drivers/mfd/pmic8058.c" (dunno if this breaks something)

and it even booted, but i'm getting many random reboots.

anyway 10x.

keep up the good work! :D

@toastcfh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds fine using aosp tool chain for me. (Shooter)

@toastcfh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

checked your github and didnt see any "sense 3.6/4.0 kernel (linux 3.0.27)". so im not sure what we're comparing it to... im using the standard android ndk toolchain and it compiles and boots fine. not errors on boot? ramconsole leaving any hints as to why? using the shooter_defconfig in arch/arm/configs/?

@toastcfh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kushdeck
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compiles just fine over here. 4.4.3 toolchain.

@cayniarb
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This build just fine for me with Linaro's 4.5.2 toolchain (and some code modification for that) or AOSP's 4.4.3 toolchain (with no code modifications). I'm building for a different device off the code, but the configs are close enough that that should have no impact.

@mdeejay
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compiled fine with 4.4.3 for shooterU.
hot reboot after bootup rom...sense 4 and cm9

@Kali-
Copy link
Member Author

@Kali- Kali- commented on 2627fb7 Apr 17, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i got many problem with reboot before recent changes to the battery
probably is something related to the ramdisk or thermald/mpdecision

@AbandonedCart
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Chad, I haven't updated the public defconfig but I was also under the impression you were building a kernel you designed from qualcomm and aosp source only. The link toast provided is the proper one to compile this project as it's found on this site.

@AbandonedCart
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well when you get done with whatever you were going on about the best configuration is the one provided with this source. Don't want anyone else being misled .into thinking mine is brokenor that the one here doesn't work because a mismatched one was used.

@cayniarb
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ChadGoodman it really doesn't seem strange at all that you are having issues building this source using a config that you got from who knows where. There is definitely no 'cm9defconfig' in this source. The others who, as you say, are new to kernels and (presumably also) git probably have something off in their setup -- maybe they have the wrong branch checked out or aren't properly exporting their toolchains. A 'section type conflict' isn't even an error that I think the 4.4.3 toolchain will generate, so my suspicion is that the correct toolchain is not being used. You can get one that I know works here: http://git.tiamat-dev.com/tools/toolchains/snapshot/toolchains-4.4.3.tar.gz

@johnnyslt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i've managed to build it finally on ubuntu on virtualbox, using latest version of ndk(same as my previous setup). don't know what was the problem (faulty setup maybe(or stupid me :D )).

@toastcfh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johnnysit GREAT! glad your issue was resolved

@Kali-
Copy link
Member Author

@Kali- Kali- commented on 2627fb7 Apr 18, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a dedicated irc channel will be better for chat
join #teamevo on freenode

Please sign in to comment.