pinctrl: sx150x: sort chips by part number

Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt
index 25b4ec80c75998b28a1b8fdc36ce824b9f617efa..83f8d5c449bae57c4cd04efdfc3b6090e22df3c6 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt
@@ -6,11 +6,11 @@ pin controller, GPIO, and interrupt bindings.
 
 Required properties:
 - compatible: should be one of :
+                       "semtech,sx1502q",
+                       "semtech,sx1503q",
                        "semtech,sx1506q",
                        "semtech,sx1508q",
-                       "semtech,sx1509q",
-                       "semtech,sx1502q",
-                       "semtech,sx1503q".
+                       "semtech,sx1509q".
 
 - reg: The I2C slave address for this device.
 

diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c
index a19c814843aa6292472c20d3528030564f9efea9..97df9302e84b7273dc552f27aa05b172705abab1 100644 (file)
--- a/drivers/pinctrl/pinctrl-sx150x.c
+++ b/drivers/pinctrl/pinctrl-sx150x.c
@@ -148,71 +148,6 @@ static const struct pinctrl_pin_desc sx150x_16_pins[] = {
        PINCTRL_PIN(16, "oscio"),
 };
 
-static const struct sx150x_device_data sx1508q_device_data = {
-       .model = SX150X_789,
-       .reg_pullup     = 0x03,
-       .reg_pulldn     = 0x04,
-       .reg_dir        = 0x07,
-       .reg_data       = 0x08,
-       .reg_irq_mask   = 0x09,
-       .reg_irq_src    = 0x0c,
-       .reg_sense      = 0x0a,
-       .pri.x789 = {
-               .reg_drain      = 0x05,
-               .reg_polarity   = 0x06,
-               .reg_clock      = 0x0f,
-               .reg_misc       = 0x10,
-               .reg_reset      = 0x7d,
-       },
-       .ngpios = 8,
-       .pins = sx150x_8_pins,
-       .npins = ARRAY_SIZE(sx150x_8_pins),
-};
-
-static const struct sx150x_device_data sx1509q_device_data = {
-       .model = SX150X_789,
-       .reg_pullup     = 0x06,
-       .reg_pulldn     = 0x08,
-       .reg_dir        = 0x0e,
-       .reg_data       = 0x10,
-       .reg_irq_mask   = 0x12,
-       .reg_irq_src    = 0x18,
-       .reg_sense      = 0x14,
-       .pri.x789 = {
-               .reg_drain      = 0x0a,
-               .reg_polarity   = 0x0c,
-               .reg_clock      = 0x1e,
-               .reg_misc       = 0x1f,
-               .reg_reset      = 0x7d,
-       },
-       .ngpios = 16,
-       .pins = sx150x_16_pins,
-       .npins = ARRAY_SIZE(sx150x_16_pins),
-};
-
-static const struct sx150x_device_data sx1506q_device_data = {
-       .model = SX150X_456,
-       .reg_pullup     = 0x04,
-       .reg_pulldn     = 0x06,
-       .reg_dir        = 0x02,
-       .reg_data       = 0x00,
-       .reg_irq_mask   = 0x08,
-       .reg_irq_src    = 0x0e,
-       .reg_sense      = 0x0a,
-       .pri.x456 = {
-               .reg_pld_mode   = 0x20,
-               .reg_pld_table0 = 0x22,
-               .reg_pld_table1 = 0x24,
-               .reg_pld_table2 = 0x26,
-               .reg_pld_table3 = 0x28,
-               .reg_pld_table4 = 0x2a,
-               .reg_advance    = 0xad,
-       },
-       .ngpios = 16,
-       .pins = sx150x_16_pins,
-       .npins = 16, /* oscio not available */
-};
-
 static const struct sx150x_device_data sx1502q_device_data = {
        .model = SX150X_123,
        .reg_pullup     = 0x02,
@@ -259,6 +194,71 @@ static const struct sx150x_device_data sx1503q_device_data = {
        .npins  = 16, /* oscio not available */
 };
 
+static const struct sx150x_device_data sx1506q_device_data = {
+       .model = SX150X_456,
+       .reg_pullup     = 0x04,
+       .reg_pulldn     = 0x06,
+       .reg_dir        = 0x02,
+       .reg_data       = 0x00,
+       .reg_irq_mask   = 0x08,
+       .reg_irq_src    = 0x0e,
+       .reg_sense      = 0x0a,
+       .pri.x456 = {
+               .reg_pld_mode   = 0x20,
+               .reg_pld_table0 = 0x22,
+               .reg_pld_table1 = 0x24,
+               .reg_pld_table2 = 0x26,
+               .reg_pld_table3 = 0x28,
+               .reg_pld_table4 = 0x2a,
+               .reg_advance    = 0xad,
+       },
+       .ngpios = 16,
+       .pins = sx150x_16_pins,
+       .npins = 16, /* oscio not available */
+};
+
+static const struct sx150x_device_data sx1508q_device_data = {
+       .model = SX150X_789,
+       .reg_pullup     = 0x03,
+       .reg_pulldn     = 0x04,
+       .reg_dir        = 0x07,
+       .reg_data       = 0x08,
+       .reg_irq_mask   = 0x09,
+       .reg_irq_src    = 0x0c,
+       .reg_sense      = 0x0a,
+       .pri.x789 = {
+               .reg_drain      = 0x05,
+               .reg_polarity   = 0x06,
+               .reg_clock      = 0x0f,
+               .reg_misc       = 0x10,
+               .reg_reset      = 0x7d,
+       },
+       .ngpios = 8,
+       .pins = sx150x_8_pins,
+       .npins = ARRAY_SIZE(sx150x_8_pins),
+};
+
+static const struct sx150x_device_data sx1509q_device_data = {
+       .model = SX150X_789,
+       .reg_pullup     = 0x06,
+       .reg_pulldn     = 0x08,
+       .reg_dir        = 0x0e,
+       .reg_data       = 0x10,
+       .reg_irq_mask   = 0x12,
+       .reg_irq_src    = 0x18,
+       .reg_sense      = 0x14,
+       .pri.x789 = {
+               .reg_drain      = 0x0a,
+               .reg_polarity   = 0x0c,
+               .reg_clock      = 0x1e,
+               .reg_misc       = 0x1f,
+               .reg_reset      = 0x7d,
+       },
+       .ngpios = 16,
+       .pins = sx150x_16_pins,
+       .npins = ARRAY_SIZE(sx150x_16_pins),
+};
+
 static int sx150x_pinctrl_get_groups_count(struct pinctrl_dev *pctldev)
 {
        return 0;
@@ -758,20 +758,20 @@ static const struct pinconf_ops sx150x_pinconf_ops = {
 };
 
 static const struct i2c_device_id sx150x_id[] = {
-       {"sx1508q", (kernel_ulong_t) &sx1508q_device_data },
-       {"sx1509q", (kernel_ulong_t) &sx1509q_device_data },
-       {"sx1506q", (kernel_ulong_t) &sx1506q_device_data },
        {"sx1502q", (kernel_ulong_t) &sx1502q_device_data },
        {"sx1503q", (kernel_ulong_t) &sx1503q_device_data },
+       {"sx1506q", (kernel_ulong_t) &sx1506q_device_data },
+       {"sx1508q", (kernel_ulong_t) &sx1508q_device_data },
+       {"sx1509q", (kernel_ulong_t) &sx1509q_device_data },
        {}
 };
 
 static const struct of_device_id sx150x_of_match[] = {
-       { .compatible = "semtech,sx1508q", .data = &sx1508q_device_data },
-       { .compatible = "semtech,sx1509q", .data = &sx1509q_device_data },
-       { .compatible = "semtech,sx1506q", .data = &sx1506q_device_data },
        { .compatible = "semtech,sx1502q", .data = &sx1502q_device_data },
        { .compatible = "semtech,sx1503q", .data = &sx1503q_device_data },
+       { .compatible = "semtech,sx1506q", .data = &sx1506q_device_data },
+       { .compatible = "semtech,sx1508q", .data = &sx1508q_device_data },
+       { .compatible = "semtech,sx1509q", .data = &sx1509q_device_data },
        {},
 };