1. 18 4月, 2012 2 次提交
  2. 13 3月, 2012 1 次提交
    • S
      pinctrl: allow concurrent gpio and mux function ownership of pins · 652162d4
      Stephen Warren 提交于
      Per recent updates to Documentation/gpio.txt, gpiolib drivers should
      inform pinctrl when a GPIO is requested. pinctrl then marks that pin as
      in-use for that GPIO function.
      
      When an SoC muxes pins in a group, it's quite possible for the group to
      contain e.g. 6 pins, but only 4 of them actually be needed by the HW
      module that's mux'd to them. In this case, the other 2 pins could be
      used as GPIOs. However, pinctrl marks all the pins within the group as
      in-use by the selected mux function. To allow the expected gpiolib
      interaction, separate the concepts of pin ownership into two parts: One
      for the mux function and one for GPIO usage. Finally, allow those two
      ownerships to exist in parallel.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      652162d4
  3. 05 3月, 2012 5 次提交
    • S
      pinctrl: Show selected function and group in pinmux-pins debugfs · ba110d90
      Stephen Warren 提交于
      Until recently, the pinctrl pinmux-pins debugfs file displayed the
      selected function for each owned pin. This feature was removed during
      restructing in support of recent API rework. This change restoreds this
      feature, and also displays the group that the function was selected on,
      in case a pin is a member of multiple groups.
      
      Based on work by: Linus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      ba110d90
    • S
      pinctrl: enhance mapping table to support pin config operations · 1e2082b5
      Stephen Warren 提交于
      The pinctrl mapping table can now contain entries to:
      * Set the mux function of a pin group
      * Apply a set of pin config options to a pin or a group
      
      This allows pinctrl_select_state() to apply pin configs settings as well
      as mux settings.
      
      v3: Fix find_pinctrl() to iterate over the correct list.
         s/_MUX_CONFIGS_/_CONFIGS_/ in mapping table macros.
         Fix documentation to use correct mapping table macro.
      v2: Added numerous extra PIN_MAP_*() special-case macros.
         Fixed kerneldoc typo. Delete pinctrl_get_pin_id() and
         replace it with pin_get_from_name(). Various minor fixes.
         Updates due to rebase.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NDong Aisheng <dong.aisheng@linaro.org>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      1e2082b5
    • S
      pinctrl: add usecount to pins for muxing · 0e3db173
      Stephen Warren 提交于
      Multiple mapping table entries could reference the same pin, and hence
      "own" it. This would be unusual now that pinctrl_get() represents a single
      state for a client device, but in the future when it represents all known
      states for a device, this is quite likely. Implement reference counting
      for pin ownership to handle this.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NDong Aisheng <dong.aisheng@linaro.org>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      0e3db173
    • S
      pinctrl: refactor struct pinctrl handling in core.c vs pinmux.c · 7ecdb16f
      Stephen Warren 提交于
      This change separates two aspects of struct pinctrl:
      
      a) The data representation of the parsed mapping table, into:
      
         1) The top-level struct pinctrl object, a single entity returned
            by pinctrl_get().
      
         2) The parsed version of each mapping table entry, struct
            pinctrl_setting, of which there is one per mapping table entry.
      
      b) The code that handles this; the code for (1) above is in core.c, and
         the code to parse/execute each entry in (2) above is in pinmux.c, while
         the iteration over multiple settings is lifted to core.c.
      
      This will allow the following future changes:
      
      1) pinctrl_get() API rework, so that struct pinctrl represents all states
         for the device, and the device can select between them without calling
         put()/get() again.
      
      2) To support that, a struct pinctrl_state object will be inserted into
         the data model between the struct pinctrl and struct pinctrl_setting.
      
      3) The mapping table will be extended to allow specification of pin config
         settings too. To support this, struct pinctrl_setting will be enhanced
         to store either mux settings or config settings, and functions will be
         added to pinconf.c to parse/execute pin configuration settings.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NLinus Walleij <linus.walleij@linaro.org>
      Acked-by: NDong Aisheng <dong.aisheng@linaro.org>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      7ecdb16f
    • S
      pinctrl: fix and simplify locking · 57b676f9
      Stephen Warren 提交于
      There are many problems with the current pinctrl locking:
      
      struct pinctrl_dev's gpio_ranges_lock isn't effective;
      pinctrl_match_gpio_range() only holds this lock while searching for a gpio
      range, but the found range is return and manipulated after releading the
      lock. This could allow pinctrl_remove_gpio_range() for that range while it
      is in use, and the caller may very well delete the range after removing it,
      causing pinctrl code to touch the now-free range object.
      
      Solving this requires the introduction of a higher-level lock, at least
      a lock per pin controller, which both gpio range registration and
      pinctrl_get()/put() will acquire.
      
      There is missing locking on HW programming; pin controllers may pack the
      configuration for different pins/groups/config options/... into one
      register, and hence have to read-modify-write the register. This needs to
      be protected, but currently isn't. Related, a future change will add a
      "complete" op to the pin controller drivers, the idea being that each
      state's programming will be programmed into the pinctrl driver followed
      by the "complete" call, which may e.g. flush a register cache to HW. For
      this to work, it must not be possible to interleave the pinctrl driver
      calls for different devices.
      
      As above, solving this requires the introduction of a higher-level lock,
      at least a lock per pin controller, which will be held for the duration
      of any pinctrl_enable()/disable() call.
      
      However, each pinctrl mapping table entry may affect a different pin
      controller if necessary. Hence, with a per-pin-controller lock, almost
      any pinctrl API may need to acquire multiple locks, one per controller.
      To avoid deadlock, these would need to be acquired in the same order in
      all cases. This is extremely difficult to implement in the case of
      pinctrl_get(), which doesn't know which pin controllers to lock until it
      has parsed the entire mapping table, since it contains somewhat arbitrary
      data.
      
      The simplest solution here is to introduce a single lock that covers all
      pin controllers at once. This will be acquired by all pinctrl APIs.
      
      This then makes struct pinctrl's mutex irrelevant, since that single lock
      will always be held whenever this mutex is currently held.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      57b676f9
  4. 02 3月, 2012 1 次提交
  5. 01 3月, 2012 1 次提交
  6. 24 2月, 2012 1 次提交
  7. 23 2月, 2012 3 次提交
  8. 11 2月, 2012 2 次提交
  9. 02 2月, 2012 1 次提交
  10. 26 1月, 2012 3 次提交
  11. 25 1月, 2012 1 次提交
  12. 03 1月, 2012 11 次提交
  13. 08 12月, 2011 1 次提交
  14. 20 10月, 2011 2 次提交
    • S
      pinctrl: Don't copy function name when requesting a pin · 5d2eaf80
      Stephen Warren 提交于
      Instead, store a pointer to the currently assigned function.
      
      This allows us to delete the mux_requested variable from pin_desc; a pin
      is requested if its currently assigned function is non-NULL.
      
      When a pin is requested as a GPIO rather than a regular function, the
      assigned function name is dynamically constructed. In this case, we have
      to kstrdup() the dynamically constructed name, so that mux_function doesn't
      pointed at stack data. This requires pin_free to be told whether to free
      the mux_function pointer or not.
      
      This removes the hard-coded maximum function name length.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      5d2eaf80
    • S
      pinctrl: get_group_pins() const fixes · a5818a8b
      Stephen Warren 提交于
      get_group_pins() "returns" a pointer to an array of const objects, through
      a pointer parameter. Fix the prototype so what's pointed at by the returned
      pointer is const, rather than the function parameter being const.
      
      This also allows the removal of a cast in each of the two current pinmux
      drivers.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      a5818a8b
  15. 13 10月, 2011 1 次提交
    • L
      drivers: create a pin control subsystem · 2744e8af
      Linus Walleij 提交于
      This creates a subsystem for handling of pin control devices.
      These are devices that control different aspects of package
      pins.
      
      Currently it handles pinmuxing, i.e. assigning electronic
      functions to groups of pins on primarily PGA and BGA type of
      chip packages which are common in embedded systems.
      
      The plan is to also handle other I/O pin control aspects
      such as biasing, driving, input properties such as
      schmitt-triggering, load capacitance etc within this
      subsystem, to remove a lot of ARM arch code as well as
      feature-creepy GPIO drivers which are implementing the same
      thing over and over again.
      
      This is being done to depopulate the arch/arm/* directory
      of such custom drivers and try to abstract the infrastructure
      they all need. See the Documentation/pinctrl.txt file that is
      part of this patch for more details.
      
      ChangeLog v1->v2:
      
      - Various minor fixes from Joe's and Stephens review comments
      - Added a pinmux_config() that can invoke custom configuration
        with arbitrary data passed in or out to/from the pinmux driver
      
      ChangeLog v2->v3:
      
      - Renamed subsystem folder to "pinctrl" since we will likely
        want to keep other pin control such as biasing in this
        subsystem too, so let us keep to something generic even though
        we're mainly doing pinmux now.
      - As a consequence, register pins as an abstract entity separate
        from the pinmux. The muxing functions will claim pins out of the
        pin pool and make sure they do not collide. Pins can now be
        named by the pinctrl core.
      - Converted the pin lookup from a static array into a radix tree,
        I agreed with Grant Likely to try to avoid any static allocation
        (which is crap for device tree stuff) so I just rewrote this
        to be dynamic, just like irq number descriptors. The
        platform-wide definition of number of pins goes away - this is
        now just the sum total of the pins registered to the subsystem.
      - Make sure mappings with only a function name and no device
        works properly.
      
      ChangeLog v3->v4:
      
      - Define a number space per controller instead of globally,
        Stephen and Grant requested the same thing so now maps need to
        define target controller, and the radix tree of pin descriptors
        is a property on each pin controller device.
      - Add a compulsory pinctrl device entry to the pinctrl mapping
        table. This must match the pinctrl device, like "pinctrl.0"
      - Split the file core.c in two: core.c and pinmux.c where the
        latter carry all pinmux stuff, the core is for generic pin
        control, and use local headers to access functionality between
        files. It is now possible to implement a "blank" pin controller
        without pinmux capabilities. This split will make new additions
        like pindrive.c, pinbias.c etc possible for combined drivers
        and chunks of functionality which is a GoodThing(TM).
      - Rewrite the interaction with the GPIO subsystem - the pin
        controller descriptor now handles this by defining an offset
        into the GPIO numberspace for its handled pin range. This is
        used to look up the apropriate pin controller for a GPIO pin.
        Then that specific GPIO range is matched 1-1 for the target
        controller instance.
      - Fixed a number of review comments from Joe Perches.
      - Broke out a header file pinctrl.h for the core pin handling
        stuff that will be reused by other stuff than pinmux.
      - Fixed some erroneous EXPORT() stuff.
      - Remove mispatched U300 Kconfig and Makefile entries
      - Fixed a number of review comments from Stephen Warren, not all
        of them - still WIP. But I think the new mapping that will
        specify which function goes to which pin mux controller address
        50% of your concerns (else beat me up).
      
      ChangeLog v4->v5:
      
      - Defined a "position" for each function, so the pin controller now
        tracks a function in a certain position, and the pinmux maps define
        what position you want the function in. (Feedback from Stephen
        Warren and Sascha Hauer).
      - Since we now need to request a combined function+position from
        the machine mapping table that connect mux settings to drivers,
        it was extended with a position field and a name field. The
        name field is now used if you e.g. need to switch between two
        mux map settings at runtime.
      - Switched from a class device to using struct bus_type for this
        subsystem. Verified sysfs functionality: seems to work fine.
        (Feedback from Arnd Bergmann and Greg Kroah-Hartman)
      - Define a per pincontroller list of GPIO ranges from the GPIO
        pin space that can be handled by the pin controller. These can
        be added one by one at runtime. (Feedback from Barry Song)
      - Expanded documentation of regulator_[get|enable|disable|put]
        semantics.
      - Fixed a number of review comments from Barry Song. (Thanks!)
      
      ChangeLog v5->v6:
      
      - Create an abstract pin group concept that can sort pins into
        named and enumerated groups no matter what the use of these
        groups may be, one possible usecase is a group of pins being
        muxed in or so. The intention is however to also use these
        groups for other pin control activities.
      - Make it compulsory for pinmux functions to associate with
        at least one group, so the abstract pin group concept is used
        to define the groups of pins affected by a pinmux function.
        The pinmux driver interface has been altered so as to enforce
        a function to list applicable groups per function.
      - Provide an optional .group entry in the pinmux machine map
        so the map can select beteween different available groups
        to be used with a certain function.
      - Consequent changes all over the place so that e.g. debugfs
        present reasonable information about the world.
      - Drop the per-pin mux (*config) function in the pinmux_ops
        struct - I was afraid that this would start to be used for
        things totally unrelated to muxing, we can introduce that to
        the generic struct pinctrl_ops if needed. I want to keep
        muxing orthogonal to other pin control subjects and not mix
        these things up.
      
      ChangeLog v6->v7:
      
      - Make it possible to have several map entries matching the
        same device, pin controller and function, but using
        a different group, and alter the semantics so that
        pinmux_get() will pick all matching map entries, and
        store the associated groups in a list. The list will
        then be iterated over at pinmux_enable()/pinmux_disable()
        and corresponding driver functions called for each
        defined group. Notice that you're only allowed to map
        multiple *groups* to the same
        { device, pin controller, function } triplet, attempts
        to map the same device to multiple pin controllers will
        for example fail. This is hopefully the crucial feature
        requested by Stephen Warren.
      - Add a pinmux hogging field to the pinmux mapping entries,
        and enable the pinmux core to hog pinmux map entries.
        This currently only works for pinmuxes without assigned
        devices as it looks now, but with device trees we can
        look up the corresponding struct device * entries when
        we register the pinmux driver, and have it hog each
        pinmux map in turn, for a simple approach to
        non-dynamic pin muxing. This addresses an issue from
        Grant Likely that the machine should take care of as
        much of the pinmux setup as possible, not the devices.
        By supplying a list of hogs, it can now instruct the
        core to take care of any static mappings.
      - Switch pinmux group retrieveal function to grab an
        array of strings representing the groups rather than an
        array of unsigned and rewrite accordingly.
      - Alter debugfs to show the grouplist handled by each
        pinmux. Also add a list of hogs.
      - Dynamically allocate a struct pinmux at pinmux_get() and
        free it at pinmux_put(), then add these to the global
        list of pinmuxes active as we go along.
      - Go over the list of pinmux maps at pinmux_get() time
        and repeatedly apply matches.
      - Retrieve applicable groups per function from the driver
        as a string array rather than a unsigned array, then
        lookup the enumerators.
      - Make the device to pinmux map a singleton - only allow the
        mapping table to be registered once and even tag the
        registration function with __init so it surely won't be
        abused.
      - Create a separate debugfs file to view the pinmux map at
        runtime.
      - Introduce a spin lock to the pin descriptor struct, lock it
        when modifying pin status entries. Reported by Stijn Devriendt.
      - Fix up the documentation after review from Stephen Warren.
      - Let the GPIO ranges give names as const char * instead of some
        fixed-length string.
      - add a function to unregister GPIO ranges to mirror the
        registration function.
      - Privatized the struct pinctrl_device and removed it from the
        <linux/pinctrl/pinctrl.h> API, the drivers do not need to know
        the members of this struct. It is now in the local header
        "core.h".
      - Rename the concept of "anonymous" mux maps to "system" muxes
        and add convenience macros and documentation.
      
      ChangeLog v7->v8:
      
      - Delete the leftover pinmux_config() function from the
       <linux/pinctrl/pinmux.h> header.
      - Fix a race condition found by Stijn Devriendt in pin_request()
      
      ChangeLog v8->v9:
      
      - Drop the bus_type and the sysfs attributes and all, we're not on
        the clear about how this should be used for e.g. userspace
        interfaces so let us save this for the future.
      - Use the right name in MAINTAINERS, PIN CONTROL rather than
        PINMUX
      - Don't kfree() the device state holder, let the .remove() callback
        handle this.
      - Fix up numerous kerneldoc headers to have one line for the function
        description and more verbose documentation below the parameters
      
      ChangeLog v9->v10:
      - pinctrl: EXPORT_SYMBOL needs export.h, folded in a patch
        from Steven Rothwell
      - fix pinctrl_register error handling, folded in a patch from
        Axel Lin
      - Various fixes to documentation text so that it's consistent.
      - Removed pointless comment from drivers/Kconfig
      - Removed dependency on SYSFS since we removed the bus in
        v9.
      - Renamed hopelessly abbreviated pctldev_* functions to the
        more verbose pinctrl_dev_*
      - Drop mutex properly when looking up GPIO ranges
      - Return NULL instead of ERR_PTR() errors on registration of
        pin controllers, using cast pointers is fragile. We can
        live without the detailed error codes for sure.
      
      Cc: Stijn Devriendt <highguy@gmail.com>
      Cc: Joe Perches <joe@perches.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Acked-by: NGrant Likely <grant.likely@secretlab.ca>
      Acked-by: NStephen Warren <swarren@nvidia.com>
      Tested-by: NBarry Song <21cnbao@gmail.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      2744e8af