25 Jul, 2012

1 commit

  • Pull trivial tree from Jiri Kosina:
    "Trivial updates all over the place as usual."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
    Fix typo in include/linux/clk.h .
    pci: hotplug: Fix typo in pci
    iommu: Fix typo in iommu
    video: Fix typo in drivers/video
    Documentation: Add newline at end-of-file to files lacking one
    arm,unicore32: Remove obsolete "select MISC_DEVICES"
    module.c: spelling s/postition/position/g
    cpufreq: Fix typo in cpufreq driver
    trivial: typo in comment in mksysmap
    mach-omap2: Fix typo in debug message and comment
    scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
    Change email address for Steve Glendinning
    Btrfs: fix typo in convert_extent_bit
    via: Remove bogus if check
    netprio_cgroup.c: fix comment typo
    backlight: fix memory leak on obscure error path
    Documentation: asus-laptop.txt references an obsolete Kconfig item
    Documentation: ManagementStyle: fixed typo
    mm/vmscan: cleanup comment error in balance_pgdat
    mm: cleanup on the comments of zone_reclaim_stat
    ...

    Linus Torvalds
     

21 Jul, 2012

1 commit

  • This patch simply adds a newline character at end-of-file to those
    files in Documentation/ that currently lack one.

    This is done for a few different reasons:

    A) It's rather annoying when you do "cat some_file.txt" that your
    prompt/cursor ends up at the end of the last line of output rather
    than on a new line.

    B) Some tools that process files line-by-line may get confused by the
    lack of a newline on the last line.

    C) The "\ No newline at end of file" line in diffs annoys me for some
    reason.

    So, let's just add the missing newline once and for all.

    Signed-off-by: Jesper Juhl
    Signed-off-by: Jiri Kosina

    Jesper Juhl
     

21 Jun, 2012

1 commit

  • viresh.kumar@st.com email-id doesn't exist anymore as I have left the
    company. Replace ST's id with viresh.linux@gmail.com.

    It also updates .mailmap file to fix address for 'git shortlog'

    Signed-off-by: Viresh Kumar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Viresh Kumar
     

02 Jun, 2012

1 commit

  • Pull fbdev updates from Florian Tobias Schandinat:
    - driver for AUO-K1900 and AUO-K1901 epaper controller
    - large updates for OMAP (e.g. decouple HDMI audio and video)
    - some updates for Exynos and SH Mobile
    - various other small fixes and cleanups

    * tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6: (130 commits)
    video: bfin_adv7393fb: Fix cleanup code
    video: exynos_dp: reduce delay time when configuring video setting
    video: exynos_dp: move sw reset prioir to enabling sw defined function
    video: exynos_dp: use devm_ functions
    fb: handle NULL pointers in framebuffer release
    OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request
    OMAPDSS: Apply VENC timings even if panel is disabled
    OMAPDSS: VENC/DISPC: Delay dividing Y resolution for managers connected to VENC
    OMAPDSS: DISPC: Support rotation through TILER
    OMAPDSS: VRFB: remove compiler warnings when CONFIG_BUG=n
    OMAPFB: remove compiler warnings when CONFIG_BUG=n
    OMAPDSS: remove compiler warnings when CONFIG_BUG=n
    OMAPDSS: DISPC: fix usage of dispc_ovl_set_accu_uv
    OMAPDSS: use DSI_FIFO_BUG workaround only for manual update displays
    OMAPDSS: DSI: Support command mode interleaving during video mode blanking periods
    OMAPDSS: DISPC: Update Accumulator configuration for chroma plane
    drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers
    video: exynos mipi dsi: support reverse panel type
    video: exynos mipi dsi: Properly interpret the interrupt source flags
    video: exynos mipi dsi: Avoid races in probe()
    ...

    Linus Torvalds
     

27 May, 2012

1 commit

  • Pull arm-soc: soc specific changes (part 2) from Olof Johansson:
    "This adds support for the spear13xx platform, which has first been
    under review a long time ago and finally been completed after generic
    spear work has gone into the clock, dt and pinctrl branches.

    Also a number of updates for the samsung socs are part of this branch."

    Fix up trivial conflicts in drivers/gpio/gpio-samsung.c that look much
    worse than they are: the exonys5 init code was refactored in commit
    fd454997d687 ("gpio: samsung: refactor gpiolib init for exynos4/5"), and
    then commit f10590c9836c ("ARM: EXYNOS: add GPC4 bank instance") added a
    new gpio chip define and did tiny updates to the init code.

    So the conflict diff looks like hell, but it's actually a fairly simple
    change.

    * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
    ARM: exynos: fix building with CONFIG_OF disabled
    ARM: EXYNOS: Add AUXDATA for i2c controllers
    ARM: dts: Update device tree source files for EXYNOS5250
    ARM: EXYNOS: Add device tree support for interrupt combiner
    ARM: EXYNOS: Add irq_domain support for interrupt combiner
    ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5
    ARM: EXYNOS: update irqs for EXYNOS5250 SoC
    ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll
    ARM: EXYNOS: add GPC4 bank instance
    ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition
    ARM: EXYNOS: Modify the GIC physical address for static io-mapping
    ARM: EXYNOS: Add watchdog timer clock instance
    pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
    SPEAr: Update MAINTAINERS and Documentation
    SPEAr13xx: Add defconfig
    SPEAr13xx: Add compilation support
    SPEAr13xx: Add dts and dtsi files
    pinctrl: Add SPEAr13xx pinctrl drivers
    pinctrl: SPEAr: Create macro for declaring GPIO PINS
    SPEAr13xx: Add common clock framework support
    ...

    Linus Torvalds
     

23 May, 2012

1 commit

  • Pull device tree conversions for arm-soc, part 1, from Olof Johansson:
    "The spear3xx, lpc32xx, shmobile and mmp platforms are joining the game
    of booting using device trees, which is a great step forward for them.
    at91 and spear have pretty much completed this process with a huge
    amount of work being put into at91. The other platforms are
    continuing the process.

    We finally start to see the payback on this investment, as new
    machines are getting supported purely by adding a .dts source file
    that can be completely independent of the kernel source."

    Fix up trivial conflict in arch/arm/Kconfig

    * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
    ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
    arm/dts: omap4-panda: Add LEDs support
    arm/dts: omap4-sdp: Add LEDs support
    arm/dts: twl4030: Add twl4030-gpio node
    OMAP4: devices: Do not create mcpdm device if the dtb has been provided
    OMAP4: devices: Do not create dmic device if the dtb has been provided
    Documentation: update docs for mmp dt
    ARM: dts: refresh dts file for arch mmp
    ARM: mmp: support pxa910 with device tree
    ARM: mmp: support mmp2 with device tree
    gpio: pxa: parse gpio from DTS file
    ARM: mmp: support DT in timer
    ARM: mmp: support DT in irq
    ARM: mmp: append CONFIG_MACH_MMP2_DT
    ARM: mmp: fix build issue on mmp with device tree
    ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree
    ARM: ux500: Disable SMSC911x platform code registration when DT is enabled
    ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement
    ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball
    ARM: SPEAr3xx: Correct keyboard data passed from DT
    ...

    Linus Torvalds
     

14 May, 2012

1 commit


11 May, 2012

2 commits

  • There exist several display technologies and standards that support audio as
    well. Hence, it is relevant to update the DSS device driver to provide an audio
    interface that may be used by an audio driver or any other driver interested in
    the functionality.

    The audio_enable function is intended to prepare the relevant
    IP for playback (e.g., enabling an audio FIFO, taking in/out of reset
    some IP, enabling companion chips, etc). It is intended to be called before
    audio_start. The audio_disable function performs the reverse operation and is
    intended to be called after audio_stop.

    While a given DSS device driver may support audio, it is possible that for
    certain configurations audio is not supported (e.g., an HDMI display using a
    VESA video timing). The audio_supported function is intended to query whether
    the current configuration of the display supports audio.

    The audio_config function is intended to configure all the relevant audio
    parameters of the display. In order to make the function independent of any
    specific DSS device driver, a struct omap_dss_audio is defined. Its purpose
    is to contain all the required parameters for audio configuration. At the
    moment, such structure contains pointers to IEC-60958 channel status word and
    CEA-861 audio infoframe structures. This should be enough to support HDMI and
    DisplayPort, as both are based on CEA-861 and IEC-60958. The omap_dss_audio
    structure may be extended in the future if required.

    The audio_enable/disable, audio_config and audio_supported functions could be
    implemented as functions that may sleep. Hence, they should not be called
    while holding a spinlock or a readlock.

    The audio_start/audio_stop function is intended to effectively start/stop audio
    playback after the configuration has taken place. These functions are designed
    to be used in an atomic context. Hence, audio_start should return quickly and be
    called only after all the needed resources for audio playback (audio FIFOs,
    DMA channels, companion chips, etc) have been enabled to begin data transfers.
    audio_stop is designed to only stop the audio transfers. The resources used
    for playback are released using audio_disable.

    A new enum omap_dss_audio_state is introduced to help the implementations of
    the interface to keep track of the audio state. The initial state is _DISABLED;
    then, the state transitions to _CONFIGURED, and then, when it is ready to
    play audio, to _ENABLED. The state _PLAYING is used when the audio is being
    rendered.

    Signed-off-by: Ricardo Neri

    Ricardo Neri
     
  • VENC output type (composite/svideo) doesn't have to be fixed by board
    wiring, it is possible to also provide composite signal through svideo
    luminance connector (software enabled), which is what pandora does.

    Having to recompile the kernel for users who have TV connector types
    that don't match default board setting is very inconvenient, especially
    for users of a consumer device, so add support for switching VENC output
    type at runtime over a new sysfs file output_type.

    Signed-off-by: Grazvydas Ignotas
    Signed-off-by: Tomi Valkeinen

    Grazvydas Ignotas
     

23 Apr, 2012

1 commit

  • This patch adds a generic target for SPEAr3xx machines that can be configured
    via the device-tree. Currently the following devices are supported via the
    devicetree:

    - VIC interrupts
    - PL011 UART
    - PL061 GPIO
    - PL110 CLCD
    - SP805 WDT
    - Synopsys DW I2C
    - Synopsys DW ethernet
    - ST FSMC-NAND
    - ST SPEAR-SMI
    - ST SPEAR-KEYBOARD
    - ST SPEAR-RTC
    - ARASAN SDHCI-SPEAR
    - SPEAR-EHCI
    - SPEAR-OHCI

    Other peripheral devices will follow in later patches.

    This also removes IO_ADDRESS macro and creates 16 MB static mappings instead of
    4K for individual peripherals. This is done to have efficient TLB lookup for any
    I/O windows that are located closely together. ioremap() on this range will
    return this mapping only instead of creating another.

    Signed-off-by: Viresh Kumar

    Viresh Kumar
     

06 Apr, 2012

1 commit

  • ixp2xxx platforms have had no real changes since ~2006 and the maintainer
    has said on irc that they can be removed:

    13:05 < nico> do you still care about ixp2000?
    13:22 < lennert> not really, no
    13:58 < nico> do you think we could remove it from the kernel tree?
    14:01 < lennert> go for it, and remove ixp23xx too while you're at it

    Removing will help simplify ARM consolidation in general and PCI re-work
    specifically.

    Signed-off-by: Rob Herring
    Cc: Randy Dunlap
    Acked-by: Lennert Buytenhek

    Rob Herring
     

07 Mar, 2012

1 commit


27 Nov, 2011

1 commit

  • In order to remove the build time variation between different SOCs with
    regards to VMALLOC_END, the iotable mappings are now allocated inside
    the vmalloc region. This allows for VMALLOC_END to be identical across
    all machines.

    The value for VMALLOC_END is now set to 0xff000000 which is right where
    the consistent DMA area starts.

    To accommodate all static mappings on machines with possible highmem usage,
    the default vmalloc area size is changed to 240 MB so that VMALLOC_START
    is no higher than 0xf0000000 by default.

    Signed-off-by: Nicolas Pitre
    Tested-by: Stephen Warren
    Tested-by: Kevin Hilman
    Tested-by: Jamie Iles

    Nicolas Pitre
     

26 Jul, 2011

1 commit


23 Jul, 2011

1 commit


19 Jul, 2011

1 commit

  • Currently, the documented kernel entry requirements are not
    explicit about whether the kernel should be entered in ARM or
    Thumb, leading to an ambiguitity about how to enter Thumb-2
    kernels. As a result, the kernel is reliant on the zImage
    decompressor to enter the kernel proper in the correct instruction
    set state.

    This patch changes the boot entry protocol for head.S and Image to
    be the same as for zImage: in all cases, the kernel is now entered
    in ARM.

    Documentation/arm/Booting is updated to reflect this new policy.

    A different rule will be needed for Cortex-M class CPUs as and when
    support for those lands in mainline, since these CPUs don't support
    the ARM instruction set at all: a note is added to the effect that
    the kernel must be entered in Thumb on such systems.

    Signed-off-by: Dave Martin
    Acked-by: Nicolas Pitre
    Signed-off-by: Russell King

    Dave Martin
     

18 Jul, 2011

1 commit

  • On Tue, 28 Jun 2011, Ben Dooks wrote:

    > On Tue, Jun 28, 2011 at 11:22:57PM +0200, Arnd Bergmann wrote:
    >
    > > On a related note, what about mach-s3c2400? It seems to be even more
    > > incomplete.
    >
    > Probably the same fate awaits that. It is so old that there's little
    > incentive to do anything with it.

    So out it goes as well.

    The PORT_S3C2400 definition in include/linux/serial_core.h is left there
    to prevent a reuse of the same number for another port type.

    Signed-off-by: Nicolas Pitre
    Acked-by: Arnd Bergmann

    Nicolas Pitre
     

29 Jun, 2011

2 commits

  • This allows a ROM-able zImage to be written to eSD and for SuperH Mobile
    ARM to boot directly from the SDHI hardware block.

    This is achieved by the MaskROM loading the first portion of the image into
    MERAM and then jumping to it. This portion contains loader code which
    copies the entire image to SDRAM and jumps to it. From there the zImage
    boot code proceeds as normal, uncompressing the image into its final
    location and then jumping to it.

    Cc: Paul Mundt
    Acked-by: Magnus Damm
    Acked-by: Paul Mundt
    Signed-off-by: Simon Horman
    Signed-off-by: Russell King

    Simon Horman
     
  • Some user space applications are designed around the ability to perform
    atomic operations on 64 bit values. Since this is natively possible
    only with ARMv6k and above, let's provide a new kuser helper to perform
    the operation with kernel supervision on pre ARMv6k hardware.

    Signed-off-by: Nicolas Pitre
    Tested-by: Dave Martin

    Nicolas Pitre
     

20 Jun, 2011

1 commit


26 May, 2011

1 commit


23 May, 2011

1 commit


12 May, 2011

1 commit


31 Mar, 2011

1 commit


17 Mar, 2011

1 commit


25 Jan, 2011

2 commits

  • This allows a ROM-able zImage to be written to MMC and
    for SuperH Mobile ARM to boot directly from the MMCIF
    hardware block.

    This is achieved by the MaskROM loading the first portion
    of the image into MERAM and then jumping to it. This portion
    contains loader code which copies the entire image to SDRAM
    and jumps to it. From there the zImage boot code proceeds
    as normal, uncompressing the image into its final location
    and then jumping to it.

    Cc: Magnus Damm

    Russell, please consider merging this for 2.6.38.

    This patch depends on:
    * "mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h"
    which will be merged though Paul Mundt's rmobile sh-2.6.
    The absence of this patch will break the build if
    the (new) CONFIG_ZBOOT_ROM_MMCIF option is set.
    There are no subtle side-effects.

    v2:
    Addressed comments by Magnus Damm
    * Fix copyright in vrl4.c
    * Fix use of #define CONFIG_ZBOOT_ROM_MMCIF in mmcif-sh7372.c
    * Initialise LED GPIO lines in head-ap4evb.txt instead of mmcif-sh7372.c
    as this is considered board-specific.

    v3:
    Addressed comments made in person by Magnus Damm
    * Move mmcif_loader to be earlier in the image and
    reduce the number of blocks of boot program loaded by the MaskRom
    from 40 to 8 accordingly.
    * Move LED GPIO initialisation into mmcif_progress_init
    - This leaves the partner jet script unbloated
    Other
    * inline mmcif_update_progress so it is a static inline in a header file

    v4:
    * Use htole16() and htole32() in v4rl.c to ensure
    that the output is little endian

    v5:
    Addressed comments by Russell King
    * Simplify assembly code
    * Jump to code rather than an address
    Signed-off-by: Russell King

    Simon Horman
     
  • lh7a40x has only been receiving updates for updates to generic code.
    The last involvement from the maintainer according to the git logs was
    in 2006. As such, it is a maintainence burden with no benefit.

    This gets rid of two defconfigs.

    Signed-off-by: Russell King

    Russell King
     

07 Jan, 2011

2 commits

  • * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits)
    omap2: Make OMAP2PLUS select OMAP_DM_TIMER
    OMAP4: hwmod data: Fix alignment and end of line in structurefields
    OMAP4: hwmod data: Move the DMA structures
    OMAP4: hwmod data: Move the smartreflex structures
    OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
    arm: omap: tusb6010: add name for MUSB IRQ
    arm: omap: craneboard: Add USB EHCI support
    omap2+: Initialize serial port for dynamic remuxing for n8x0
    omap2+: Add struct omap_board_data and use it for platform level serial init
    omap2+: Allow hwmod state changes to mux pads based on the state changes
    omap2+: Add support for hwmod specific muxing of devices
    omap2+: Add omap_mux_get_by_name
    OMAP2: PM: fix compile error when !CONFIG_SUSPEND
    MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
    OMAP4: Smartreflex framework extensions
    OMAP4: hwmod: Add inital data for smartreflex modules.
    OMAP4: PM: Program correct init voltages for scalable VDDs
    OMAP4: Adding voltage driver support
    OMAP4: Register voltage PMIC parameters with the voltage layer
    OMAP3: PM: Program correct init voltages for VDD1 and VDD2
    ...

    Fix up trivial conflict in arch/arm/plat-omap/Kconfig

    Linus Torvalds
     
  • Conflicts:
    arch/arm/kernel/entry-armv.S
    arch/arm/mm/ioremap.c

    Russell King
     

22 Dec, 2010

1 commit

  • Add OPP data for OMAP34xx and OMAP36xx and initialization functions
    to populate OPP tables based on current SoC.
    introduce an OMAP generic opp initialization routine which OMAP3
    and OMAP4+ SoCs can use to register their OPP definitions.

    Cc: Thomas Petazzoni
    Signed-off-by: Kevin Hilman
    Signed-off-by: Nishanth Menon
    Signed-off-by: Kevin Hilman

    Nishanth Menon
     

10 Nov, 2010

1 commit


04 Nov, 2010

1 commit

  • The SWP instruction was deprecated in the ARMv6 architecture,
    superseded by the LDREX/STREX family of instructions for
    load-linked/store-conditional operations. The ARMv7 multiprocessing
    extensions mandate that SWP/SWPB instructions are treated as undefined
    from reset, with the ability to enable them through the System Control
    Register SW bit.

    This patch adds the alternative solution to emulate the SWP and SWPB
    instructions using LDREX/STREX sequences, and log statistics to
    /proc/cpu/swp_emulation. To correctly deal with copy-on-write, it also
    modifies cpu_v7_set_pte_ext to change the mappings to priviliged RO when
    user RO.

    Signed-off-by: Leif Lindholm
    Acked-by: Catalin Marinas
    Acked-by: Kirill A. Shutemov
    Signed-off-by: Russell King

    Leif Lindholm
     

25 Oct, 2010

1 commit

  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    Update broken web addresses in arch directory.
    Update broken web addresses in the kernel.
    Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
    Revert "Fix typo: configuation => configuration" partially
    ida: document IDA_BITMAP_LONGS calculation
    ext2: fix a typo on comment in ext2/inode.c
    drivers/scsi: Remove unnecessary casts of private_data
    drivers/s390: Remove unnecessary casts of private_data
    net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
    drivers/infiniband: Remove unnecessary casts of private_data
    drivers/gpu/drm: Remove unnecessary casts of private_data
    kernel/pm_qos_params.c: Remove unnecessary casts of private_data
    fs/ecryptfs: Remove unnecessary casts of private_data
    fs/seq_file.c: Remove unnecessary casts of private_data
    arm: uengine.c: remove C99 comments
    arm: scoop.c: remove C99 comments
    Fix typo configue => configure in comments
    Fix typo: configuation => configuration
    Fix typo interrest[ing|ed] => interest[ing|ed]
    Fix various typos of valid in comments
    ...

    Fix up trivial conflicts in:
    drivers/char/ipmi/ipmi_si_intf.c
    drivers/usb/gadget/rndis.c
    net/irda/irnet/irnet_ppp.c

    Linus Torvalds
     

07 Oct, 2010

1 commit


10 Aug, 2010

1 commit

  • Legned -> Legend
    mainatined -> maintained

    Legend is now Lenovo, so more fixes (text and url)
    would be possible, too.

    Cc: Jiri Kosina
    Cc: linux-doc@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Stefan Weil
    Signed-off-by: Jiri Kosina

    Stefan Weil
     

04 Aug, 2010

1 commit

  • Below you will find an updated version from the original series bunching all patches into one big patch
    updating broken web addresses that are located in Documentation/*
    Some of the addresses date as far far back as 1995 etc... so searching became a bit difficult,
    the best way to deal with these is to use web.archive.org to locate these addresses that are outdated.
    Now there are also some addresses pointing to .spec files some are located, but some(after searching
    on the companies site)where still no where to be found. In this case I just changed the address
    to the company site this way the users can contact the company and they can locate them for the users.

    Signed-off-by: Justin P. Mattock
    Signed-off-by: Thomas Weber
    Signed-off-by: Mike Frysinger
    Cc: Paulo Marques
    Cc: Randy Dunlap
    Cc: Michael Neuling
    Signed-off-by: Jiri Kosina

    Justin P. Mattock
     

27 Jul, 2010

1 commit

  • This changes the TCM handling so that a fixed area is reserved at
    0xfffe0000-0xfffeffff for TCM. This areas is used by XScale but
    XScale does not have TCM so the mechanisms are mutually exclusive.

    This change is needed to make TCM detection more dynamic while
    still being able to compile code into it, and is a must for the
    unified ARM goals: the current TCM allocation at different places
    in memory for each machine would be a nightmare if you want to
    compile a single image for more than one machine with TCM so it
    has to be nailed down in one place.

    Signed-off-by: Linus Walleij
    Signed-off-by: Russell King

    Linus Walleij
     

28 May, 2010

3 commits