From patchwork Wed Apr 10 12:10:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanjay Singh Rawat X-Patchwork-Id: 16015 Return-Path: X-Original-To: linaro@staging.patches.linaro.org Delivered-To: linaro@staging.patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1CC5223912 for ; Wed, 10 Apr 2013 12:10:48 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id p7sf500298qcq.10 for ; Wed, 10 Apr 2013 05:10:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=9s+BTmwqTMdBPAJqtMx0gMiXFI7131mvY7MA2oSx4g0=; b=BLEqb6cIz7D5ypiDcJlcwWxr0sdd0xqyDvlpoU9ULezKrmxjDe5iMzVaUDR8Td+DFD gLZ8kj45BlqpiLBA1nXGt8iELiq6oDCo8fAMXjuHcDXmTh9yHFWiqecpQ3m8cDFZSSdU f2Cnewu/GNLGqTv/eNKmGTokhwwrOhU96b5xlrjM6di7WnfDR3ZCN0lgiUSHizzjTyPR KO5CBnjgMaaTN9x0PLr5t8EiybOl2ysNB+Tlzeu9bHbv3vwXaoFhEBjAUtG7WmSOY31g xhboFUT7f6vZgQFP0iXfYzsf6LWBJ60H79DJKHk5btk7HSAeVu2kf5WlMSmufjWepbpk wntA== X-Received: by 10.58.221.70 with SMTP id qc6mr661945vec.36.1365595828356; Wed, 10 Apr 2013 05:10:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.102 with SMTP id 6ls226892qed.24.gmail; Wed, 10 Apr 2013 05:10:28 -0700 (PDT) X-Received: by 10.220.103.7 with SMTP id i7mr1259523vco.7.1365595828105; Wed, 10 Apr 2013 05:10:28 -0700 (PDT) Received: from mail-vb0-x235.google.com (mail-vb0-x235.google.com [2607:f8b0:400c:c02::235]) by mx.google.com with ESMTPS id sa4si3207363vdc.140.2013.04.10.05.10.28 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Apr 2013 05:10:28 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::235; Received: by mail-vb0-f53.google.com with SMTP id i3so281104vbh.26 for ; Wed, 10 Apr 2013 05:10:28 -0700 (PDT) X-Received: by 10.220.77.138 with SMTP id g10mr1162539vck.69.1365595827907; Wed, 10 Apr 2013 05:10:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.85.136 with SMTP id h8csp102671vez; Wed, 10 Apr 2013 05:10:27 -0700 (PDT) X-Received: by 10.66.184.203 with SMTP id ew11mr3217475pac.73.1365595826548; Wed, 10 Apr 2013 05:10:26 -0700 (PDT) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by mx.google.com with ESMTPS id tr1si229899pab.123.2013.04.10.05.10.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Apr 2013 05:10:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.54 is neither permitted nor denied by best guess record for domain of sanjay.rawat@linaro.org) client-ip=209.85.220.54; Received: by mail-pa0-f54.google.com with SMTP id fa11so282700pad.13 for ; Wed, 10 Apr 2013 05:10:26 -0700 (PDT) X-Received: by 10.66.123.105 with SMTP id lz9mr3181216pab.137.1365595825888; Wed, 10 Apr 2013 05:10:25 -0700 (PDT) Received: from srawat-Latitude-E6420.LGE.NET ([203.247.149.152]) by mx.google.com with ESMTPS id jk11sm6296204pbb.0.2013.04.10.05.10.22 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Apr 2013 05:10:24 -0700 (PDT) From: Sanjay Singh Rawat To: idle.sonu@gmail.com Cc: patches@linaro.org Subject: panda defoncfig dts change Date: Wed, 10 Apr 2013 17:40:22 +0530 Message-Id: <1365595823-20876-1-git-send-email-sanjay.rawat@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQkXgvZ9QKmrUJz0NYeUwmVS7kvZpA69dbSDFUxr52Unv5ihuPsoatkHqZSO3lUEhQf3wjMu X-Original-Sender: sanjay.rawat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index 4122efe..03e35fb 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -34,6 +34,15 @@ }; }; + lgt { + compatible = "lg-thermal"; + + }; + + chosen { + bootargs = "console=ttyO2,115200n8"; + }; + sound: sound { compatible = "ti,abe-twl6040"; ti,model = "PandaBoard"; diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index bd07864..2fe8f95 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -20,6 +20,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_OMAP=y CONFIG_ARCH_OMAP2PLUS=y CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_MUX_DEBUG=y @@ -33,7 +34,7 @@ CONFIG_NR_CPUS=2 CONFIG_LEDS=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" +CONFIG_CMDLINE="" CONFIG_KEXEC=y CONFIG_FPE_NWFPE=y CONFIG_BINFMT_MISC=y @@ -50,6 +51,14 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=y +CONFIG_INET_ESP=y +CONFIG_INET_IPCOMP=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y @@ -102,7 +111,11 @@ CONFIG_NETDEVICES=y CONFIG_SMSC_PHY=y CONFIG_NET_ETHERNET=y CONFIG_SMC91X=y +CONFIG_SMC911X=y CONFIG_SMSC911X=y +CONFIG_NET_ETHERNET=y +CONFIG_TI_DAVINCI_EMAC=y +CONFIG_SMSC_PHY=y CONFIG_KS8851=y CONFIG_KS8851_MLL=y CONFIG_LIBERTAS=m @@ -110,7 +123,10 @@ CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_SDIO=m CONFIG_LIBERTAS_DEBUG=y CONFIG_USB_USBNET=y +CONFIG_USB_NET_CDC_EEM=y +CONFIG_USB_NET_SMSC75XX=y CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_RNDIS_HOST=y CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_EPSON2888=y @@ -147,6 +163,9 @@ CONFIG_GPIO_TWL4030=y CONFIG_W1=y CONFIG_POWER_SUPPLY=y CONFIG_SENSORS_LM75=m +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y +CONFIG_THERMAL_EMULATION=y CONFIG_WATCHDOG=y CONFIG_OMAP_WATCHDOG=y CONFIG_TWL4030_WATCHDOG=y @@ -201,6 +220,8 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_DEVICEFS=y CONFIG_USB_SUSPEND=y CONFIG_USB_MON=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_WDM=y CONFIG_USB_STORAGE=y CONFIG_USB_LIBUSUAL=y @@ -266,7 +287,7 @@ CONFIG_PROVE_LOCKING=y CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set +CONFIG_KGDB=y CONFIG_SECURITY=y CONFIG_CRYPTO_MICHAEL_MIC=y # CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c index 96093b7..1cb7857 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c @@ -1049,7 +1049,8 @@ static struct notifier_block __cpuinitdata dbg_cpu_pm_nb = { static void __init pm_init(void) { - cpu_pm_register_notifier(&dbg_cpu_pm_nb); + if(has_ossr) + cpu_pm_register_notifier(&dbg_cpu_pm_nb); } #else static inline void pm_init(void) diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index d3a2b38..fe9f5e4 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -3,6 +3,7 @@ # obj-$(CONFIG_THERMAL) += thermal_sys.o +obj-y += lg_thermal.o # governors obj-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o