aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-09-08ARM: OMAP4+: PM: Use only valid low power state for CPU hotplugNishanth Menon1-0/+4
Not all SoCs support OFF mode - for example DRA74/72. So, use valid power state during CPU hotplug. Signed-off-by: Nishanth Menon <[email protected]> Reviewed-by: Kevin Hilman <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP4+: PM: use only valid low power state for suspendNishanth Menon1-2/+4
We are using power domain state as RET and logic state as OFF. This state is OSWR. This may not always be supported on ALL power domains. In fact, on certain power domains, this might result in a hang on certain platforms. Instead, depend on powerdomain data to provide accurate information about the supported powerdomain states and use the appropriate function to query and use it as part of suspend path. Signed-off-by: Nishanth Menon <[email protected]> Reviewed-by: Kevin Hilman <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP4+: PM: Make logic state programmableNishanth Menon1-1/+4
Move the logic state as different for each power domain. This allows us to customize the deepest power state we should target over all for each powerdomain in the follow on patches. Signed-off-by: Nishanth Menon <[email protected]> Reviewed-by: Kevin Hilman <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP2+: powerdomain: introduce logic for finding valid power domainNishanth Menon2-0/+79
powerdomain configuration in OMAP is done using PWRSTCTRL register for each power domain. However, PRCM lets us write any value we'd like to the logic and power domain target states, however the SoC integration tends to actually function only at a few discrete states. These valid states are already in our powerdomains_xxx_data.c file. So, provide a function to easily query valid low power state that the power domain is allowed to go to. Based on work originally done by Jean Pihet <[email protected]> https://patchwork.kernel.org/patch/1325091/ . There is no attempt to create a new powerdomain solution here, except fixing issues seen attempting invalid programming attempts. Future consolidation to the generic powerdomain framework should consider this requirement as well. Similar solutions have been done in product kernels in the past such as: https://android.googlesource.com/kernel/omap.git/+blame/android-omap-panda-3.0/arch/arm/mach-omap2/pm44xx.c Signed-off-by: Nishanth Menon <[email protected]> Reviewed-by: Kevin Hilman <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP2+: powerdomain: pwrdm_for_each_clkdm iterate only valid clkdmsNishanth Menon1-1/+2
No need to invoke callback when the clkdm pointer is NULL. Signed-off-by: Nishanth Menon <[email protected]> Reviewed-by: Kevin Hilman <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP5: powerdomain data: fix powerdomain powerstateNishanth Menon1-6/+6
Update the power domain power states for final production chip capability. OFF mode, OSWR etc have been descoped for various domains. Signed-off-by: Nishanth Menon <[email protected]> Reviewed-by: Kevin Hilman <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP: DRA7: powerdomain data: fix powerdomain powerstateNishanth Menon2-7/+8
DRA7 supports only CSWR for CPU, MPU power domains. Core power domain supports upto INA. Signed-off-by: Nishanth Menon <[email protected]> Reviewed-by: Kevin Hilman <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP3+: PRM: register interrupt information from DTNishanth Menon1-0/+18
Allow the PRM interrupt information to be picked up from device tree. OMAP3 may use legacy boot and needs to be compatible with old dtbs (without interrupt populated), for these, we use the value which is pre-populated. Signed-off-by: Nishanth Menon <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP4+: PRM: Enable wakeup capability for OMAP5, DRA7Nishanth Menon1-1/+1
OMAP5 and DRA7 can now use pinctrl based I/O daisychain wakeup capability. So, enable the support. Signed-off-by: Nishanth Menon <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP4+: PRM: remove "wkup" eventNishanth Menon1-1/+0
"wkup" event at bit offset 0 exists only on OMAP3. OMAP4430/60 PRM_IRQSTATUS_A9, OMAP5/DRA7 PRM_IRQSTATUS_MPU register bit 0 is DPLL_CORE_RECAL_ST not wakeup event like OMAP3. The same applies to AM437x as well. Remove the wrong definition. Signed-off-by: Nishanth Menon <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP4+: PRM: register interrupt information from DTNishanth Menon1-0/+40
Allow the PRM interrupt information to be picked up from device tree. the only exception is for OMAP4 which uses values pre-populated and allows compatibility with older dtb. Signed-off-by: Nishanth Menon <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP4: PRM: use the generic prm_inst to allow logic to be abstractedNishanth Menon1-9/+38
use the generic function to pick up the prm_instance for a generic logic which can be reused from OMAP4+ Signed-off-by: Nishanth Menon <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-08ARM: OMAP4+: prminst: provide function to find prm_dev instance offsetNishanth Menon2-15/+28
PRM device instance can vary depending on SoC. We already handle the same during reset of the device, However, this is also needed for other logic instances. So, first abstract this out to a generic function. Signed-off-by: Nishanth Menon <[email protected]> Acked-by: Santosh Shilimkar <[email protected]>
2014-09-05Merge tag 'integrator-for-v3.18-1' of ↵Arnd Bergmann1-0/+48
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc Merge "single Integrator patch" from Linus Walleij: This sets up the dynamically detected IM-PD1 GPIO lines by way of GPIO descriptors, avoiding any use of the GPIO global numberspace. Signed-off-by: Arnd Bergmann <[email protected]> * tag 'integrator-for-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: add MMCI device to IM-PD1
2014-09-05Merge tag 'renesas-clk-for-v3.18' of ↵Arnd Bergmann1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC Clk Updates for v3.18" from Simon Horman: * Add r8a7794 support Signed-off-by: Arnd Bergmann <[email protected]> * tag 'renesas-clk-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: clk: shmobile: Add r8a7794 support
2014-09-05Merge tag 'renesas-cleanup-for-v3.18' of ↵Arnd Bergmann8-468/+0
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC Cleanup Updates for v3.18" from Simon Horman: * Remove Genmai board code Signed-off-by: Arnd Bergmann <[email protected]> * tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r7s72100: Remove legacy board support ARM: shmobile: r7s72100: genmai: Remove legacy board file ARM: shmobile: r7s72100: genmai: Remove reference board file
2014-09-05Merge tag 'renesas-dt-timers-for-v3.18' of ↵Arnd Bergmann21-84/+152
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC DT Timers Updates for v3.18" from Simon Horman: * Enable timers using DT when booting boards without Legacy-C code Signed-off-by: Arnd Bergmann <[email protected]> * tag 'renesas-dt-timers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: genmai-reference: Enable MTU2 in device tree ARM: shmobile: r7s72100: Add MTU2 device to DT ARM: shmobile: marzen-reference: Enable TMU0 in device tree ARM: shmobile: koelsch-reference: Enable CMT0 in device tree ARM: shmobile: lager-reference: Enable CMT0 in device tree ARM: shmobile: r8a7779: Add TMU devices to DT ARM: shmobile: r8a7791: Add CMT devices to DT ARM: shmobile: r8a7790: Add CMT devices to DT Conflicts: arch/arm/mach-shmobile/setup-r8a7779.c
2014-09-05Merge tag 'renesas-r8a7740-ccf-and-timers-for-v3.18' of ↵Arnd Bergmann6-19/+317
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC R8a7740 CCF and Timers Updates for v3.18" from Simon Horman: When booting using the r8a7740/armadillo800eva using dt-reference: * Use CCF to initialise clocks via DT * Initialise timers via DT Signed-off-by: Arnd Bergmann <[email protected]> * tag 'renesas-r8a7740-ccf-and-timers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7740: Remove r8a7740_add_standard_devices_dt ARM: shmobile: armadillo800eva-reference: Do not use r8a7740_add_standard_devices_dt() ARM: shmobile: armadillo800eva-reference: Enable CMT1 in device tree ARM: shmobile: r8a7740: Add CMT1 device to DT ARM: shmobile: armadillo800eva-reference: add clock overrides to DTS ARM: shmobile: r8a7740: add MSTP clock assignments to DT ARM: shmobile: r8a7740: add SoC clocks to DTS ARM: shmobile: r8a7740: clock register bits
2014-09-05Merge tag 'renesas-soc2-for-v3.18' of ↵Arnd Bergmann7-12/+9
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Second Round Of Renesas ARM Based SoC Updates For v3.18" from Simon Horman: * Move legacy INTC definitions from irqs.h to intc.h * Remove duplicate CPUFreq bits on r8a73a0/ape6evm Signed-off-by: Arnd Bergmann <[email protected]> * tag 'renesas-soc2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits
2014-09-05Merge tag 'renesas-init-delay-for-v3.18' of ↵Arnd Bergmann17-41/+25
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC Init Delay Updates For v3.18" from Simon Horman: * Use shmobile_init_delay across a wider range of SoCs Signed-off-by: Arnd Bergmann <[email protected]> * tag 'renesas-init-delay-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: kzm9g: Use shmobile_init_delay() ARM: shmobile: bockw: Use shmobile_init_delay() ARM: shmobile: r8a7778: Use shmobile_init_delay() ARM: shmobile: sh73a0: Use shmobile_init_delay() ARM: shmobile: Remove shmobile_setup_delay() ARM: shmobile: r8a73a4: Use shmobile_init_delay() ARM: shmobile: sh7372: Use shmobile_init_delay() ARM: shmobile: r8a7778: Update DTS to include CPU frequency ARM: shmobile: sh73a0: Update DTS to include CPU frequency ARM: shmobile: sh7372: Update DTS to include CPU frequency ARM: shmobile: kzm9g-reference: Remove unneeded nr_irqs initialization ARM: shmobile: kzm9g: Remove unneeded nr_irqs initialization ARM: shmobile: marzen: Remove NR_IRQS_LEGACY ARM: shmobile: ape6evm: Use shmobile_init_delay() ARM: shmobile: ape6evm: Add shmobile_init_late() ARM: shmobile: bockw: Add shmobile_init_late() ARM: shmobile: marzen: Add shmobile_init_late() ARM: shmobile: kzm9g: Add shmobile_init_late()
2014-09-05Merge tag 'renesas-soc-for-v3.18' of ↵Arnd Bergmann9-10/+9
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC Updates for v3.18" from Simon Horman: * Remove unnecessary nr_irqs initialisation on sh73a0, sh7372, and r8a7779 SoCs * Use defines hardcoded numbers for DMA * Rework multiplatform include workaround * Correctly use shmobile_init_late on a wider range of SoCs Signed-off-by: Arnd Bergmann <[email protected]> * tag 'renesas-soc-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: sh73a0: Remove unneeded nr_irqs initialization ARM: shmobile: sh7372: Remove unneeded nr_irqs initialization ARM: shmobile: r8a7779: Remove NR_IRQS_LEGACY ARM: shmobile: dma: Use defines instead of hardcoded numbers ARM: shmobile: Rework multiplatform include workaround ARM: shmobile: r7s72100: Add shmobile_init_late() ARM: shmobile: r8a73a4: Add shmobile_init_late() ARM: shmobile: r8a7778: Fix shmobile_init_late() ARM: shmobile: r8a7779: Fix shmobile_init_late() ARM: shmobile: sh73a0: Add shmobile_init_late() ARM: shmobile: r8a7778: Add missing call to shmobile_init_late()
2014-09-05ARM: shmobile: Initial r8a7794 SoC supportUlrich Hecht3-0/+40
Initial support for the r8a7794 SoC, based on work by Hisashi Nakamura. Signed-off-by: Ulrich Hecht <[email protected]> Acked-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-09-05ARM: shmobile: support Cortex-A7 in shmobile_init_delay()Ulrich Hecht1-4/+5
Signed-off-by: Ulrich Hecht <[email protected]> Acked-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-09-04ARM: clps711x: Add SOC BUS supportAlexander Shiyan2-1/+52
Add SOC BUS support with CPU family, machine name and unique ID. Signed-off-by: Alexander Shiyan <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2014-09-04ARM: clps711x: edb7211: Use new PWM driver for backlightAlexander Shiyan2-16/+25
Remove existing tricks for handling PWM and use CLPS711X PWM driver. Signed-off-by: Alexander Shiyan <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2014-09-04ARM: shmobile: armadillo800eva reference: Remove DTSMagnus Damm2-301/+0
The r8a7740 Armadillo800EVA DTS can now be used both for DT Multiplatform and the legacy case. Because of that remove the r8a7740 Armadillo800EVA DT reference DTS file. Signed-off-by: Magnus Damm <[email protected]> Tested-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-09-04ARM: shmobile: armadillo800eva reference: Remove C board codeMagnus Damm4-216/+0
Now when the r8a7740 generic multiplatform case has the same features as the DT reference board code then get rid of the Armadillo800EVA DT reference C board code. DT Reference code in the future shall make use of the r8a7740 Multiplatform support code with the generic SoC machine vector. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-09-03ARM: dts: am335x-bone*: Fix model name and update compatibility informationNishanth Menon3-3/+10
Beaglebone white and beaglebone black differ in tiny little aspects. This is the reason why we maintain seperate dts for these platforms. However, there is no real way to decode from dtb which platform it is since compatible and model name are the same for both platforms. Fix this so that beaglebone black and beaglebone are identifiable, while maintaining compatibility for older zImages which might use old beaglebone compatible flag for black as well. Reported-by: Tom Rini <[email protected]> Signed-off-by: Nishanth Menon <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2014-09-03ARM: dts: omap4-panda: Fix model and SoC family detailsNishanth Menon3-3/+10
Currently we claim that omap4-panda and omap4-panda-es are essentially the same, but they are not since PandaBoard-ES uses OMAP4460 and PandaBoard uses OMAP4430. So, split the common definition and make the model name available. Signed-off-by: Nishanth Menon <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2014-09-03ARM: debug: add HiP04 debug uartHaojian Zhuang1-0/+10
Add the support of Hisilicon HiP04 debug uart. Signed-off-by: Haojian Zhuang <[email protected]> Signed-off-by: Wei Xu <[email protected]>
2014-09-03ARM: config: enable hisilicon hip04Haojian Zhuang2-0/+14
Enable CONFIG_ARCH_HIP04 in both hi3xxx_defconfig & multi_v7_defconfig. Since CONFIG_ARM_LPAE is disabled by default, only 3GB memory could be support by this defconfig. User should enable CONFIG_ARM_LPAE locally to support 16GB memory on hip04 platform. Since hip04 doesn't belong to hi3xxx series, rename hi3xxx_defconfig to hisi_defconfig. Signed-off-by: Haojian Zhuang <[email protected]> Signed-off-by: Wei Xu <[email protected]>
2014-09-03ARM: dts: add hip04 dtsHaojian Zhuang3-0/+300
Add hip04-d01.dts & hip04.dtsi for hip04 SoC platform. Signed-off-by: Haojian Zhuang <[email protected]> Signed-off-by: Wei Xu <[email protected]>
2014-09-03document: dt: add the binding on HiP04Haojian Zhuang1-0/+23
Add Hisilicon HiP04 SoC platform & Fabric controller. Fabric controller could be used to configure snoop filter among multiple clusters. Signed-off-by: Haojian Zhuang <[email protected]> Signed-off-by: Wei Xu <[email protected]>
2014-09-03ARM: hisi: enable HiP04Haojian Zhuang2-0/+18
Support HiP04 SoC what supports 16 cores. And it relies on MCPM framework. Signed-off-by: Haojian Zhuang <[email protected]> Signed-off-by: Wei Xu <[email protected]>
2014-09-03ARM: hisi: enable MCPM implementationHaojian Zhuang2-0/+387
Multiple CPU clusters are used in Hisilicon HiP04 SoC. Now use MCPM framework to manage power on HiP04 SoC. Changelog: v20: * Disable L2 prefetch when the whole cluster is down. * Move disabling snoop filter into power_down() after L2 prefetch disabled. * Remove delay in wait_for_power_down() after L2 prefetch disabled. * Add the sleep polling in wait_for_power_down() again since we need to wait L2 when the cluster is down. v19: * Add comments on those delay hacks. * Update on checking core enabled counts in wait_for_power_down(). v18: * Fix to release resource in probe(). * Check whether cpu is already up in the process of making cpu down. * Add udelay in power up/down sequence. * Optimize on setting relocation entry. * Optimize on polling status in wait_for_power_down(). * Add mcpm critical operations. v17: * Parse bootwrapper parameters in DTS file. * Fix to use msleep() in spinlock region. v16: * Parse bootwrapper parameters in command line instead. v13: * Restore power down operation in MCPM. * Fix disabling snoop filter issue in MCPM. v12: * Use wfi as power down state in MCPM. * Remove wait_for_powerdown() in MCPM because wfi is used now. Signed-off-by: Haojian Zhuang <[email protected]> Reviewed-by: Nicolas Pitre <[email protected]> Signed-off-by: Wei Xu <[email protected]>
2014-09-03ARM: mcpm: support 4 clustersHaojian Zhuang2-0/+14
Add the CONFIG_MCPM_QUAD_CLUSTER configuration to enlarge cluster number from 2 to 4. Signed-off-by: Haojian Zhuang <[email protected]> Reviewed-by: Nicolas Pitre <[email protected]> Signed-off-by: Wei Xu <[email protected]>
2014-09-02ARM: shmobile: r8a7740: Add restart callbackMagnus Damm1-0/+8
Port the r8a7740 restart handling from the Armadillo code to the r8a7740 generic multiplatform case. Signed-off-by: Magnus Damm <[email protected]> Tested-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-09-02ARM: shmobile: armadillo800eva: Build DTS for multiplatformMagnus Damm1-0/+1
Build the r8a7740 Armadillo800EVA board DTB in case of Multiplatform. The DT reference case will be removed and can be ignored for now. Signed-off-by: Magnus Damm <[email protected]> Tested-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-09-02ARM: shmobile: armadillo800eva: Sync DTSMagnus Damm1-1/+275
Take the contents from the Armadillo800EVA DT reference DTS and add them to the "regular" Armadillo800EVA DTS. This is preparation for removal of the DT reference DTS. So the goal is to have a single DTS for this Armadillo board. The SoC "r8a7740" is added to compatible string but the board is left as-is (excluding the reference suffix). The kernel command line is left as-is, earlyprintk is used in case of legacy and for multiplatform we can simply ignore it for now. Signed-off-by: Magnus Damm <[email protected]> Tested-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-09-02ARM: shmobile: r8a7740: Multiplatform supportMagnus Damm4-6/+16
Enable r8a7740 Multiplatform support for the generic r8a7740 machine vector. No board support is enabled, and the board code for Armadillo 800 EVA DT Reference is left by itself. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2014-09-01ARM: i.MX: Remove i.MX1 ADS board supportAlexander Shiyan4-167/+0
mx1ads.c can be replaced with devicetree equivalent: imx1-ads.dts, so remove the board file. Signed-off-by: Alexander Shiyan <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2014-09-01ARM: dts: vf610-twr: remove useless property for sound card.Xiubo Li1-1/+0
This was added by: Commit 8128c4f36 ("ARM: dts: vf610-twr: Add simple-card support.") This useless property may cause some confusions for users. Signed-off-by: Xiubo Li <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2014-09-01ARM: imx: remove imx_scu_standby_enable()Shawn Guo3-16/+0
With commit c716483c3db1 ("ARM: 8122/1: smp_scu: enable SCU standby support"), the STANDBY bit of SCU is handled by core function scu_enable(). So imx_scu_standby_enable() can be removed now. Signed-off-by: Shawn Guo <[email protected]>
2014-09-01ARM: i.MX: Remove Phytec i.MX27 PCM038/PCM970 board filesAlexander Shiyan6-658/+0
pcm970-baseboard.c and mach-pcm038.c can be replaced with their devicetree equivalents: imx27-phytec-phycore-rdk.dts and imx27-phytec-phycore-som.dtsi respectively, so remove the board files. Signed-off-by: Alexander Shiyan <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2014-09-01ARM: i.MX: Remove mach-cpuimx27sd board fileAlexander Shiyan6-736/+1
eukrea_mbimx27-baseboard.c and mach-cpuimx27.c can be replaced with their devicetree equivalents: imx27-eukrea-mbimxsd27-baseboard.dts and imx27-eukrea-cpuimx27.dtsi respectively, so remove the board files. Signed-off-by: Alexander Shiyan <[email protected]> Acked-by: Eric Bénard <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2014-09-01ARM: imx: iomux: Do not export symbol without public declarationAlexander Stein3-11/+0
The iomux function declarations are in headers only accessible in this directory. Thus those can't be used in any module. None of the objects in this directory is tristate. Neither can the header be included in out-of-tree modules. Signed-off-by: Alexander Stein <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2014-08-31Linux 3.17-rc3Linus Torvalds1-1/+1
2014-08-31Merge tag 'xtensa-20140830' of git://github.com/czankel/xtensa-linuxLinus Torvalds24-217/+497
Pull Xtensa updates from Chris Zankel: "Xtensa improvements for 3.17: - support highmem on cores with aliasing data cache. Enable highmem on kc705 by default - simplify addition of new core variants (no need to modify Kconfig / Makefiles) - improve robustness of unaligned access handler and its interaction with window overflow/underflow exception handlers - deprecate atomic and spill registers syscalls - clean up Kconfig: remove orphan MATH_EMULATION, sort 'select' statements - wire up renameat2 syscall. Various fixes: - fix address checks in dma_{alloc,free}_coherent (runtime BUG) - fix access to THREAD_RA/THREAD_SP/THREAD_DS (debug build breakage) - fix TLBTEMP_BASE_2 region handling in fast_second_level_miss (runtime unrecoverable exception) - fix a6 and a7 handling in fast_syscall_xtensa (runtime userspace register clobbering) - fix kernel/user jump out of fast_unaligned (potential runtime unrecoverabl exception) - replace termios IOCTL code definitions with constants (userspace build breakage)" * tag 'xtensa-20140830' of git://github.com/czankel/xtensa-linux: (25 commits) xtensa: deprecate fast_xtensa and fast_spill_registers syscalls xtensa: don't allow overflow/underflow on unaligned stack xtensa: fix a6 and a7 handling in fast_syscall_xtensa xtensa: allow single-stepping through unaligned load/store xtensa: move invalid unaligned instruction handler closer to its users xtensa: make fast_unaligned store restartable xtensa: add double exception fixup handler for fast_unaligned xtensa: fix kernel/user jump out of fast_unaligned xtensa: configure kc705 for highmem xtensa: support highmem in aliasing cache flushing code xtensa: support aliasing cache in kmap xtensa: support aliasing cache in k[un]map_atomic xtensa: implement clear_user_highpage and copy_user_highpage xtensa: fix TLBTEMP_BASE_2 region handling in fast_second_level_miss xtensa: allow fixmap and kmap span more than one page table xtensa: make fixmap region addressing grow with index xtensa: fix access to THREAD_RA/THREAD_SP/THREAD_DS xtensa: add renameat2 syscall xtensa: fix address checks in dma_{alloc,free}_coherent xtensa: replace IOCTL code definitions with constants ...
2014-08-31unicore32: Fix build errorGuenter Roeck1-4/+5
unicore32 builds fail with arch/unicore32/kernel/signal.c: In function ‘setup_frame’: arch/unicore32/kernel/signal.c:257: error: ‘usig’ undeclared (first use in this function) arch/unicore32/kernel/signal.c:279: error: ‘usig’ undeclared (first use in this function) arch/unicore32/kernel/signal.c: In function ‘handle_signal’: arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’ arch/unicore32/kernel/signal.c: In function ‘do_signal’: arch/unicore32/kernel/signal.c:376: error: implicit declaration of function ‘get_signsl’ make[1]: *** [arch/unicore32/kernel/signal.o] Error 1 make: *** [arch/unicore32/kernel/signal.o] Error 2 Bisect points to commit 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()"). This code never even compiled. Reverting the patch does not work, since previously used functions no longer exist, so try to fix it up. Compile tested only. Fixes: 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()") Cc: Richard Weinberger <[email protected]> Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-08-31Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds10-39/+37
Pull ARM fixes from Russell King: "Various assorted fixes: - a couple of patches from Mark Rutland to resolve an errata with Cortex-A15 CPUs. - fix cpuidle for the CPU part ID changes in the last merge window - add support for a relocation which ARM binutils is generating in some circumstances" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex ARM: 8128/1: abort: don't clear the exclusive monitors ARM: 8127/1: module: add support for R_ARM_TARGET1 relocations
Powered by cgit, Gruvboxed by Blaster4385.