Merge branch 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux into next/soc

This is a dependency for the rk3288 DT updates, the branch should
first get merged through Mike's clk git.

* 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux:
  ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER
  clk: rockchip: add clock controller for rk3288
  dt-bindings: add documentation for rk3288 cru
  clk: rockchip: add clock driver for rk3188 and rk3066 clocks
  dt-bindings: add documentation for rk3188 clock and reset unit
  clk: rockchip: add reset controller
  clk: rockchip: add clock type for pll clocks and pll used on rk3066
  clk: rockchip: add basic infrastructure for clock branches
  clk: composite: improve rate_hw sanity check logic
  clk: composite: allow read-only clocks
  clk: composite: support determine_rate using rate_ops->round_rate + mux_ops->set_parent

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

4 files changed, 613 insertions, 0 deletions

diff --git a/include/dt-bindings/clock/rk3066a-cru.h b/include/dt-bindings/clock/rk3066a-cru.h
new file mode 100644
index 000000000000..bc1ed1dbd855
--- /dev/null
+++ b/include/dt-bindings/clock/rk3066a-cru.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Heiko Stuebner <heiko@sntech.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <dt-bindings/clock/rk3188-cru-common.h>
+
+/* soft-reset indices */
+#define SRST_SRST1              0
+#define SRST_SRST2              1
+
+#define SRST_L2MEM              18
+#define SRST_I2S0               23
+#define SRST_I2S1               24
+#define SRST_I2S2               25
+#define SRST_TIMER2             29
+
+#define SRST_GPIO4              36
+#define SRST_GPIO6              38
+
+#define SRST_TSADC              92
+
+#define SRST_HDMI               96
+#define SRST_HDMI_APB           97
+#define SRST_CIF1               111
diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h
new file mode 100644
index 000000000000..750ee60e75fb
--- /dev/null
+++ b/include/dt-bindings/clock/rk3188-cru-common.h
@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Heiko Stuebner <heiko@sntech.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* core clocks from */
+#define PLL_APLL                1
+#define PLL_DPLL                2
+#define PLL_CPLL                3
+#define PLL_GPLL                4
+#define CORE_PERI               5
+#define CORE_L2C                6
+
+/* sclk gates (special clocks) */
+#define SCLK_UART0              64
+#define SCLK_UART1              65
+#define SCLK_UART2              66
+#define SCLK_UART3              67
+#define SCLK_MAC                68
+#define SCLK_SPI0               69
+#define SCLK_SPI1               70
+#define SCLK_SARADC             71
+#define SCLK_SDMMC              72
+#define SCLK_SDIO               73
+#define SCLK_EMMC               74
+#define SCLK_I2S0               75
+#define SCLK_I2S1               76
+#define SCLK_I2S2               77
+#define SCLK_SPDIF              78
+#define SCLK_CIF0               79
+#define SCLK_CIF1               80
+#define SCLK_OTGPHY0            81
+#define SCLK_OTGPHY1            82
+#define SCLK_HSADC              83
+#define SCLK_TIMER0             84
+#define SCLK_TIMER1             85
+#define SCLK_TIMER2             86
+#define SCLK_TIMER3             87
+#define SCLK_TIMER4             88
+#define SCLK_TIMER5             89
+#define SCLK_TIMER6             90
+#define SCLK_JTAG               91
+#define SCLK_SMC                92
+
+#define DCLK_LCDC0              190
+#define DCLK_LCDC1              191
+
+/* aclk gates */
+#define ACLK_DMA1               192
+#define ACLK_DMA2               193
+#define ACLK_GPS                194
+#define ACLK_LCDC0              195
+#define ACLK_LCDC1              196
+#define ACLK_GPU                197
+#define ACLK_SMC                198
+#define ACLK_CIF                199
+#define ACLK_IPP                200
+#define ACLK_RGA                201
+#define ACLK_CIF0               202
+
+/* pclk gates */
+#define PCLK_GRF                320
+#define PCLK_PMU                321
+#define PCLK_TIMER0             322
+#define PCLK_TIMER1             323
+#define PCLK_TIMER2             324
+#define PCLK_TIMER3             325
+#define PCLK_PWM01              326
+#define PCLK_PWM23              327
+#define PCLK_SPI0               328
+#define PCLK_SPI1               329
+#define PCLK_SARADC             330
+#define PCLK_WDT                331
+#define PCLK_UART0              332
+#define PCLK_UART1              333
+#define PCLK_UART2              334
+#define PCLK_UART3              335
+#define PCLK_I2C0               336
+#define PCLK_I2C1               337
+#define PCLK_I2C2               338
+#define PCLK_I2C3               339
+#define PCLK_I2C4               340
+#define PCLK_GPIO0              341
+#define PCLK_GPIO1              342
+#define PCLK_GPIO2              343
+#define PCLK_GPIO3              344
+#define PCLK_GPIO4              345
+#define PCLK_GPIO6              346
+#define PCLK_EFUSE              347
+#define PCLK_TZPC               348
+#define PCLK_TSADC              349
+
+/* hclk gates */
+#define HCLK_SDMMC              448
+#define HCLK_SDIO               449
+#define HCLK_EMMC               450
+#define HCLK_OTG0               451
+#define HCLK_EMAC               452
+#define HCLK_SPDIF              453
+#define HCLK_I2S0               454
+#define HCLK_I2S1               455
+#define HCLK_I2S2               456
+#define HCLK_OTG1               457
+#define HCLK_HSIC               458
+#define HCLK_HSADC              459
+#define HCLK_PIDF               460
+#define HCLK_LCDC0              461
+#define HCLK_LCDC1              462
+#define HCLK_ROM                463
+#define HCLK_CIF0               464
+#define HCLK_IPP                465
+#define HCLK_RGA                466
+#define HCLK_NANDC0             467
+
+#define CLK_NR_CLKS             (HCLK_NANDC0 + 1)
+
+/* soft-reset indices */
+#define SRST_MCORE              2
+#define SRST_CORE0              3
+#define SRST_CORE1              4
+#define SRST_MCORE_DBG          7
+#define SRST_CORE0_DBG          8
+#define SRST_CORE1_DBG          9
+#define SRST_CORE0_WDT          12
+#define SRST_CORE1_WDT          13
+#define SRST_STRC_SYS           14
+#define SRST_L2C                15
+
+#define SRST_CPU_AHB            17
+#define SRST_AHB2APB            19
+#define SRST_DMA1               20
+#define SRST_INTMEM             21
+#define SRST_ROM                22
+#define SRST_SPDIF              26
+#define SRST_TIMER0             27
+#define SRST_TIMER1             28
+#define SRST_EFUSE              30
+
+#define SRST_GPIO0              32
+#define SRST_GPIO1              33
+#define SRST_GPIO2              34
+#define SRST_GPIO3              35
+
+#define SRST_UART0              39
+#define SRST_UART1              40
+#define SRST_UART2              41
+#define SRST_UART3              42
+#define SRST_I2C0               43
+#define SRST_I2C1               44
+#define SRST_I2C2               45
+#define SRST_I2C3               46
+#define SRST_I2C4               47
+
+#define SRST_PWM0               48
+#define SRST_PWM1               49
+#define SRST_DAP_PO             50
+#define SRST_DAP                51
+#define SRST_DAP_SYS            52
+#define SRST_TPIU_ATB           53
+#define SRST_PMU_APB            54
+#define SRST_GRF                55
+#define SRST_PMU                56
+#define SRST_PERI_AXI           57
+#define SRST_PERI_AHB           58
+#define SRST_PERI_APB           59
+#define SRST_PERI_NIU           60
+#define SRST_CPU_PERI           61
+#define SRST_EMEM_PERI          62
+#define SRST_USB_PERI           63
+
+#define SRST_DMA2               64
+#define SRST_SMC                65
+#define SRST_MAC                66
+#define SRST_NANC0              68
+#define SRST_USBOTG0            69
+#define SRST_USBPHY0            70
+#define SRST_OTGC0              71
+#define SRST_USBOTG1            72
+#define SRST_USBPHY1            73
+#define SRST_OTGC1              74
+#define SRST_HSADC              76
+#define SRST_PIDFILTER          77
+#define SRST_DDR_MSCH           79
+
+#define SRST_TZPC               80
+#define SRST_SDMMC              81
+#define SRST_SDIO               82
+#define SRST_EMMC               83
+#define SRST_SPI0               84
+#define SRST_SPI1               85
+#define SRST_WDT                86
+#define SRST_SARADC             87
+#define SRST_DDRPHY             88
+#define SRST_DDRPHY_APB         89
+#define SRST_DDRCTL             90
+#define SRST_DDRCTL_APB         91
+#define SRST_DDRPUB             93
+
+#define SRST_VIO0_AXI           98
+#define SRST_VIO0_AHB           99
+#define SRST_LCDC0_AXI          100
+#define SRST_LCDC0_AHB          101
+#define SRST_LCDC0_DCLK         102
+#define SRST_LCDC1_AXI          103
+#define SRST_LCDC1_AHB          104
+#define SRST_LCDC1_DCLK         105
+#define SRST_IPP_AXI            106
+#define SRST_IPP_AHB            107
+#define SRST_RGA_AXI            108
+#define SRST_RGA_AHB            109
+#define SRST_CIF0               110
+
+#define SRST_VCODEC_AXI         112
+#define SRST_VCODEC_AHB         113
+#define SRST_VIO1_AXI           114
+#define SRST_VCODEC_CPU         115
+#define SRST_VCODEC_NIU         116
+#define SRST_GPU                120
+#define SRST_GPU_NIU            122
+#define SRST_TFUN_ATB           125
+#define SRST_TFUN_APB           126
+#define SRST_CTI4_APB           127
+
+#define SRST_TPIU_APB           128
+#define SRST_TRACE              129
+#define SRST_CORE_DBG           130
+#define SRST_DBG_APB            131
+#define SRST_CTI0               132
+#define SRST_CTI0_APB           133
+#define SRST_CTI1               134
+#define SRST_CTI1_APB           135
+#define SRST_PTM_CORE0          136
+#define SRST_PTM_CORE1          137
+#define SRST_PTM0               138
+#define SRST_PTM0_ATB           139
+#define SRST_PTM1               140
+#define SRST_PTM1_ATB           141
+#define SRST_CTM                142
+#define SRST_TS                 143
diff --git a/include/dt-bindings/clock/rk3188-cru.h b/include/dt-bindings/clock/rk3188-cru.h
new file mode 100644
index 000000000000..9fac8edd3f9d
--- /dev/null
+++ b/include/dt-bindings/clock/rk3188-cru.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Heiko Stuebner <heiko@sntech.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <dt-bindings/clock/rk3188-cru-common.h>
+
+/* soft-reset indices */
+#define SRST_PTM_CORE2          0
+#define SRST_PTM_CORE3          1
+#define SRST_CORE2              5
+#define SRST_CORE3              6
+#define SRST_CORE2_DBG          10
+#define SRST_CORE3_DBG          11
+
+#define SRST_TIMER2             16
+#define SRST_TIMER4             23
+#define SRST_I2S0               24
+#define SRST_TIMER5             25
+#define SRST_TIMER3             29
+#define SRST_TIMER6             31
+
+#define SRST_PTM3               36
+#define SRST_PTM3_ATB           37
+
+#define SRST_GPS                67
+#define SRST_HSICPHY            75
+#define SRST_TIMER              78
+
+#define SRST_PTM2               92
+#define SRST_CORE2_WDT          94
+#define SRST_CORE3_WDT          95
+
+#define SRST_PTM2_ATB           111
+
+#define SRST_HSIC               117
+#define SRST_CTI2               118
+#define SRST_CTI2_APB           119
+#define SRST_GPU_BRIDGE         121
+#define SRST_CTI3               123
+#define SRST_CTI3_APB           124
diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h
new file mode 100644
index 000000000000..ebcb460ea4ad
--- /dev/null
+++ b/include/dt-bindings/clock/rk3288-cru.h
@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Heiko Stuebner <heiko@sntech.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* core clocks */
+#define PLL_APLL                1
+#define PLL_DPLL                2
+#define PLL_CPLL                3
+#define PLL_GPLL                4
+#define PLL_NPLL                5
+
+/* sclk gates (special clocks) */
+#define SCLK_GPU                64
+#define SCLK_SPI0               65
+#define SCLK_SPI1               66
+#define SCLK_SPI2               67
+#define SCLK_SDMMC              68
+#define SCLK_SDIO0              69
+#define SCLK_SDIO1              70
+#define SCLK_EMMC               71
+#define SCLK_TSADC              72
+#define SCLK_SARADC             73
+#define SCLK_PS2C               74
+#define SCLK_NANDC0             75
+#define SCLK_NANDC1             76
+#define SCLK_UART0              77
+#define SCLK_UART1              78
+#define SCLK_UART2              79
+#define SCLK_UART3              80
+#define SCLK_UART4              81
+#define SCLK_I2S0               82
+#define SCLK_SPDIF              83
+#define SCLK_SPDIF8CH           84
+#define SCLK_TIMER0             85
+#define SCLK_TIMER1             86
+#define SCLK_TIMER2             87
+#define SCLK_TIMER3             88
+#define SCLK_TIMER4             89
+#define SCLK_TIMER5             90
+#define SCLK_TIMER6             91
+#define SCLK_HSADC              92
+#define SCLK_OTGPHY0            93
+#define SCLK_OTGPHY1            94
+#define SCLK_OTGPHY2            95
+#define SCLK_OTG_ADP            96
+#define SCLK_HSICPHY480M        97
+#define SCLK_HSICPHY12M         98
+#define SCLK_MACREF             99
+#define SCLK_LCDC_PWM0          100
+#define SCLK_LCDC_PWM1          101
+#define SCLK_MAC_RX             102
+#define SCLK_MAC_TX             103
+
+#define DCLK_VOP0               190
+#define DCLK_VOP1               191
+
+/* aclk gates */
+#define ACLK_GPU                192
+#define ACLK_DMAC1              193
+#define ACLK_DMAC2              194
+#define ACLK_MMU                195
+#define ACLK_GMAC               196
+#define ACLK_VOP0               197
+#define ACLK_VOP1               198
+#define ACLK_CRYPTO             199
+#define ACLK_RGA                200
+
+/* pclk gates */
+#define PCLK_GPIO0              320
+#define PCLK_GPIO1              321
+#define PCLK_GPIO2              322
+#define PCLK_GPIO3              323
+#define PCLK_GPIO4              324
+#define PCLK_GPIO5              325
+#define PCLK_GPIO6              326
+#define PCLK_GPIO7              327
+#define PCLK_GPIO8              328
+#define PCLK_GRF                329
+#define PCLK_SGRF               330
+#define PCLK_PMU                331
+#define PCLK_I2C0               332
+#define PCLK_I2C1               333
+#define PCLK_I2C2               334
+#define PCLK_I2C3               335
+#define PCLK_I2C4               336
+#define PCLK_I2C5               337
+#define PCLK_SPI0               338
+#define PCLK_SPI1               339
+#define PCLK_SPI2               340
+#define PCLK_UART0              341
+#define PCLK_UART1              342
+#define PCLK_UART2              343
+#define PCLK_UART3              344
+#define PCLK_UART4              345
+#define PCLK_TSADC              346
+#define PCLK_SARADC             347
+#define PCLK_SIM                348
+#define PCLK_GMAC               349
+#define PCLK_PWM                350
+#define PCLK_RKPWM              351
+#define PCLK_PS2C               352
+#define PCLK_TIMER              353
+#define PCLK_TZPC               354
+
+/* hclk gates */
+#define HCLK_GPS                448
+#define HCLK_OTG0               449
+#define HCLK_USBHOST0           450
+#define HCLK_USBHOST1           451
+#define HCLK_HSIC               452
+#define HCLK_NANDC0             453
+#define HCLK_NANDC1             454
+#define HCLK_TSP                455
+#define HCLK_SDMMC              456
+#define HCLK_SDIO0              457
+#define HCLK_SDIO1              458
+#define HCLK_EMMC               459
+#define HCLK_HSADC              460
+#define HCLK_CRYPTO             461
+#define HCLK_I2S0               462
+#define HCLK_SPDIF              463
+#define HCLK_SPDIF8CH           464
+#define HCLK_VOP0               465
+#define HCLK_VOP1               466
+#define HCLK_ROM                467
+#define HCLK_IEP                468
+#define HCLK_ISP                469
+#define HCLK_RGA                470
+
+#define CLK_NR_CLKS             (HCLK_RGA + 1)
+
+/* soft-reset indices */
+#define SRST_CORE0              0
+#define SRST_CORE1              1
+#define SRST_CORE2              2
+#define SRST_CORE3              3
+#define SRST_CORE0_PO           4
+#define SRST_CORE1_PO           5
+#define SRST_CORE2_PO           6
+#define SRST_CORE3_PO           7
+#define SRST_PDCORE_STRSYS      8
+#define SRST_PDBUS_STRSYS       9
+#define SRST_L2C                10
+#define SRST_TOPDBG             11
+#define SRST_CORE0_DBG          12
+#define SRST_CORE1_DBG          13
+#define SRST_CORE2_DBG          14
+#define SRST_CORE3_DBG          15
+
+#define SRST_PDBUG_AHB_ARBITOR  16
+#define SRST_EFUSE256           17
+#define SRST_DMAC1              18
+#define SRST_INTMEM             19
+#define SRST_ROM                20
+#define SRST_SPDIF8CH           21
+#define SRST_TIMER              22
+#define SRST_I2S0               23
+#define SRST_SPDIF              24
+#define SRST_TIMER0             25
+#define SRST_TIMER1             26
+#define SRST_TIMER2             27
+#define SRST_TIMER3             28
+#define SRST_TIMER4             29
+#define SRST_TIMER5             30
+#define SRST_EFUSE              31
+
+#define SRST_GPIO0              32
+#define SRST_GPIO1              33
+#define SRST_GPIO2              34
+#define SRST_GPIO3              35
+#define SRST_GPIO4              36
+#define SRST_GPIO5              37
+#define SRST_GPIO6              38
+#define SRST_GPIO7              39
+#define SRST_GPIO8              40
+#define SRST_I2C0               42
+#define SRST_I2C1               43
+#define SRST_I2C2               44
+#define SRST_I2C3               45
+#define SRST_I2C4               46
+#define SRST_I2C5               47
+
+#define SRST_DWPWM              48
+#define SRST_MMC_PERI           49
+#define SRST_PERIPH_MMU         50
+#define SRST_DAP                51
+#define SRST_DAP_SYS            52
+#define SRST_TPIU               53
+#define SRST_PMU_APB            54
+#define SRST_GRF                55
+#define SRST_PMU                56
+#define SRST_PERIPH_AXI         57
+#define SRST_PERIPH_AHB         58
+#define SRST_PERIPH_APB         59
+#define SRST_PERIPH_NIU         60
+#define SRST_PDPERI_AHB_ARBI    61
+#define SRST_EMEM               62
+#define SRST_USB_PERI           63
+
+#define SRST_DMAC2              64
+#define SRST_MAC                66
+#define SRST_GPS                67
+#define SRST_RKPWM              69
+#define SRST_CCP                71
+#define SRST_USBHOST0           72
+#define SRST_HSIC               73
+#define SRST_HSIC_AUX           74
+#define SRST_HSIC_PHY           75
+#define SRST_HSADC              76
+#define SRST_NANDC0             77
+#define SRST_NANDC1             78
+
+#define SRST_TZPC               80
+#define SRST_SPI0               83
+#define SRST_SPI1               84
+#define SRST_SPI2               85
+#define SRST_SARADC             87
+#define SRST_PDALIVE_NIU        88
+#define SRST_PDPMU_INTMEM       89
+#define SRST_PDPMU_NIU          90
+#define SRST_SGRF               91
+
+#define SRST_VIO_ARBI           96
+#define SRST_RGA_NIU            97
+#define SRST_VIO0_NIU_AXI       98
+#define SRST_VIO_NIU_AHB        99
+#define SRST_LCDC0_AXI          100
+#define SRST_LCDC0_AHB          101
+#define SRST_LCDC0_DCLK         102
+#define SRST_VIO1_NIU_AXI       103
+#define SRST_VIP                104
+#define SRST_RGA_CORE           105
+#define SRST_IEP_AXI            106
+#define SRST_IEP_AHB            107
+#define SRST_RGA_AXI            108
+#define SRST_RGA_AHB            109
+#define SRST_ISP                110
+#define SRST_EDP                111
+
+#define SRST_VCODEC_AXI         112
+#define SRST_VCODEC_AHB         113
+#define SRST_VIO_H2P            114
+#define SRST_MIPIDSI0           115
+#define SRST_MIPIDSI1           116
+#define SRST_MIPICSI            117
+#define SRST_LVDS_PHY           118
+#define SRST_LVDS_CON           119
+#define SRST_GPU                120
+#define SRST_HDMI               121
+#define SRST_CORE_PVTM          124
+#define SRST_GPU_PVTM           125
+
+#define SRST_MMC0               128
+#define SRST_SDIO0              129
+#define SRST_SDIO1              130
+#define SRST_EMMC               131
+#define SRST_USBOTG_AHB         132
+#define SRST_USBOTG_PHY         133
+#define SRST_USBOTG_CON         134
+#define SRST_USBHOST0_AHB       135
+#define SRST_USBHOST0_PHY       136
+#define SRST_USBHOST0_CON       137
+#define SRST_USBHOST1_AHB       138
+#define SRST_USBHOST1_PHY       139
+#define SRST_USBHOST1_CON       140
+#define SRST_USB_ADP            141
+#define SRST_ACC_EFUSE          142