From 4f82c598a148c8afe45e7a12e8e40ea38101aed6 Mon Sep 17 00:00:00 2001 From: ckkim Date: Mon, 10 Nov 2014 17:57:09 +0900 Subject: [PATCH] Merged rpi Linux 3.12.32+, And combined i2c-0 rc5t619 regulator, rtc, power, adc driver Change-Id: I8e1f59e651a92a693e29d83c6f4be99176f54fde --- arch/arm/configs/odroidw_defconfig | 56 ++++++++++++++++++++++-------- arch/arm/mach-bcm2708/bcm2708.c | 2 +- drivers/i2c/busses/i2c-bcm2708.c | 2 +- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/arch/arm/configs/odroidw_defconfig b/arch/arm/configs/odroidw_defconfig index 29719bda2f7b..aa48f0e41b62 100644 --- a/arch/arm/configs/odroidw_defconfig +++ b/arch/arm/configs/odroidw_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.12.25 Kernel Configuration +# Linux/arm 3.12.32 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -266,6 +266,7 @@ CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_FREEZER=y # @@ -872,7 +873,10 @@ CONFIG_SCTP_COOKIE_HMAC_MD5=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y # CONFIG_RDS is not set # CONFIG_TIPC is not set -# CONFIG_ATM is not set +CONFIG_ATM=m +# CONFIG_ATM_CLIP is not set +# CONFIG_ATM_LANE is not set +# CONFIG_ATM_BR2684 is not set CONFIG_L2TP=m # CONFIG_L2TP_DEBUGFS is not set CONFIG_L2TP_V3=y @@ -905,6 +909,7 @@ CONFIG_NET_SCHED=y CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m +# CONFIG_NET_SCH_ATM is not set CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m @@ -1218,7 +1223,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # # EEPROM support # -# CONFIG_EEPROM_AT24 is not set +CONFIG_EEPROM_AT24=m # CONFIG_EEPROM_AT25 is not set # CONFIG_EEPROM_LEGACY is not set # CONFIG_EEPROM_MAX6875 is not set @@ -1330,6 +1335,9 @@ CONFIG_NET_POLL_CONTROLLER=y CONFIG_TUN=m CONFIG_VETH=m # CONFIG_NLMON is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +# CONFIG_ATM_TCP is not set # # CAIF transport drivers @@ -1415,6 +1423,7 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_FILTER=y CONFIG_PPP_MPPE=m CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m CONFIG_PPPOE=m # CONFIG_PPTP is not set CONFIG_PPPOL2TP=m @@ -1722,7 +1731,7 @@ CONFIG_MAX_RAW_DEVS=256 # CONFIG_TCG_TPM is not set CONFIG_BRCM_CHAR_DRIVERS=y CONFIG_BCM_VC_CMA=y -# CONFIG_BCM_VC_SM is not set +CONFIG_BCM_VC_SM=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y @@ -1795,7 +1804,15 @@ CONFIG_SPI_SPIDEV=y # # PPS support # -# CONFIG_PPS is not set +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_GPIO=m # # PPS generators support @@ -1911,7 +1928,7 @@ CONFIG_BATTERY_RC5T619=y # CONFIG_CHARGER_BQ24190 is not set # CONFIG_CHARGER_SMB347 is not set CONFIG_POWER_RESET=y -# CONFIG_POWER_RESET_RESTART is not set +CONFIG_POWER_RESET_RESTART=y # CONFIG_POWER_AVS is not set # CONFIG_HWMON is not set CONFIG_THERMAL=y @@ -2185,7 +2202,7 @@ CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m CONFIG_USB_SN9C102=m -# CONFIG_VIDEO_USBTV is not set +CONFIG_VIDEO_USBTV=m # # Analog TV USB devices @@ -2670,15 +2687,17 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_ATMEL_SOC is not set CONFIG_SND_BCM2708_SOC_I2S=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m -CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m +# CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS is not set +# CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI is not set +CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m CONFIG_SND_BCM2708_SOC_RPI_DAC=m # CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC is not set # CONFIG_SND_DESIGNWARE_I2S is not set CONFIG_SND_SOC_I2C_AND_SPI=m CONFIG_SND_SOC_PCM1794A=m CONFIG_SND_SOC_PCM5102A=m -CONFIG_SND_SOC_WM8804=m -# CONFIG_SND_SIMPLE_CARD is not set +CONFIG_SND_SOC_TAS5713=m +CONFIG_SND_SIMPLE_CARD=m CONFIG_SOUND_PRIME=m CONFIG_AC97_BUS=m @@ -2709,7 +2728,7 @@ CONFIG_HID_DRAGONRISE=m # CONFIG_DRAGONRISE_FF is not set CONFIG_HID_EMS_FF=m CONFIG_HID_ELECOM=m -# CONFIG_HID_ELO is not set +CONFIG_HID_ELO=m CONFIG_HID_EZKEY=m CONFIG_HID_HOLTEK=m # CONFIG_HOLTEK_FF is not set @@ -2951,6 +2970,11 @@ CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m # CONFIG_USB_HSIC_USB3503 is not set +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m # # USB Physical Layer drivers @@ -2990,6 +3014,9 @@ CONFIG_MMC_SDHCI_PLTFM=y # CONFIG_MMC_SDHCI_PXAV2 is not set CONFIG_MMC_SDHCI_BCM2708=y CONFIG_MMC_SDHCI_BCM2708_DMA=y +CONFIG_MMC_BCM2835=y +CONFIG_MMC_BCM2835_DMA=y +CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 CONFIG_MMC_SPI=m # CONFIG_MMC_DW is not set # CONFIG_MMC_VUB300 is not set @@ -3137,9 +3164,9 @@ CONFIG_DMADEVICES=y # CONFIG_DW_DMAC is not set # CONFIG_TIMB_DMA is not set # CONFIG_PL330_DMA is not set -CONFIG_DMA_BCM2708=m +CONFIG_DMA_BCM2708=y CONFIG_DMA_ENGINE=y -CONFIG_DMA_VIRTUAL_CHANNELS=m +CONFIG_DMA_VIRTUAL_CHANNELS=y # # DMA Clients @@ -3626,6 +3653,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set CONFIG_CIFS=m @@ -3912,7 +3940,7 @@ CONFIG_CRYPTO_AUTHENC=m # CONFIG_CRYPTO_CBC=y # CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_ECB=m # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_PCBC is not set diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c index e4806617808e..87d08ad2d686 100644 --- a/arch/arm/mach-bcm2708/bcm2708.c +++ b/arch/arm/mach-bcm2708/bcm2708.c @@ -101,7 +101,7 @@ static unsigned w1_gpio_pin = W1_GPIO; static unsigned w1_gpio_pullup = W1_PULLUP; static int pps_gpio_pin = -1; static unsigned bcm2835_mmc = 1; -static bool vc_i2c_override = false; +static bool vc_i2c_override = true; static void __init bcm2708_init_led(void); diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c index 7ef126d84954..f78d37a5f780 100644 --- a/drivers/i2c/busses/i2c-bcm2708.c +++ b/drivers/i2c/busses/i2c-bcm2708.c @@ -74,7 +74,7 @@ static unsigned int baudrate = CONFIG_I2C_BCM2708_BAUDRATE; module_param(baudrate, uint, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); MODULE_PARM_DESC(baudrate, "The I2C baudrate"); -static bool combined = false; +static bool combined = true; module_param(combined, bool, 0644); MODULE_PARM_DESC(combined, "Use combined transactions");