Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""

[u-boot.git] / drivers / clk / sunxi / clk_r40.c

diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c
index 92907281f1ad746f3ede9f3b5a44859e449d3077..0fef6f3566d524e172da5fb19e02c1527739af01 100644 (file)
--- a/drivers/clk/sunxi/clk_r40.c
+++ b/drivers/clk/sunxi/clk_r40.c
@@ -8,15 +8,18 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <errno.h>
-#include <asm/arch/ccu.h>
+#include <clk/sunxi.h>
 #include <dt-bindings/clock/sun8i-r40-ccu.h>
 #include <dt-bindings/reset/sun8i-r40-ccu.h>
+#include <linux/bitops.h>
 
 static struct ccu_clk_gate r40_gates[] = {
+       [CLK_BUS_MIPI_DSI]      = GATE(0x060, BIT(1)),
        [CLK_BUS_MMC0]          = GATE(0x060, BIT(8)),
        [CLK_BUS_MMC1]          = GATE(0x060, BIT(9)),
        [CLK_BUS_MMC2]          = GATE(0x060, BIT(10)),
        [CLK_BUS_MMC3]          = GATE(0x060, BIT(11)),
+       [CLK_BUS_NAND]          = GATE(0x060, BIT(13)),
        [CLK_BUS_SPI0]          = GATE(0x060, BIT(20)),
        [CLK_BUS_SPI1]          = GATE(0x060, BIT(21)),
        [CLK_BUS_SPI2]          = GATE(0x060, BIT(22)),
@@ -29,6 +32,23 @@ static struct ccu_clk_gate r40_gates[] = {
        [CLK_BUS_OHCI1]         = GATE(0x060, BIT(30)),
        [CLK_BUS_OHCI2]         = GATE(0x060, BIT(31)),
 
+       [CLK_BUS_HDMI0]         = GATE(0x064, BIT(10)),
+       [CLK_BUS_HDMI1]         = GATE(0x064, BIT(11)),
+       [CLK_BUS_DE]            = GATE(0x064, BIT(12)),
+       [CLK_BUS_GMAC]          = GATE(0x064, BIT(17)),
+       [CLK_BUS_TCON_LCD0]     = GATE(0x064, BIT(26)),
+       [CLK_BUS_TCON_LCD1]     = GATE(0x064, BIT(27)),
+       [CLK_BUS_TCON_TV0]      = GATE(0x064, BIT(28)),
+       [CLK_BUS_TCON_TV1]      = GATE(0x064, BIT(29)),
+       [CLK_BUS_TCON_TOP]      = GATE(0x064, BIT(30)),
+
+       [CLK_BUS_PIO]           = GATE(0x068, BIT(5)),
+
+       [CLK_BUS_I2C0]          = GATE(0x06c, BIT(0)),
+       [CLK_BUS_I2C1]          = GATE(0x06c, BIT(1)),
+       [CLK_BUS_I2C2]          = GATE(0x06c, BIT(2)),
+       [CLK_BUS_I2C3]          = GATE(0x06c, BIT(3)),
+       [CLK_BUS_I2C4]          = GATE(0x06c, BIT(15)),
        [CLK_BUS_UART0]         = GATE(0x06c, BIT(16)),
        [CLK_BUS_UART1]         = GATE(0x06c, BIT(17)),
        [CLK_BUS_UART2]         = GATE(0x06c, BIT(18)),
@@ -38,6 +58,7 @@ static struct ccu_clk_gate r40_gates[] = {
        [CLK_BUS_UART6]         = GATE(0x06c, BIT(22)),
        [CLK_BUS_UART7]         = GATE(0x06c, BIT(23)),
 
+       [CLK_NAND]              = GATE(0x080, BIT(31)),
        [CLK_SPI0]              = GATE(0x0a0, BIT(31)),
        [CLK_SPI1]              = GATE(0x0a4, BIT(31)),
        [CLK_SPI2]              = GATE(0x0a8, BIT(31)),
@@ -49,6 +70,17 @@ static struct ccu_clk_gate r40_gates[] = {
        [CLK_USB_OHCI0]         = GATE(0x0cc, BIT(16)),
        [CLK_USB_OHCI1]         = GATE(0x0cc, BIT(17)),
        [CLK_USB_OHCI2]         = GATE(0x0cc, BIT(18)),
+
+       [CLK_DE]                = GATE(0x104, BIT(31)),
+       [CLK_TCON_LCD0]         = GATE(0x110, BIT(31)),
+       [CLK_TCON_LCD1]         = GATE(0x114, BIT(31)),
+       [CLK_TCON_TV0]          = GATE(0x118, BIT(31)),
+       [CLK_TCON_TV1]          = GATE(0x11c, BIT(31)),
+
+       [CLK_HDMI]              = GATE(0x150, BIT(31)),
+       [CLK_HDMI_SLOW]         = GATE(0x154, BIT(31)),
+
+       [CLK_DSI_DPHY]          = GATE(0x168, BIT(15)),
 };
 
 static struct ccu_reset r40_resets[] = {
@@ -56,10 +88,12 @@ static struct ccu_reset r40_resets[] = {
        [RST_USB_PHY1]          = RESET(0x0cc, BIT(1)),
        [RST_USB_PHY2]          = RESET(0x0cc, BIT(2)),
 
+       [RST_BUS_MIPI_DSI]      = RESET(0x2c0, BIT(1)),
        [RST_BUS_MMC0]          = RESET(0x2c0, BIT(8)),
        [RST_BUS_MMC1]          = RESET(0x2c0, BIT(9)),
        [RST_BUS_MMC2]          = RESET(0x2c0, BIT(10)),
        [RST_BUS_MMC3]          = RESET(0x2c0, BIT(11)),
+       [RST_BUS_NAND]          = RESET(0x2c0, BIT(13)),
        [RST_BUS_SPI0]          = RESET(0x2c0, BIT(20)),
        [RST_BUS_SPI1]          = RESET(0x2c0, BIT(21)),
        [RST_BUS_SPI2]          = RESET(0x2c0, BIT(22)),
@@ -72,6 +106,21 @@ static struct ccu_reset r40_resets[] = {
        [RST_BUS_OHCI1]         = RESET(0x2c0, BIT(30)),
        [RST_BUS_OHCI2]         = RESET(0x2c0, BIT(31)),
 
+       [RST_BUS_HDMI0]         = RESET(0x2c4, BIT(10)),
+       [RST_BUS_HDMI1]         = RESET(0x2c4, BIT(11)),
+       [RST_BUS_DE]            = RESET(0x2c4, BIT(12)),
+       [RST_BUS_GMAC]          = RESET(0x2c4, BIT(17)),
+       [RST_BUS_TCON_LCD0]     = RESET(0x2c4, BIT(26)),
+       [RST_BUS_TCON_LCD1]     = RESET(0x2c4, BIT(27)),
+       [RST_BUS_TCON_TV0]      = RESET(0x2c4, BIT(28)),
+       [RST_BUS_TCON_TV1]      = RESET(0x2c4, BIT(29)),
+       [RST_BUS_TCON_TOP]      = RESET(0x2c4, BIT(30)),
+
+       [RST_BUS_I2C0]          = RESET(0x2d8, BIT(0)),
+       [RST_BUS_I2C1]          = RESET(0x2d8, BIT(1)),
+       [RST_BUS_I2C2]          = RESET(0x2d8, BIT(2)),
+       [RST_BUS_I2C3]          = RESET(0x2d8, BIT(3)),
+       [RST_BUS_I2C4]          = RESET(0x2d8, BIT(15)),
        [RST_BUS_UART0]         = RESET(0x2d8, BIT(16)),
        [RST_BUS_UART1]         = RESET(0x2d8, BIT(17)),
        [RST_BUS_UART2]         = RESET(0x2d8, BIT(18)),
@@ -82,28 +131,9 @@ static struct ccu_reset r40_resets[] = {
        [RST_BUS_UART7]         = RESET(0x2d8, BIT(23)),
 };
 
-static const struct ccu_desc r40_ccu_desc = {
+const struct ccu_desc r40_ccu_desc = {
        .gates = r40_gates,
        .resets = r40_resets,
-};
-
-static int r40_clk_bind(struct udevice *dev)
-{
-       return sunxi_reset_bind(dev, ARRAY_SIZE(r40_resets));
-}
-
-static const struct udevice_id r40_clk_ids[] = {
-       { .compatible = "allwinner,sun8i-r40-ccu",
-         .data = (ulong)&r40_ccu_desc },
-       { }
-};
-
-U_BOOT_DRIVER(clk_sun8i_r40) = {
-       .name           = "sun8i_r40_ccu",
-       .id             = UCLASS_CLK,
-       .of_match       = r40_clk_ids,
-       .priv_auto_alloc_size   = sizeof(struct ccu_priv),
-       .ops            = &sunxi_clk_ops,
-       .probe          = sunxi_clk_probe,
-       .bind           = r40_clk_bind,
+       .num_gates = ARRAY_SIZE(r40_gates),
+       .num_resets = ARRAY_SIZE(r40_resets),
 };