* [PATCH v2] arm: msm: fix up very basic HTC Sapphire support [not found] <CAOesGMiHfQwWXSQwvcEPxY63FEjbsB7ux4dHvAPM99Kf43cDZw@mail.gmail.com> @ 2012-05-12 0:15 ` David Brown 2012-05-12 5:45 ` Olof Johansson 0 siblings, 1 reply; 6+ messages in thread From: David Brown @ 2012-05-12 0:15 UTC (permalink / raw) To: linux-arm-kernel From: Daniel Walker <dwalker@fifo99.com> Adds sapphire into the make file, and fixes all the code problems that prevented it from building (including adding board-sapphire.h) [davidb at codeaurora.org: Move MACH_TROUT selection back under ARCH_MSM7X00A] Signed-off-by: Daniel Walker <dwalker@fifo99.com> Signed-off-by: David Brown <davidb@codeaurora.org> --- v2 - Moved MACH_TROUT selection back under the ARCH config target arch/arm/mach-msm/Kconfig | 9 +- arch/arm/mach-msm/Makefile | 1 + arch/arm/mach-msm/board-sapphire.c | 18 +-- arch/arm/mach-msm/board-sapphire.h | 224 ++++++++++++++++++++++++++++++++++++ 4 files changed, 234 insertions(+), 18 deletions(-) create mode 100644 arch/arm/mach-msm/board-sapphire.h diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 1cd40ad..70eae63 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -6,7 +6,7 @@ choice config ARCH_MSM7X00A bool "MSM7x00A / MSM7x01A" - select MACH_TROUT if !MACH_HALIBUT + select MACH_TROUT if (!MACH_HALIBUT && !MACH_SAPPHIRE) select ARCH_MSM_ARM11 select MSM_SMD select MSM_SMD_PKG3 @@ -93,6 +93,13 @@ config MACH_TROUT help Support for the HTC Dream, T-Mobile G1, Android ADP1 devices. +config MACH_SAPPHIRE + depends on ARCH_MSM + depends on ARCH_MSM7X00A + bool "HTC Sapphire" + help + Support for the HTC Sapphire. + config MACH_MSM7X30_SURF depends on ARCH_MSM7X30 bool "MSM7x30 SURF" diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 4ad3969..aff4e5c 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -20,6 +20,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o +obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire.o devices-msm7x00.o obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c index 4a8ea0d..e9e7969 100644 --- a/arch/arm/mach-msm/board-sapphire.c +++ b/arch/arm/mach-msm/board-sapphire.c @@ -38,7 +38,6 @@ #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> -#include "gpio_chip.h" #include "board-sapphire.h" #include "proc_comm.h" #include "devices.h" @@ -48,7 +47,6 @@ void msm_init_gpio(void); static struct platform_device *devices[] __initdata = { &msm_device_smd, - &msm_device_dmov, &msm_device_nand, &msm_device_uart1, &msm_device_uart3, @@ -78,27 +76,13 @@ static struct map_desc sapphire_io_desc[] __initdata = { static void __init sapphire_fixup(struct tag *tags, char **cmdline, struct meminfo *mi) { - int smi_sz = parse_tag_smi((const struct tag *)tags); - - mi->nr_banks = 1; - mi->bank[0].start = PHYS_OFFSET; - mi->bank[0].node = PHYS_TO_NID(PHYS_OFFSET); - if (smi_sz == 32) { - mi->bank[0].size = (84*1024*1024); - } else if (smi_sz == 64) { - mi->bank[0].size = (101*1024*1024); - } else { - /* Give a default value when not get smi size */ - smi_sz = 64; - mi->bank[0].size = (101*1024*1024); - } } static void __init sapphire_map_io(void) { msm_map_common_io(); iotable_init(sapphire_io_desc, ARRAY_SIZE(sapphire_io_desc)); - msm_clock_init(); + msm_clock_init(msm_clocks_7x01a, msm_num_clocks_7x01a); } MACHINE_START(SAPPHIRE, "sapphire") diff --git a/arch/arm/mach-msm/board-sapphire.h b/arch/arm/mach-msm/board-sapphire.h new file mode 100644 index 0000000..70f925e --- /dev/null +++ b/arch/arm/mach-msm/board-sapphire.h @@ -0,0 +1,224 @@ +/* linux/arch/arm/mach-msm/board-sapphire.h + * Copyright (C) 2007-2009 HTC Corporation. + * Author: Thomas Tsai <thomas_tsai@htc.com> + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * 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. +*/ +#ifndef __ARCH_ARM_MACH_MSM_BOARD_SAPPHIRE_H +#define __ARCH_ARM_MACH_MSM_BOARD_SAPPHIRE_H + +#include <mach/board.h> + +#define MSM_SMI_BASE 0x00000000 +#define MSM_SMI_SIZE 0x00800000 + +#define MSM_EBI_BASE 0x10000000 +#define MSM_EBI_SIZE 0x07100000 + +#define MSM_PMEM_GPU0_BASE 0x00000000 +#define MSM_PMEM_GPU0_SIZE 0x00700000 + +#define SMI64_MSM_PMEM_MDP_BASE 0x15900000 +#define SMI64_MSM_PMEM_MDP_SIZE 0x00800000 + +#define SMI64_MSM_PMEM_ADSP_BASE 0x16100000 +#define SMI64_MSM_PMEM_ADSP_SIZE 0x00800000 + +#define SMI64_MSM_PMEM_CAMERA_BASE 0x15400000 +#define SMI64_MSM_PMEM_CAMERA_SIZE 0x00500000 + +#define SMI64_MSM_FB_BASE 0x00700000 +#define SMI64_MSM_FB_SIZE 0x00100000 + +#define SMI64_MSM_LINUX_BASE MSM_EBI_BASE +#define SMI64_MSM_LINUX_SIZE 0x068e0000 + +#define SMI64_MSM_LINUX_BASE_1 0x02000000 +#define SMI64_MSM_LINUX_SIZE_1 0x02000000 + +#define SMI64_MSM_LINUX_BASE_2 MSM_EBI_BASE +#define SMI64_MSM_LINUX_SIZE_2 0x05400000 + +#define SMI32_MSM_LINUX_BASE MSM_EBI_BASE +#define SMI32_MSM_LINUX_SIZE 0x5400000 + +#define SMI32_MSM_PMEM_MDP_BASE (SMI32_MSM_LINUX_BASE + SMI32_MSM_LINUX_SIZE) +#define SMI32_MSM_PMEM_MDP_SIZE 0x800000 + +#define SMI32_MSM_PMEM_ADSP_BASE (SMI32_MSM_PMEM_MDP_BASE + SMI32_MSM_PMEM_MDP_SIZE) +#define SMI32_MSM_PMEM_ADSP_SIZE 0x800000 + +#define SMI32_MSM_FB_BASE (SMI32_MSM_PMEM_ADSP_BASE + SMI32_MSM_PMEM_ADSP_SIZE) +#define SMI32_MSM_FB_SIZE 0x9b000 + + +#define MSM_PMEM_GPU1_SIZE 0x800000 +#define MSM_PMEM_GPU1_BASE (MSM_RAM_CONSOLE_BASE + MSM_RAM_CONSOLE_SIZE) + +#define MSM_RAM_CONSOLE_BASE 0x169E0000 +#define MSM_RAM_CONSOLE_SIZE (128 * SZ_1K) + +#if (SMI32_MSM_FB_BASE + SMI32_MSM_FB_SIZE) >= (MSM_PMEM_GPU1_BASE) +#error invalid memory map +#endif + +#if (SMI64_MSM_FB_BASE + SMI64_MSM_FB_SIZE) >= (MSM_PMEM_GPU1_BASE) +#error invalid memory map +#endif + +#define DECLARE_MSM_IOMAP +#include <mach/msm_iomap.h> + +/* +** SOC GPIO +*/ +#define SAPPHIRE_BALL_UP_0 94 +#define SAPPHIRE_BALL_LEFT_0 18 +#define SAPPHIRE_BALL_DOWN_0 49 +#define SAPPHIRE_BALL_RIGHT_0 19 + +#define SAPPHIRE_POWER_KEY 20 +#define SAPPHIRE_VOLUME_UP 36 +#define SAPPHIRE_VOLUME_DOWN 39 + +#define SAPPHIRE_GPIO_PS_HOLD (25) +#define SAPPHIRE_MDDI_1V5_EN (28) +#define SAPPHIRE_BL_PWM (27) +#define SAPPHIRE_TP_LS_E (1) +#define SAPPHIRE20_TP_LS_EN (88) + +/* H2W */ +#define SAPPHIRE_GPIO_CABLE_IN1 (83) +#define SAPPHIRE_GPIO_CABLE_IN2 (37) +#define SAPPHIRE_GPIO_UART3_RX (86) +#define SAPPHIRE_GPIO_UART3_TX (87) +#define SAPPHIRE_GPIO_H2W_DATA (86) +#define SAPPHIRE_GPIO_H2W_CLK (87) + +#define SAPPHIRE_GPIO_UART1_RTS (43) +#define SAPPHIRE_GPIO_UART1_CTS (44) + +/* +** CPLD GPIO +** +** Sapphire Altera CPLD can keep the registers value and +** doesn't need a shadow to backup. +**/ +#define SAPPHIRE_CPLD_BASE 0xFA000000 /* VA */ +#define SAPPHIRE_CPLD_START 0x98000000 /* PA */ +#define SAPPHIRE_CPLD_SIZE SZ_4K + +#define SAPPHIRE_GPIO_START (128) /* Pseudo GPIO number */ + +/* Sapphire has one INT BANK only. */ +#define SAPPHIRE_GPIO_INT_B0_MASK_REG (0x0c) /*INT3 MASK*/ +#define SAPPHIRE_GPIO_INT_B0_STAT_REG (0x0e) /*INT1 STATUS*/ + +/* LED control register */ +#define SAPPHIRE_CPLD_LED_BASE (SAPPHIRE_CPLD_BASE + 0x10) /* VA */ +#define SAPPHIRE_CPLD_LED_START (SAPPHIRE_CPLD_START + 0x10) /* PA */ +#define SAPPHIRE_CPLD_LED_SIZE 0x08 + +/* MISCn: GPO pin to Enable/Disable some functions. */ +#define SAPPHIRE_GPIO_MISC1_BASE (SAPPHIRE_GPIO_START + 0x00) +#define SAPPHIRE_GPIO_MISC2_BASE (SAPPHIRE_GPIO_START + 0x08) +#define SAPPHIRE_GPIO_MISC3_BASE (SAPPHIRE_GPIO_START + 0x10) +#define SAPPHIRE_GPIO_MISC4_BASE (SAPPHIRE_GPIO_START + 0x18) +#define SAPPHIRE_GPIO_MISC5_BASE (SAPPHIRE_GPIO_START + 0x20) + +/* INT BANK0: INT1: int status, INT2: int level, INT3: int Mask */ +#define SAPPHIRE_GPIO_INT_B0_BASE (SAPPHIRE_GPIO_START + 0x28) + +/* MISCn GPIO: */ +#define SAPPHIRE_GPIO_CPLD128_VER_0 (SAPPHIRE_GPIO_MISC1_BASE + 4) +#define SAPPHIRE_GPIO_CPLD128_VER_1 (SAPPHIRE_GPIO_MISC1_BASE + 5) +#define SAPPHIRE_GPIO_CPLD128_VER_2 (SAPPHIRE_GPIO_MISC1_BASE + 6) +#define SAPPHIRE_GPIO_CPLD128_VER_3 (SAPPHIRE_GPIO_MISC1_BASE + 7) + +#define SAPPHIRE_GPIO_H2W_DAT_DIR (SAPPHIRE_GPIO_MISC2_BASE + 2) +#define SAPPHIRE_GPIO_H2W_CLK_DIR (SAPPHIRE_GPIO_MISC2_BASE + 3) +#define SAPPHIRE_GPIO_H2W_SEL0 (SAPPHIRE_GPIO_MISC2_BASE + 6) +#define SAPPHIRE_GPIO_H2W_SEL1 (SAPPHIRE_GPIO_MISC2_BASE + 7) + +#define SAPPHIRE_GPIO_I2C_PULL (SAPPHIRE_GPIO_MISC3_BASE + 2) +#define SAPPHIRE_GPIO_TP_EN (SAPPHIRE_GPIO_MISC3_BASE + 4) +#define SAPPHIRE_GPIO_JOG_EN (SAPPHIRE_GPIO_MISC3_BASE + 5) +#define SAPPHIRE_GPIO_JOG_LED_EN (SAPPHIRE_GPIO_MISC3_BASE + 6) +#define SAPPHIRE_GPIO_APKEY_LED_EN (SAPPHIRE_GPIO_MISC3_BASE + 7) + +#define SAPPHIRE_GPIO_VCM_PWDN (SAPPHIRE_GPIO_MISC4_BASE + 0) +#define SAPPHIRE_GPIO_USB_H2W_SW (SAPPHIRE_GPIO_MISC4_BASE + 1) +#define SAPPHIRE_GPIO_COMPASS_RST_N (SAPPHIRE_GPIO_MISC4_BASE + 2) +#define SAPPHIRE_GPIO_USB_PHY_RST_N (SAPPHIRE_GPIO_MISC4_BASE + 5) +#define SAPPHIRE_GPIO_WIFI_PA_RESETX (SAPPHIRE_GPIO_MISC4_BASE + 6) +#define SAPPHIRE_GPIO_WIFI_EN (SAPPHIRE_GPIO_MISC4_BASE + 7) + +#define SAPPHIRE_GPIO_BT_32K_EN (SAPPHIRE_GPIO_MISC5_BASE + 0) +#define SAPPHIRE_GPIO_MAC_32K_EN (SAPPHIRE_GPIO_MISC5_BASE + 1) +#define SAPPHIRE_GPIO_MDDI_32K_EN (SAPPHIRE_GPIO_MISC5_BASE + 2) +#define SAPPHIRE_GPIO_COMPASS_32K_EN (SAPPHIRE_GPIO_MISC5_BASE + 3) + +/* INT STATUS/LEVEL/MASK : INT GPIO should be the last. */ +#define SAPPHIRE_GPIO_NAVI_ACT_N (SAPPHIRE_GPIO_INT_B0_BASE + 0) +#define SAPPHIRE_GPIO_COMPASS_IRQ (SAPPHIRE_GPIO_INT_B0_BASE + 1) +#define SAPPHIRE_GPIO_SEARCH_ACT_N (SAPPHIRE_GPIO_INT_B0_BASE + 2) +#define SAPPHIRE_GPIO_AUD_HSMIC_DET_N (SAPPHIRE_GPIO_INT_B0_BASE + 3) +#define SAPPHIRE_GPIO_SDMC_CD_N (SAPPHIRE_GPIO_INT_B0_BASE + 4) +#define SAPPHIRE_GPIO_CAM_BTN_STEP1_N (SAPPHIRE_GPIO_INT_B0_BASE + 5) +#define SAPPHIRE_GPIO_CAM_BTN_STEP2_N (SAPPHIRE_GPIO_INT_B0_BASE + 6) +#define SAPPHIRE_GPIO_TP_ATT_N (SAPPHIRE_GPIO_INT_B0_BASE + 7) + +#define SAPPHIRE_GPIO_END SAPPHIRE_GPIO_TP_ATT_N +#define SAPPHIRE_GPIO_LAST_INT (SAPPHIRE_GPIO_TP_ATT_N) + +/* Bit position in the CPLD MISCn by the CPLD GPIOn: only bit0-7 is used. */ +#define CPLD_GPIO_BIT_POS_MASK(n) (1U << ((n) & 7)) +#define CPLD_GPIO_REG_OFFSET(n) _g_CPLD_MISCn_Offset[((n)-SAPPHIRE_GPIO_START) >> 3] +#define CPLD_GPIO_REG(n) (CPLD_GPIO_REG_OFFSET(n) + SAPPHIRE_CPLD_BASE) + +/* +** CPLD INT Start +*/ +#define SAPPHIRE_INT_START (NR_MSM_IRQS + NR_GPIO_IRQS) /* pseudo number for CPLD INT */ +/* Using INT status/Bank0 for GPIO to INT */ +#define SAPPHIRE_GPIO_TO_INT(n) ((n-SAPPHIRE_GPIO_INT_B0_BASE) + SAPPHIRE_INT_START) +#define SAPPHIRE_INT_END (SAPPHIRE_GPIO_TO_INT(SAPPHIRE_GPIO_END)) + +/* get the INT reg by GPIO number */ +#define CPLD_INT_GPIO_TO_BANK(n) (((n)-SAPPHIRE_GPIO_INT_B0_BASE) >> 3) +#define CPLD_INT_STATUS_REG_OFFSET_G(n) _g_INT_BANK_Offset[CPLD_INT_GPIO_TO_BANK(n)][0] +#define CPLD_INT_LEVEL_REG_OFFSET_G(n) _g_INT_BANK_Offset[CPLD_INT_GPIO_TO_BANK(n)][1] +#define CPLD_INT_MASK_REG_OFFSET_G(n) _g_INT_BANK_Offset[CPLD_INT_GPIO_TO_BANK(n)][2] +#define CPLD_INT_STATUS_REG_G(n) (SAPPHIRE_CPLD_BASE + CPLD_INT_STATUS_REG_OFFSET_G(n)) +#define CPLD_INT_LEVEL_REG_G(n) (SAPPHIRE_CPLD_BASE + CPLD_INT_LEVEL_REG_OFFSET_G(n)) +#define CPLD_INT_MASK_REG_G(n) (SAPPHIRE_CPLD_BASE + CPLD_INT_MASK_REG_OFFSET_G(n)) + +/* get the INT reg by INT number */ +#define CPLD_INT_TO_BANK(i) ((i-SAPPHIRE_INT_START) >> 3) +#define CPLD_INT_STATUS_REG_OFFSET(i) _g_INT_BANK_Offset[CPLD_INT_TO_BANK(i)][0] +#define CPLD_INT_LEVEL_REG_OFFSET(i) _g_INT_BANK_Offset[CPLD_INT_TO_BANK(i)][1] +#define CPLD_INT_MASK_REG_OFFSET(i) _g_INT_BANK_Offset[CPLD_INT_TO_BANK(i)][2] +#define CPLD_INT_STATUS_REG(i) (SAPPHIRE_CPLD_BASE + CPLD_INT_STATUS_REG_OFFSET(i)) +#define CPLD_INT_LEVEL_REG(i) (SAPPHIRE_CPLD_BASE + CPLD_INT_LEVEL_REG_OFFSET(i)) +#define CPLD_INT_MASK_REG(i) (SAPPHIRE_CPLD_BASE + CPLD_INT_MASK_REG_OFFSET(i)) + +/* return the bit mask by INT number */ +#define SAPPHIRE_INT_BIT_MASK(i) (1U << ((i - SAPPHIRE_INT_START) & 7)) + +void config_sapphire_camera_on_gpios(void); +void config_sapphire_camera_off_gpios(void); +int sapphire_get_smi_size(void); +unsigned int sapphire_get_hwid(void); +unsigned int sapphire_get_skuid(void); +unsigned int is_12pin_camera(void); +int sapphire_is_5M_camera(void); +int sapphire_gpio_write(struct gpio_chip *chip, unsigned n, unsigned on); + +#endif /* GUARD */ -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2] arm: msm: fix up very basic HTC Sapphire support 2012-05-12 0:15 ` [PATCH v2] arm: msm: fix up very basic HTC Sapphire support David Brown @ 2012-05-12 5:45 ` Olof Johansson 2012-05-12 7:17 ` David Brown 0 siblings, 1 reply; 6+ messages in thread From: Olof Johansson @ 2012-05-12 5:45 UTC (permalink / raw) To: linux-arm-kernel Hi, Sorry, I should have found the below items on the first review and not now on the second one, but see below. On Fri, May 11, 2012 at 5:15 PM, David Brown <davidb@codeaurora.org> wrote: > From: Daniel Walker <dwalker@fifo99.com> > > Adds sapphire into the make file, and fixes all the code problems that > prevented it from building (including adding board-sapphire.h) > > [davidb at codeaurora.org: Move MACH_TROUT selection back under > ARCH_MSM7X00A] > > Signed-off-by: Daniel Walker <dwalker@fifo99.com> > Signed-off-by: David Brown <davidb@codeaurora.org> > --- > v2 - Moved MACH_TROUT selection back under the ARCH config target > > ?arch/arm/mach-msm/Kconfig ? ? ? ? ?| ? ?9 +- > ?arch/arm/mach-msm/Makefile ? ? ? ? | ? ?1 + > ?arch/arm/mach-msm/board-sapphire.c | ? 18 +-- > ?arch/arm/mach-msm/board-sapphire.h | ?224 ++++++++++++++++++++++++++++++++++++ > ?4 files changed, 234 insertions(+), 18 deletions(-) > ?create mode 100644 arch/arm/mach-msm/board-sapphire.h > > diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig > index 1cd40ad..70eae63 100644 > --- a/arch/arm/mach-msm/Kconfig > +++ b/arch/arm/mach-msm/Kconfig > @@ -6,7 +6,7 @@ choice > > ?config ARCH_MSM7X00A > ? ? ? ?bool "MSM7x00A / MSM7x01A" > - ? ? ? select MACH_TROUT if !MACH_HALIBUT > + ? ? ? select MACH_TROUT if (!MACH_HALIBUT && !MACH_SAPPHIRE) Better, thanks! > diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile > index 4ad3969..aff4e5c 100644 > --- a/arch/arm/mach-msm/Makefile > +++ b/arch/arm/mach-msm/Makefile > @@ -20,6 +20,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) > ?obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o > ?obj-$(CONFIG_SMP) += headsmp.o platsmp.o > > +obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire.o devices-msm7x00.o > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o > ?obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o Unrelated to this change per se, but it seems like devices-msm7x00.o should be on an obj-$(CONFIG_ARCH_MSM7X00A) statement instead of duplicated for all boards. Also, the trout line is mostly duplicated, only delta is panel. Looks broken. Both of these things is material for a separate patch though. > diff --git a/arch/arm/mach-msm/board-sapphire.h b/arch/arm/mach-msm/board-sapphire.h > new file mode 100644 > index 0000000..70f925e > --- /dev/null > +++ b/arch/arm/mach-msm/board-sapphire.h > @@ -0,0 +1,224 @@ [..] > +void config_sapphire_camera_on_gpios(void); > +void config_sapphire_camera_off_gpios(void); > +int sapphire_get_smi_size(void); > +unsigned int sapphire_get_hwid(void); > +unsigned int sapphire_get_skuid(void); > +unsigned int is_12pin_camera(void); > +int sapphire_is_5M_camera(void); > +int sapphire_gpio_write(struct gpio_chip *chip, unsigned n, unsigned on); Many (all?) of these functions are not to be found in the code. Please don't add prototypes for code that isn't there. -Olof ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] arm: msm: fix up very basic HTC Sapphire support 2012-05-12 5:45 ` Olof Johansson @ 2012-05-12 7:17 ` David Brown 0 siblings, 0 replies; 6+ messages in thread From: David Brown @ 2012-05-12 7:17 UTC (permalink / raw) To: linux-arm-kernel On Fri, May 11, 2012 at 10:45:52PM -0700, Olof Johansson wrote: > Sorry, I should have found the below items on the first review and not > now on the second one, but see below. Daniel, I don't mind fixing up minor things, but can you take care of the other issues that Olof has brought up. Thanks, David > On Fri, May 11, 2012 at 5:15 PM, David Brown <davidb@codeaurora.org> wrote: > > From: Daniel Walker <dwalker@fifo99.com> > > > > Adds sapphire into the make file, and fixes all the code problems that > > prevented it from building (including adding board-sapphire.h) > > > > [davidb at codeaurora.org: Move MACH_TROUT selection back under > > ARCH_MSM7X00A] > > > > Signed-off-by: Daniel Walker <dwalker@fifo99.com> > > Signed-off-by: David Brown <davidb@codeaurora.org> > > --- > > v2 - Moved MACH_TROUT selection back under the ARCH config target > > > > ?arch/arm/mach-msm/Kconfig ? ? ? ? ?| ? ?9 +- > > ?arch/arm/mach-msm/Makefile ? ? ? ? | ? ?1 + > > ?arch/arm/mach-msm/board-sapphire.c | ? 18 +-- > > ?arch/arm/mach-msm/board-sapphire.h | ?224 ++++++++++++++++++++++++++++++++++++ > > ?4 files changed, 234 insertions(+), 18 deletions(-) > > ?create mode 100644 arch/arm/mach-msm/board-sapphire.h > > > > diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig > > index 1cd40ad..70eae63 100644 > > --- a/arch/arm/mach-msm/Kconfig > > +++ b/arch/arm/mach-msm/Kconfig > > @@ -6,7 +6,7 @@ choice > > > > ?config ARCH_MSM7X00A > > ? ? ? ?bool "MSM7x00A / MSM7x01A" > > - ? ? ? select MACH_TROUT if !MACH_HALIBUT > > + ? ? ? select MACH_TROUT if (!MACH_HALIBUT && !MACH_SAPPHIRE) > > Better, thanks! > > > > diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile > > index 4ad3969..aff4e5c 100644 > > --- a/arch/arm/mach-msm/Makefile > > +++ b/arch/arm/mach-msm/Makefile > > @@ -20,6 +20,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) > > ?obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o > > ?obj-$(CONFIG_SMP) += headsmp.o platsmp.o > > > > +obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire.o devices-msm7x00.o > > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o > > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o > > ?obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o > > Unrelated to this change per se, but it seems like devices-msm7x00.o > should be on an obj-$(CONFIG_ARCH_MSM7X00A) statement instead of > duplicated for all boards. > > Also, the trout line is mostly duplicated, only delta is panel. Looks > broken. Both of these things is material for a separate patch though. > > > diff --git a/arch/arm/mach-msm/board-sapphire.h b/arch/arm/mach-msm/board-sapphire.h > > new file mode 100644 > > index 0000000..70f925e > > --- /dev/null > > +++ b/arch/arm/mach-msm/board-sapphire.h > > @@ -0,0 +1,224 @@ > [..] > > +void config_sapphire_camera_on_gpios(void); > > +void config_sapphire_camera_off_gpios(void); > > +int sapphire_get_smi_size(void); > > +unsigned int sapphire_get_hwid(void); > > +unsigned int sapphire_get_skuid(void); > > +unsigned int is_12pin_camera(void); > > +int sapphire_is_5M_camera(void); > > +int sapphire_gpio_write(struct gpio_chip *chip, unsigned n, unsigned on); > > Many (all?) of these functions are not to be found in the code. Please > don't add prototypes for code that isn't there. > > > -Olof -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <q7bdy899mt3um93hikst04au.1336884464056@email.android.com>]
* [PATCH v2] arm: msm: fix up very basic HTC Sapphire support [not found] <q7bdy899mt3um93hikst04au.1336884464056@email.android.com> @ 2012-05-13 5:56 ` David Brown 2012-05-15 10:19 ` Shantanu Gupta 0 siblings, 1 reply; 6+ messages in thread From: David Brown @ 2012-05-13 5:56 UTC (permalink / raw) To: linux-arm-kernel On Sat, May 12, 2012 at 09:47:44PM -0700, Daniel Walker wrote: > What you did wasn't what I was suggesting you do... > > Keep your pull request available as it originally was and ill comment on the thread.. Please send out updated patches when you've addressed the issues, and I'll gladly pull them in. As for now, Olof has already pulled the tree without the Sapphire changes. David > Daniel > > David Brown <davidb@codeaurora.org> wrote: > > >On Fri, May 11, 2012 at 10:45:52PM -0700, Olof Johansson wrote: > > > >> Sorry, I should have found the below items on the first review and not > >> now on the second one, but see below. > > > >Daniel, I don't mind fixing up minor things, but can you take care of > >the other issues that Olof has brought up. > > > >Thanks, > >David > > > >> On Fri, May 11, 2012 at 5:15 PM, David Brown <davidb@codeaurora.org> wrote: > >> > From: Daniel Walker <dwalker@fifo99.com> > >> > > >> > Adds sapphire into the make file, and fixes all the code problems that > >> > prevented it from building (including adding board-sapphire.h) > >> > > >> > [davidb at codeaurora.org: Move MACH_TROUT selection back under > >> > ARCH_MSM7X00A] > >> > > >> > Signed-off-by: Daniel Walker <dwalker@fifo99.com> > >> > Signed-off-by: David Brown <davidb@codeaurora.org> > >> > --- > >> > v2 - Moved MACH_TROUT selection back under the ARCH config target > >> > > >> > ?arch/arm/mach-msm/Kconfig ? ? ? ? ?| ? ?9 +- > >> > ?arch/arm/mach-msm/Makefile ? ? ? ? | ? ?1 + > >> > ?arch/arm/mach-msm/board-sapphire.c | ? 18 +-- > >> > ?arch/arm/mach-msm/board-sapphire.h | ?224 ++++++++++++++++++++++++++++++++++++ > >> > ?4 files changed, 234 insertions(+), 18 deletions(-) > >> > ?create mode 100644 arch/arm/mach-msm/board-sapphire.h > >> > > >> > diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig > >> > index 1cd40ad..70eae63 100644 > >> > --- a/arch/arm/mach-msm/Kconfig > >> > +++ b/arch/arm/mach-msm/Kconfig > >> > @@ -6,7 +6,7 @@ choice > >> > > >> > ?config ARCH_MSM7X00A > >> > ? ? ? ?bool "MSM7x00A / MSM7x01A" > >> > - ? ? ? select MACH_TROUT if !MACH_HALIBUT > >> > + ? ? ? select MACH_TROUT if (!MACH_HALIBUT && !MACH_SAPPHIRE) > >> > >> Better, thanks! > >> > >> > >> > diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile > >> > index 4ad3969..aff4e5c 100644 > >> > --- a/arch/arm/mach-msm/Makefile > >> > +++ b/arch/arm/mach-msm/Makefile > >> > @@ -20,6 +20,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) > >> > ?obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o > >> > ?obj-$(CONFIG_SMP) += headsmp.o platsmp.o > >> > > >> > +obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire.o devices-msm7x00.o > >> > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o > >> > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o > >> > ?obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o > >> > >> Unrelated to this change per se, but it seems like devices-msm7x00.o > >> should be on an obj-$(CONFIG_ARCH_MSM7X00A) statement instead of > >> duplicated for all boards. > >> > >> Also, the trout line is mostly duplicated, only delta is panel. Looks > >> broken. Both of these things is material for a separate patch though. > >> > >> > diff --git a/arch/arm/mach-msm/board-sapphire.h b/arch/arm/mach-msm/board-sapphire.h > >> > new file mode 100644 > >> > index 0000000..70f925e > >> > --- /dev/null > >> > +++ b/arch/arm/mach-msm/board-sapphire.h > >> > @@ -0,0 +1,224 @@ > >> [..] > >> > +void config_sapphire_camera_on_gpios(void); > >> > +void config_sapphire_camera_off_gpios(void); > >> > +int sapphire_get_smi_size(void); > >> > +unsigned int sapphire_get_hwid(void); > >> > +unsigned int sapphire_get_skuid(void); > >> > +unsigned int is_12pin_camera(void); > >> > +int sapphire_is_5M_camera(void); > >> > +int sapphire_gpio_write(struct gpio_chip *chip, unsigned n, unsigned on); > >> > >> Many (all?) of these functions are not to be found in the code. Please > >> don't add prototypes for code that isn't there. > >> > >> > >> -Olof > > > >-- > >Sent by an employee of the Qualcomm Innovation Center, Inc. > >The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. > > -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] arm: msm: fix up very basic HTC Sapphire support 2012-05-13 5:56 ` David Brown @ 2012-05-15 10:19 ` Shantanu Gupta 2012-05-15 15:15 ` David Brown 0 siblings, 1 reply; 6+ messages in thread From: Shantanu Gupta @ 2012-05-15 10:19 UTC (permalink / raw) To: linux-arm-kernel Sorry for thread jacking, but do you still have an actively supported 8x50 board ? ( ie. mahimahi) >> >> On Fri, May 11, 2012 at 5:15 PM, David Brown <davidb@codeaurora.org> wrote: >> >> > From: Daniel Walker <dwalker@fifo99.com> >> >> > >> >> > Adds sapphire into the make file, and fixes all the code problems that >> >> > prevented it from building (including adding board-sapphire.h) >> >> > >> >> > [davidb at codeaurora.org: Move MACH_TROUT selection back under >> >> > ARCH_MSM7X00A] >> >> > >> >> > Signed-off-by: Daniel Walker <dwalker@fifo99.com> >> >> > Signed-off-by: David Brown <davidb@codeaurora.org> >> >> > --- >> >> > v2 - Moved MACH_TROUT selection back under the ARCH config target >> >> > >> >> > ?arch/arm/mach-msm/Kconfig ? ? ? ? ?| ? ?9 +- >> >> > ?arch/arm/mach-msm/Makefile ? ? ? ? | ? ?1 + >> >> > ?arch/arm/mach-msm/board-sapphire.c | ? 18 +-- >> >> > ?arch/arm/mach-msm/board-sapphire.h | ?224 ++++++++++++++++++++++++++++++++++++ >> >> > ?4 files changed, 234 insertions(+), 18 deletions(-) >> >> > ?create mode 100644 arch/arm/mach-msm/board-sapphire.h >> >> > >> >> > diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig >> >> > index 1cd40ad..70eae63 100644 >> >> > --- a/arch/arm/mach-msm/Kconfig >> >> > +++ b/arch/arm/mach-msm/Kconfig >> >> > @@ -6,7 +6,7 @@ choice >> >> > >> >> > ?config ARCH_MSM7X00A >> >> > ? ? ? ?bool "MSM7x00A / MSM7x01A" >> >> > - ? ? ? select MACH_TROUT if !MACH_HALIBUT >> >> > + ? ? ? select MACH_TROUT if (!MACH_HALIBUT && !MACH_SAPPHIRE) >> >> >> >> Better, thanks! >> >> >> >> >> >> > diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile >> >> > index 4ad3969..aff4e5c 100644 >> >> > --- a/arch/arm/mach-msm/Makefile >> >> > +++ b/arch/arm/mach-msm/Makefile >> >> > @@ -20,6 +20,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) >> >> > ?obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o >> >> > ?obj-$(CONFIG_SMP) += headsmp.o platsmp.o >> >> > >> >> > +obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire.o devices-msm7x00.o >> >> > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o >> >> > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o >> >> > ?obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o >> >> >> >> Unrelated to this change per se, but it seems like devices-msm7x00.o >> >> should be on an obj-$(CONFIG_ARCH_MSM7X00A) statement instead of >> >> duplicated for all boards. >> >> >> >> Also, the trout line is mostly duplicated, only delta is panel. Looks >> >> broken. Both of these things is material for a separate patch though. >> >> >> >> > diff --git a/arch/arm/mach-msm/board-sapphire.h b/arch/arm/mach-msm/board-sapphire.h >> >> > new file mode 100644 >> >> > index 0000000..70f925e >> >> > --- /dev/null >> >> > +++ b/arch/arm/mach-msm/board-sapphire.h >> >> > @@ -0,0 +1,224 @@ >> >> [..] >> >> > +void config_sapphire_camera_on_gpios(void); >> >> > +void config_sapphire_camera_off_gpios(void); >> >> > +int sapphire_get_smi_size(void); >> >> > +unsigned int sapphire_get_hwid(void); >> >> > +unsigned int sapphire_get_skuid(void); >> >> > +unsigned int is_12pin_camera(void); >> >> > +int sapphire_is_5M_camera(void); >> >> > +int sapphire_gpio_write(struct gpio_chip *chip, unsigned n, unsigned on); >> >> >> >> Many (all?) of these functions are not to be found in the code. Please >> >> don't add prototypes for code that isn't there. >> >> >> >> >> >> -Olof >> > >> >-- >> >Sent by an employee of the Qualcomm Innovation Center, Inc. >> >The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. >> > > > -- > Sent by an employee of the Qualcomm Innovation Center, Inc. > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at ?http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] arm: msm: fix up very basic HTC Sapphire support 2012-05-15 10:19 ` Shantanu Gupta @ 2012-05-15 15:15 ` David Brown 0 siblings, 0 replies; 6+ messages in thread From: David Brown @ 2012-05-15 15:15 UTC (permalink / raw) To: linux-arm-kernel On Tue, May 15, 2012 at 03:49:00PM +0530, Shantanu Gupta wrote: > Sorry for thread jacking, but do you still have an actively supported > 8x50 board ? ( ie. mahimahi) I still have a working 8x50 dev board (SURF), but I don't use it very much, but I do test it occasionally. None of my 8x50 phone-type devices work any more. It doesn't look like the mahimahi code has ever been compiled, though. If no one objects, I'll just send out a patch to remove the board-mahimahi.c file, since nothing references it, and it doesn't have very useful support, anyway. David -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-15 15:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CAOesGMiHfQwWXSQwvcEPxY63FEjbsB7ux4dHvAPM99Kf43cDZw@mail.gmail.com>
2012-05-12 0:15 ` [PATCH v2] arm: msm: fix up very basic HTC Sapphire support David Brown
2012-05-12 5:45 ` Olof Johansson
2012-05-12 7:17 ` David Brown
[not found] <q7bdy899mt3um93hikst04au.1336884464056@email.android.com>
2012-05-13 5:56 ` David Brown
2012-05-15 10:19 ` Shantanu Gupta
2012-05-15 15:15 ` David Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).