Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

3.8 #48

Merged
merged 4 commits into from

2 participants

@ZubairLK

The original email below.

This is a fresh patch series. Starts with the 3.8.13 kernel tree for BBB.
I removed all the ADC patches. Brought in all the new ones from mfd-next.
And started tweaking them.

Some of them are similar/same as the existing ones in the 3.8 tree.
Some is new work.

And then I added some more fixes from the Arago tree.

I've tried to minimize these changes affecting existing users.

Main changes after taking all the patches from mfd-next.

1- The IIO improvements in the patches from mfd-next have been back-ported.
2- Some renaming has been removed so that DT bindings dont have to change much for 3.8
3- The patches were tweaked so that it applies to the 3.8 tree.
4- Some patches removed the platform support. I didn't apply them.

in retrospect. it seemed as if all this just gave the same result as the existing patchset.
The driver wasn't fully functional yet

Then I looked at the Arago tree for improvements.

1- Forward ported a few commits. These fix the bug needing sampling twice and the driver returning BUSY.

Then I finally did some of my own work :)
1- Bone-helper gives scaled values. i.e. within the 1800mV range rather than the 12-bit 4096 range.
I checked IIO. The core has the functionality to give scaled values in /sys/bus/iio etc
so I added that.
2- The patchset broke the bone-helper because it didnt include the IIO map interface. So I took the previous
patchsets work and created another patch that would apply to this.

In retrospect, using the Arago tree might've been easier.
However, the patches in mfd-next WILL be merged upstream. So the work has to be layered on top of those.
Especially for 3.11.

I would like to request merging via github. Because there was some other work tweaking all the other patches.

I just dont have it refined like this patch series. This is all in the ADC directory.

The other changes were simple. DT has changed slightly.
Used to be
ti,adc-channels = <8>
Now it is
ti,adc-channels = <0 1 2 3 4 5 6 7>;
And for TSC, steps_configure changed to coordinate_readouts in DT as well.

These changes go for all other patches and in githib.

*** BLURB HERE ***

Pantelis Antoniou (2):
iio: ti_tscadc: provide datasheet_name and scan_type
mfd: ti_tscadc: deal with partial activation

Patil, Rachna (7):
input: ti_am33x_tsc: Step enable bits made configurable
input: ti_am33x_tsc: Order of TSC wires, made configurable
input: ti_am33x_tsc: remove unwanted fifo flush
input: ti_am33x_tsc: Add DT support
iio: ti_am335x_adc: Add DT support
arm/dts: AM335x-evm: Add TSC/ADC MFD device support
mfd: ti_am335x_tscadc: Add DT support

Sebastian Andrzej Siewior (6):
mfd: input: iio: ti_am335x_adc: use one structure for ti_tscadc_dev
input: ti_am335x_adc: use only FIFO0 and clean up a little
input: ti_am335x_tsc: ACK the HW_PEN irq in ISR
input: ti_am335x_tsc: return IRQ_NONE if there was no IRQ for us
iio: ti_am335x_adc: Allow to specify input line
iio: ti_am335x_adc: check if we found the value

Zubair Lutfullah (1):
Add IIO map interface for bone-helper Most of the work comes from
Pantelis Antoniou's patch in the original patchset. This adds the
IIO map interface which is used by bone-helper. I didnt want to
disturb existing users of the interface. The values match the ones
in /sys/bus/iio//in_voltage_scale for DT vsense-scale values of
100.

ZubairLK (5):
MFD: ti_tscadc: disable TSC control
IIO: ADC: ti_adc: Fix 1st sample read
input : ti_tsc : Enable shared IRQ TSC
Revert. Backport IIO
iio: ti_am335x_adc: Added iio_voltageX_scale

.../bindings/input/touchscreen/ti-tsc-adc.txt | 44 +++
arch/arm/boot/dts/am335x-evm.dts | 13 +
arch/arm/boot/dts/am33xx.dtsi | 8 +
drivers/iio/adc/ti_am335x_adc.c | 194 ++++++++++--
drivers/input/touchscreen/ti_am335x_tsc.c | 321 ++++++++++++++------
drivers/mfd/ti_am335x_tscadc.c | 130 ++++++--
include/linux/input/ti_am335x_tsc.h | 14 +-
include/linux/mfd/ti_am335x_tscadc.h | 47 ++-
8 files changed, 616 insertions(+), 155 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt

ZubairLK added some commits
@ZubairLK ZubairLK ADC fixes. Backport mfd-next , Forward port arago
This commit does a ton of things. Mostly documented in a blog
post. But I'll try and summarize
Removed existing patches for ADC.
Took 21 patches from mfd-next and downported them.
Downported IIO changes from 3.8 to 3.11
Forward ported some improvements from Arago tree. 3.2

Added IIO Scale voltage myself of which I'm kinda proud of :)
My first real patch. The others are mostly tweaks.

Things to note are.
ADC channels in DT are numbered 0 1 2 3 4 5 6 7. Not a simple 8/4.
bone-iio-helper won't work.
30dca92
@ZubairLK ZubairLK Removed redundant temp files. ~ ones.. 533af31
@ZubairLK ZubairLK Adds the IIO MAP interface required by the bone-helper
Added another patch to fix the bone helper.
It depended on the IIO Map interface which the new
patchset didnt have. Studied the old patch and
added it.
3651041
@ZubairLK ZubairLK Changed steps to configure to coordinate readouts
This is for other patches..
081bc31
@koenkooi koenkooi merged commit 837006b into from
@koenkooi koenkooi referenced this pull request
Closed

3.8 LCD4 pin mapping #59

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 29, 2013
  1. @ZubairLK

    ADC fixes. Backport mfd-next , Forward port arago

    ZubairLK authored
    This commit does a ton of things. Mostly documented in a blog
    post. But I'll try and summarize
    Removed existing patches for ADC.
    Took 21 patches from mfd-next and downported them.
    Downported IIO changes from 3.8 to 3.11
    Forward ported some improvements from Arago tree. 3.2
    
    Added IIO Scale voltage myself of which I'm kinda proud of :)
    My first real patch. The others are mostly tweaks.
    
    Things to note are.
    ADC channels in DT are numbered 0 1 2 3 4 5 6 7. Not a simple 8/4.
    bone-iio-helper won't work.
  2. @ZubairLK
Commits on Jul 2, 2013
  1. @ZubairLK

    Adds the IIO MAP interface required by the bone-helper

    ZubairLK authored
    Added another patch to fix the bone helper.
    It depended on the IIO Map interface which the new
    patchset didnt have. Studied the old patch and
    added it.
Commits on Jul 5, 2013
  1. @ZubairLK

    Changed steps to configure to coordinate readouts

    ZubairLK authored
    This is for other patches..
Something went wrong with that request. Please try again.