Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / iio / adc / rockchip_saradc.c

diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index dffff64b598938f336995cbf2a1cac08eef558f8..85d701291654074e1fa07978331eb01d89abd04a 100644 (file)
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -162,6 +162,22 @@ static const struct rockchip_saradc_data rk3066_tsadc_data = {
        .clk_rate = 50000,
 };
 
+static const struct iio_chan_spec rockchip_rk3399_saradc_iio_channels[] = {
+       ADC_CHANNEL(0, "adc0"),
+       ADC_CHANNEL(1, "adc1"),
+       ADC_CHANNEL(2, "adc2"),
+       ADC_CHANNEL(3, "adc3"),
+       ADC_CHANNEL(4, "adc4"),
+       ADC_CHANNEL(5, "adc5"),
+};
+
+static const struct rockchip_saradc_data rk3399_saradc_data = {
+       .num_bits = 10,
+       .channels = rockchip_rk3399_saradc_iio_channels,
+       .num_channels = ARRAY_SIZE(rockchip_rk3399_saradc_iio_channels),
+       .clk_rate = 1000000,
+};
+
 static const struct of_device_id rockchip_saradc_match[] = {
        {
                .compatible = "rockchip,saradc",
@@ -169,6 +185,9 @@ static const struct of_device_id rockchip_saradc_match[] = {
        }, {
                .compatible = "rockchip,rk3066-tsadc",
                .data = &rk3066_tsadc_data,
+       }, {
+               .compatible = "rockchip,rk3399-saradc",
+               .data = &rk3399_saradc_data,
        },
        {},
 };