Module Name: src
Committed By: martin
Date: Fri Nov 14 13:26:47 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_board.c awin_hdmi.c
awin_io.c awin_reg.h awin_var.h files.awin
src/sys/arch/evbarm/awin [netbsd-7]: awin_machdep.c
src/sys/arch/evbarm/conf [netbsd-7]: BPI CUBIEBOARD HUMMINGBIRD_A31
src/sys/dev/wscons [netbsd-7]: wsconsio.h
Added Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_debe.c awin_fb.c
awin_tcon.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #210):
sys/arch/arm/allwinner/awin_board.c: revisions 1.26-1.27
sys/arch/arm/allwinner/awin_debe.c: revisions 1.1-1.6
sys/arch/arm/allwinner/awin_fb.c: revisions 1.1-1.4
sys/arch/arm/allwinner/awin_hdmi.c: revisions 1.3-1.6,1.9-1.12
sys/arch/arm/allwinner/awin_io.c: revision 1.27
sys/arch/arm/allwinner/awin_reg.h: revisions 1.46-1.47,1.49
sys/arch/arm/allwinner/awin_tcon.c: revisions 1.1-1.5
sys/arch/arm/allwinner/awin_var.h: revisions 1.20-1.22
sys/arch/arm/allwinner/files.awin: revisions 1.22-1.23,1.25
sys/arch/evbarm/awin/awin_machdep.c: revision 1.26
sys/arch/evbarm/conf/BPI: revision 1.10
sys/arch/evbarm/conf/CUBIEBOARD: revision 1.32
sys/arch/evbarm/conf/HUMMINGBIRD_A31: revisions 1.17-1.18
sys/dev/wscons/wsconsio.h: revision 1.109
HDMI framebuffer for Allwinner boards.
To generate a diff of this commit:
cvs rdiff -u -r1.14.6.1 -r1.14.6.2 src/sys/arch/arm/allwinner/awin_board.c
cvs rdiff -u -r0 -r1.6.2.2 src/sys/arch/arm/allwinner/awin_debe.c
cvs rdiff -u -r0 -r1.4.2.2 src/sys/arch/arm/allwinner/awin_fb.c
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/sys/arch/arm/allwinner/awin_hdmi.c
cvs rdiff -u -r1.8.10.1 -r1.8.10.2 src/sys/arch/arm/allwinner/awin_io.c \
src/sys/arch/arm/allwinner/files.awin
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/sys/arch/arm/allwinner/awin_reg.h
cvs rdiff -u -r0 -r1.5.2.2 src/sys/arch/arm/allwinner/awin_tcon.c
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/sys/arch/arm/allwinner/awin_var.h
cvs rdiff -u -r1.8.2.5 -r1.8.2.6 src/sys/arch/evbarm/awin/awin_machdep.c
cvs rdiff -u -r1.2.2.4 -r1.2.2.5 src/sys/arch/evbarm/conf/BPI
cvs rdiff -u -r1.12.2.2 -r1.12.2.3 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.19.2.2 -r1.19.2.3 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
cvs rdiff -u -r1.108 -r1.108.10.1 src/sys/dev/wscons/wsconsio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_board.c
diff -u src/sys/arch/arm/allwinner/awin_board.c:1.14.6.1 src/sys/arch/arm/allwinner/awin_board.c:1.14.6.2
--- src/sys/arch/arm/allwinner/awin_board.c:1.14.6.1 Sun Nov 9 14:42:33 2014
+++ src/sys/arch/arm/allwinner/awin_board.c Fri Nov 14 13:26:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_board.c,v 1.14.6.1 2014/11/09 14:42:33 martin Exp $ */
+/* $NetBSD: awin_board.c,v 1.14.6.2 2014/11/14 13:26:46 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.14.6.1 2014/11/09 14:42:33 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.14.6.2 2014/11/14 13:26:46 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -323,18 +323,25 @@ awin_pll6_enable(void)
*/
const uint32_t ocfg = bus_space_read_4(bst, bsh,
AWIN_CCM_OFFSET + AWIN_PLL6_CFG_REG);
- const u_int k = __SHIFTOUT(ocfg, AWIN_PLL_CFG_FACTOR_K);
/*
* Output freq is 24MHz * n * k / m / 6.
* To get to 100MHz, k & m must be equal and n must be 25.
*/
uint32_t ncfg = ocfg;
- ncfg &= ~(AWIN_PLL_CFG_FACTOR_M|AWIN_PLL_CFG_FACTOR_N);
ncfg &= ~(AWIN_PLL_CFG_BYPASS);
- ncfg |= __SHIFTIN(k, AWIN_PLL_CFG_FACTOR_M);
- ncfg |= __SHIFTIN(25, AWIN_PLL_CFG_FACTOR_N);
- ncfg |= AWIN_PLL_CFG_ENABLE | AWIN_PLL6_CFG_SATA_CLK_EN;
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ ncfg &= ~(AWIN_PLL_CFG_FACTOR_N|AWIN_PLL_CFG_FACTOR_K);
+ ncfg |= __SHIFTIN(1, AWIN_PLL_CFG_FACTOR_K);
+ ncfg |= __SHIFTIN(24, AWIN_PLL_CFG_FACTOR_N);
+ } else {
+ const u_int k = __SHIFTOUT(ocfg, AWIN_PLL_CFG_FACTOR_K);
+ ncfg &= ~(AWIN_PLL_CFG_FACTOR_M|AWIN_PLL_CFG_FACTOR_N);
+ ncfg |= __SHIFTIN(k, AWIN_PLL_CFG_FACTOR_M);
+ ncfg |= __SHIFTIN(25, AWIN_PLL_CFG_FACTOR_N);
+ ncfg |= AWIN_PLL6_CFG_SATA_CLK_EN;
+ }
+ ncfg |= AWIN_PLL_CFG_ENABLE;
if (ncfg != ocfg) {
bus_space_write_4(bst, bsh,
AWIN_CCM_OFFSET + AWIN_PLL6_CFG_REG, ncfg);
@@ -387,6 +394,44 @@ awin_pll2_enable(void)
}
void
+awin_pll3_enable(void)
+{
+ bus_space_tag_t bst = &awin_bs_tag;
+ bus_space_handle_t bsh = awin_core_bsh;
+
+ /*
+ * HDMI needs PLL3 to be 29700000 Hz
+ */
+ const uint32_t ocfg = bus_space_read_4(bst, bsh,
+ AWIN_CCM_OFFSET + AWIN_PLL3_CFG_REG);
+
+ uint32_t ncfg = ocfg;
+
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ ncfg &= ~AWIN_A31_PLL3_CFG_MODE;
+ ncfg &= ~AWIN_A31_PLL3_CFG_MODE_SEL;
+ ncfg |= AWIN_A31_PLL3_CFG_FRAC_CLK_OUT;
+ ncfg |= AWIN_PLL_CFG_ENABLE;
+ } else {
+ ncfg &= ~AWIN_PLL3_MODE_SEL;
+ ncfg |= AWIN_PLL3_FRAC_SET;
+ ncfg |= AWIN_PLL_CFG_ENABLE;
+ }
+
+ if (ncfg != ocfg) {
+ bus_space_write_4(bst, bsh,
+ AWIN_CCM_OFFSET + AWIN_PLL3_CFG_REG, ncfg);
+
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ do {
+ ncfg = bus_space_read_4(bst, bsh,
+ AWIN_CCM_OFFSET + AWIN_PLL3_CFG_REG);
+ } while ((ncfg & AWIN_A31_PLL3_CFG_LOCK) == 0);
+ }
+ }
+}
+
+void
awin_pll7_enable(void)
{
bus_space_tag_t bst = &awin_bs_tag;
@@ -401,6 +446,7 @@ awin_pll7_enable(void)
uint32_t ncfg = ocfg;
if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ ncfg &= ~AWIN_A31_PLL7_CFG_MODE;
ncfg &= ~AWIN_A31_PLL7_CFG_MODE_SEL;
ncfg |= AWIN_A31_PLL7_CFG_FRAC_CLK_OUT;
ncfg |= AWIN_PLL_CFG_ENABLE;
@@ -415,3 +461,88 @@ awin_pll7_enable(void)
AWIN_CCM_OFFSET + AWIN_PLL7_CFG_REG, ncfg);
}
}
+
+void
+awin_pll3_set_rate(uint32_t rate)
+{
+ bus_space_tag_t bst = &awin_bs_tag;
+ bus_space_handle_t bsh = awin_core_bsh;
+
+ const uint32_t ocfg = bus_space_read_4(bst, bsh,
+ AWIN_CCM_OFFSET + AWIN_PLL3_CFG_REG);
+
+ uint32_t ncfg = ocfg;
+ if (rate == 0) {
+ ncfg &= ~AWIN_PLL_CFG_ENABLE;
+ } else {
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ unsigned int m = 8;
+ unsigned int n = rate / (AWIN_REF_FREQ / m);
+ ncfg |= AWIN_A31_PLL3_CFG_MODE_SEL;
+ ncfg &= ~AWIN_A31_PLL3_CFG_FACTOR_N;
+ ncfg |= __SHIFTIN(n - 1, AWIN_A31_PLL3_CFG_FACTOR_N);
+ ncfg &= ~AWIN_A31_PLL3_CFG_PREDIV_M;
+ ncfg |= __SHIFTIN(m - 1, AWIN_A31_PLL3_CFG_PREDIV_M);
+ } else {
+ unsigned int m = rate / 3000000;
+ ncfg |= AWIN_PLL3_MODE_SEL;
+ ncfg &= ~AWIN_PLL3_FACTOR_M;
+ ncfg |= __SHIFTIN(m, AWIN_PLL3_FACTOR_M);
+ }
+ ncfg |= AWIN_PLL_CFG_ENABLE;
+ }
+
+ if (ncfg != ocfg) {
+ bus_space_write_4(bst, bsh,
+ AWIN_CCM_OFFSET + AWIN_PLL3_CFG_REG, ncfg);
+
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ do {
+ ncfg = bus_space_read_4(bst, bsh,
+ AWIN_CCM_OFFSET + AWIN_PLL3_CFG_REG);
+ } while ((ncfg & AWIN_A31_PLL3_CFG_LOCK) == 0);
+ }
+ }
+}
+
+uint32_t
+awin_pll5x_get_rate(void)
+{
+ bus_space_tag_t bst = &awin_bs_tag;
+ bus_space_handle_t bsh = awin_core_bsh;
+ unsigned int n, k, p;
+
+ KASSERT(awin_chip_id() != AWIN_CHIP_ID_A31);
+
+ const uint32_t cfg = bus_space_read_4(bst, bsh,
+ AWIN_CCM_OFFSET + AWIN_PLL5_CFG_REG);
+
+ n = __SHIFTOUT(cfg, AWIN_PLL_CFG_FACTOR_N);
+ k = __SHIFTOUT(cfg, AWIN_PLL_CFG_FACTOR_K);
+ p = __SHIFTOUT(cfg, AWIN_PLL5_OUT_EXT_DIV_P);
+
+ return (AWIN_REF_FREQ * n * k) >> p;
+}
+
+uint32_t
+awin_pll6_get_rate(void)
+{
+ bus_space_tag_t bst = &awin_bs_tag;
+ bus_space_handle_t bsh = awin_core_bsh;
+ unsigned int n, k, m;
+
+ const uint32_t cfg = bus_space_read_4(bst, bsh,
+ AWIN_CCM_OFFSET + AWIN_PLL6_CFG_REG);
+
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ n = __SHIFTOUT(cfg, AWIN_PLL_CFG_FACTOR_N) + 1;
+ k = __SHIFTOUT(cfg, AWIN_PLL_CFG_FACTOR_K) + 1;
+ m = 2;
+ } else {
+ n = __SHIFTOUT(cfg, AWIN_PLL_CFG_FACTOR_N);
+ k = __SHIFTOUT(cfg, AWIN_PLL_CFG_FACTOR_K) + 1;
+ m = __SHIFTOUT(cfg, AWIN_PLL_CFG_FACTOR_M) + 1;
+ }
+
+ return (AWIN_REF_FREQ * n * k) / m;
+}
Index: src/sys/arch/arm/allwinner/awin_hdmi.c
diff -u src/sys/arch/arm/allwinner/awin_hdmi.c:1.4.2.2 src/sys/arch/arm/allwinner/awin_hdmi.c:1.4.2.3
--- src/sys/arch/arm/allwinner/awin_hdmi.c:1.4.2.2 Sun Nov 9 14:42:33 2014
+++ src/sys/arch/arm/allwinner/awin_hdmi.c Fri Nov 14 13:26:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_hdmi.c,v 1.4.2.2 2014/11/09 14:42:33 martin Exp $ */
+/* $NetBSD: awin_hdmi.c,v 1.4.2.3 2014/11/14 13:26:46 martin Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -26,10 +26,13 @@
* SUCH DAMAGE.
*/
-#define AWIN_HDMI_PLL 7 /* PLL7 or PLL3 */
+#include "opt_allwinner.h"
+#include "opt_ddb.h"
+
+#define AWIN_HDMI_PLL 3 /* PLL7 or PLL3 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_hdmi.c,v 1.4.2.2 2014/11/09 14:42:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_hdmi.c,v 1.4.2.3 2014/11/14 13:26:46 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -71,8 +74,8 @@ struct awin_hdmi_softc {
#define HDMI_WRITE(sc, reg, val) \
bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val));
-#define HDMI_1_3_P(sc) ((sc)->sc_ver == 0x0103)
-#define HDMI_1_4_P(sc) ((sc)->sc_ver == 0x0104)
+#define HDMI_1_3_P(sc) ((sc)->sc_ver == 0x00010003)
+#define HDMI_1_4_P(sc) ((sc)->sc_ver == 0x00010004)
static int awin_hdmi_match(device_t, cfdata_t, void *);
static void awin_hdmi_attach(device_t, device_t, void *);
@@ -87,10 +90,20 @@ static int awin_hdmi_i2c_xfer(void *, i2
static int awin_hdmi_i2c_reset(struct awin_hdmi_softc *, int);
static void awin_hdmi_enable(struct awin_hdmi_softc *);
-static void awin_hdmi_connect(struct awin_hdmi_softc *);
static void awin_hdmi_read_edid(struct awin_hdmi_softc *);
+static void awin_hdmi_video_enable(struct awin_hdmi_softc *, bool);
+static void awin_hdmi_set_videomode(struct awin_hdmi_softc *,
+ const struct videomode *);
+static void awin_hdmi_set_audiomode(struct awin_hdmi_softc *,
+ const struct videomode *);
+static void awin_hdmi_hpd(struct awin_hdmi_softc *);
static void awin_hdmi_thread(void *);
+#if 0
static int awin_hdmi_intr(void *);
+#endif
+#if defined(DDB)
+void awin_hdmi_dump_regs(void);
+#endif
CFATTACH_DECL_NEW(awin_hdmi, sizeof(struct awin_hdmi_softc),
awin_hdmi_match, awin_hdmi_attach, NULL, NULL);
@@ -133,14 +146,17 @@ awin_hdmi_attach(device_t parent, device
AWIN_A31_AHB_RESET1_REG, AWIN_A31_AHB_RESET1_HDMI_RST, 0);
}
+#if AWIN_HDMI_PLL == 3
+ clk = __SHIFTIN(AWIN_HDMI_CLK_SRC_SEL_PLL3, AWIN_HDMI_CLK_SRC_SEL);
+#else
clk = __SHIFTIN(AWIN_HDMI_CLK_SRC_SEL_PLL7, AWIN_HDMI_CLK_SRC_SEL);
- clk |= __SHIFTIN(0, AWIN_HDMI_CLK_DIV_RATIO_M);
+#endif
clk |= AWIN_CLK_ENABLE;
if (awin_chip_id() == AWIN_CHIP_ID_A31) {
clk |= AWIN_A31_HDMI_CLK_DDC_GATING;
}
- bus_space_write_4(aio->aio_core_bst, aio->aio_ccm_bsh,
- AWIN_HDMI_CLK_REG, clk);
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_HDMI_CLK_REG, clk, AWIN_HDMI_CLK_SRC_SEL);
awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
AWIN_AHB_GATING1_REG, AWIN_AHB_GATING1_HDMI, 0);
@@ -153,12 +169,9 @@ awin_hdmi_attach(device_t parent, device
aprint_normal(": HDMI %d.%d\n", vmaj, vmin);
sc->sc_ver = ver;
- if (HDMI_1_3_P(sc)) {
- sc->sc_i2c_blklen = 1;
- } else {
- sc->sc_i2c_blklen = 16;
- }
+ sc->sc_i2c_blklen = 16;
+#if 0
sc->sc_ih = intr_establish(loc->loc_intr, IPL_SCHED, IST_LEVEL,
awin_hdmi_intr, sc);
if (sc->sc_ih == NULL) {
@@ -167,11 +180,16 @@ awin_hdmi_attach(device_t parent, device
return;
}
aprint_normal_dev(self, "interrupting on irq %d\n", loc->loc_intr);
+#endif
awin_hdmi_i2c_init(sc);
awin_hdmi_enable(sc);
+ delay(50000);
+
+ awin_hdmi_hpd(sc);
+
kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL, awin_hdmi_thread, sc,
&sc->sc_thread, "%s", device_xname(sc->sc_dev));
}
@@ -252,6 +270,13 @@ awin_hdmi_i2c_exec(void *priv, i2c_op_t
AWIN_A31_HDMI_DDC_FIFO_ACCESS_REG, pbuf, blklen);
}
+#ifdef AWIN_HDMI_DEBUG
+ printf("off=%d:", (int)off);
+ for (int i = 0; i < blklen; i++)
+ printf(" %02x", pbuf[i]);
+ printf("\n");
+#endif
+
pbuf += blklen;
off += blklen;
resid -= blklen;
@@ -300,7 +325,7 @@ awin_hdmi_i2c_xfer_1_3(void *priv, i2c_a
if (retry == 0)
return ETIMEDOUT;
- val = HDMI_READ(sc, AWIN_HDMI_DDC_FIFO_STATUS_REG);
+ val = HDMI_READ(sc, AWIN_HDMI_DDC_INT_STATUS_REG);
if ((val & AWIN_HDMI_DDC_INT_STATUS_TRANSFER_COMPLETE) == 0) {
device_printf(sc->sc_dev, "xfer failed, status=%08x\n", val);
return EIO;
@@ -340,7 +365,10 @@ awin_hdmi_i2c_xfer_1_4(void *priv, i2c_a
val = HDMI_READ(sc, AWIN_A31_HDMI_DDC_CTRL_REG);
if ((val & AWIN_A31_HDMI_DDC_CTRL_ACCESS_CMD_START) == 0)
break;
- kpause("hdmiddc", false, mstohz(10), &sc->sc_ic_lock);
+ if (cold)
+ delay(1000);
+ else
+ kpause("hdmiddc", false, mstohz(10), &sc->sc_ic_lock);
}
if (retry == 0)
return ETIMEDOUT;
@@ -380,7 +408,7 @@ awin_hdmi_i2c_reset(struct awin_hdmi_sof
HDMI_WRITE(sc, AWIN_HDMI_DDC_CTRL_REG,
AWIN_HDMI_DDC_CTRL_EN | AWIN_HDMI_DDC_CTRL_SW_RST);
- delay(10000);
+ delay(1000);
ctrl = HDMI_READ(sc, AWIN_HDMI_DDC_CTRL_REG);
if (ctrl & AWIN_HDMI_DDC_CTRL_SW_RST) {
@@ -417,102 +445,249 @@ awin_hdmi_enable(struct awin_hdmi_softc
{
HDMI_WRITE(sc, AWIN_HDMI_CTRL_REG, AWIN_HDMI_CTRL_MODULE_EN);
if (awin_chip_id() == AWIN_CHIP_ID_A20) {
- HDMI_WRITE(sc, AWIN_HDMI_PAD_CTRL0_REG,
- AWIN_HDMI_PAD_CTRL0_BIAS |
- AWIN_HDMI_PAD_CTRL0_LDOCEN |
- AWIN_HDMI_PAD_CTRL0_LD0DEN);
- }
-}
-
-static void
-awin_hdmi_connect(struct awin_hdmi_softc *sc)
-{
- HDMI_WRITE(sc, AWIN_HDMI_CTRL_REG, AWIN_HDMI_CTRL_MODULE_EN);
-
- HDMI_WRITE(sc, AWIN_HDMI_PLL_CTRL_REG,
- AWIN_HDMI_PLL_CTRL_PLL_EN |
- AWIN_HDMI_PLL_CTRL_BWS |
- AWIN_HDMI_PLL_CTRL_HV_IS_33 |
- AWIN_HDMI_PLL_CTRL_LDO1_EN |
- AWIN_HDMI_PLL_CTRL_LDO2_EN |
- AWIN_HDMI_PLL_CTRL_SDIV2 |
- __SHIFTIN(0x4, AWIN_HDMI_PLL_CTRL_VCO_GAIN) |
- __SHIFTIN(0x7, AWIN_HDMI_PLL_CTRL_S) |
- __SHIFTIN(0xf, AWIN_HDMI_PLL_CTRL_CP_S) |
- __SHIFTIN(0x7, AWIN_HDMI_PLL_CTRL_CS) |
- __SHIFTIN(0xf, AWIN_HDMI_PLL_CTRL_PREDIV) |
- __SHIFTIN(0x8, AWIN_HDMI_PLL_CTRL_VCO_S));
-
- HDMI_WRITE(sc, AWIN_HDMI_PAD_CTRL0_REG,
- AWIN_HDMI_PAD_CTRL0_BIAS |
- AWIN_HDMI_PAD_CTRL0_LDOCEN |
- AWIN_HDMI_PAD_CTRL0_LD0DEN |
- AWIN_HDMI_PAD_CTRL0_PWENC |
- AWIN_HDMI_PAD_CTRL0_PWEND |
- AWIN_HDMI_PAD_CTRL0_PWENG |
- AWIN_HDMI_PAD_CTRL0_CKEN |
- AWIN_HDMI_PAD_CTRL0_TXEN);
-
- HDMI_WRITE(sc, AWIN_HDMI_PAD_CTRL1_REG,
- AWIN_HDMI_PAD_CTRL1_AMP_OPT |
- AWIN_HDMI_PAD_CTRL1_AMPCK_OPT |
- AWIN_HDMI_PAD_CTRL1_EMP_OPT |
- AWIN_HDMI_PAD_CTRL1_EMPCK_OPT |
- AWIN_HDMI_PAD_CTRL1_REG_DEN |
- AWIN_HDMI_PAD_CTRL1_REG_DENCK |
- __SHIFTIN(0x2, AWIN_HDMI_PAD_CTRL1_REG_EMP) |
- __SHIFTIN(0x1, AWIN_HDMI_PAD_CTRL1_REG_CKSS) |
- __SHIFTIN(0x4, AWIN_HDMI_PAD_CTRL1_REG_AMP));
+ HDMI_WRITE(sc, AWIN_HDMI_PAD_CTRL0_REG, 0xfe800000);
+ HDMI_WRITE(sc, AWIN_HDMI_PAD_CTRL1_REG, 0x00d8c830);
+ } else if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ HDMI_WRITE(sc, AWIN_HDMI_PAD_CTRL0_REG, 0x7e80000f);
+ HDMI_WRITE(sc, AWIN_HDMI_PAD_CTRL1_REG, 0x01ded030);
+ }
+#if AWIN_HDMI_PLL == 7
+ HDMI_WRITE(sc, AWIN_HDMI_PLL_DBG0_REG, (1<<21));
+#elif AWIN_HDMI_PLL == 3
+ HDMI_WRITE(sc, AWIN_HDMI_PLL_DBG0_REG, (0<<21));
+#endif
- HDMI_WRITE(sc, AWIN_HDMI_PLL_DBG0_REG, 0);
+ delay(1000);
}
static void
awin_hdmi_read_edid(struct awin_hdmi_softc *sc)
{
+ const struct videomode *mode;
char edid[128];
struct edid_info ei;
int retry = 4;
+ memset(edid, 0, sizeof(edid));
+ memset(&ei, 0, sizeof(ei));
+
while (--retry > 0) {
if (ddc_read_edid(&sc->sc_ic, edid, sizeof(edid)) == 0)
break;
}
if (retry == 0) {
device_printf(sc->sc_dev, "failed to read EDID\n");
+ } else {
+ if (edid_parse(edid, &ei) != 0) {
+ device_printf(sc->sc_dev, "failed to parse EDID\n");
+ }
+#ifdef AWIN_HDMI_DEBUG
+ else {
+ edid_print(&ei);
+ }
+#endif
+ }
+
+ mode = ei.edid_preferred_mode;
+ if (mode == NULL)
+ mode = pick_mode_by_ref(640, 480, 60);
+
+ if (mode != NULL) {
+ awin_hdmi_video_enable(sc, false);
+ awin_tcon_enable(false);
+ delay(20000);
+
+ awin_debe_set_videomode(mode);
+ awin_tcon_set_videomode(mode);
+ awin_hdmi_set_videomode(sc, mode);
+ awin_hdmi_set_audiomode(sc, mode);
+ awin_debe_enable(true);
+ delay(20000);
+ awin_tcon_enable(true);
+ delay(20000);
+ awin_hdmi_video_enable(sc, true);
+ }
+}
+
+static void
+awin_hdmi_video_enable(struct awin_hdmi_softc *sc, bool enable)
+{
+ uint32_t val;
+
+ val = HDMI_READ(sc, AWIN_HDMI_VID_CTRL_REG);
+ val &= ~AWIN_HDMI_VID_CTRL_SRC_SEL;
+#ifdef AWIN_HDMI_CBGEN
+ val |= __SHIFTIN(AWIN_HDMI_VID_CTRL_SRC_SEL_CBGEN,
+ AWIN_HDMI_VID_CTRL_SRC_SEL);
+#else
+ val |= __SHIFTIN(AWIN_HDMI_VID_CTRL_SRC_SEL_RGB,
+ AWIN_HDMI_VID_CTRL_SRC_SEL);
+#endif
+ if (enable) {
+ val |= AWIN_HDMI_VID_CTRL_VIDEO_EN;
+ } else {
+ val &= ~AWIN_HDMI_VID_CTRL_VIDEO_EN;
+ }
+ HDMI_WRITE(sc, AWIN_HDMI_VID_CTRL_REG, val);
+
+#if defined(AWIN_HDMI_DEBUG) && defined(DDB)
+ awin_hdmi_dump_regs();
+#endif
+}
+
+static void
+awin_hdmi_set_videomode(struct awin_hdmi_softc *sc, const struct videomode *mode)
+{
+ uint32_t val;
+ const u_int dblscan_p = !!(mode->flags & VID_DBLSCAN);
+ const u_int interlace_p = !!(mode->flags & VID_INTERLACE);
+ const u_int phsync_p = !!(mode->flags & VID_PHSYNC);
+ const u_int pvsync_p = !!(mode->flags & VID_PVSYNC);
+ const u_int hfp = mode->hsync_start - mode->hdisplay;
+ const u_int hspw = mode->hsync_end - mode->hsync_start;
+ const u_int hbp = mode->htotal - mode->hsync_start;
+ const u_int vfp = mode->vsync_start - mode->vdisplay;
+ const u_int vspw = mode->vsync_end - mode->vsync_start;
+ const u_int vbp = mode->vtotal - mode->vsync_start;
+
+#ifdef AWIN_HDMI_DEBUG
+ device_printf(sc->sc_dev,
+ "dblscan %d, interlace %d, phsync %d, pvsync %d\n",
+ dblscan_p, interlace_p, phsync_p, pvsync_p);
+ device_printf(sc->sc_dev, "h: %u %u %u %u\n",
+ mode->hdisplay, hbp, hfp, hspw);
+ device_printf(sc->sc_dev, "v: %u %u %u %u\n",
+ mode->vdisplay, vbp, vfp, vspw);
+#endif
+
+ HDMI_WRITE(sc, AWIN_HDMI_INT_STATUS_REG, 0xffffffff);
+
+ u_int clk_div = awin_tcon_get_clk_div();
+ bool clk_dbl = awin_tcon_get_clk_dbl();
+
+#ifdef AWIN_HDMI_DEBUG
+ device_printf(sc->sc_dev, "dot_clock: %d\n", mode->dot_clock);
+ device_printf(sc->sc_dev, "clkdiv: %d\n", clk_div);
+ device_printf(sc->sc_dev, "clkdbl: %c\n", clk_dbl ? 'Y' : 'N');
+#endif
+
+ if (clk_div == 0) {
+ device_printf(sc->sc_dev, "ERROR: TCON clk not configured\n");
return;
}
- edid_parse(edid, &ei);
- edid_print(&ei);
+ uint32_t pll_ctrl, pad_ctrl0, pad_ctrl1;
+ if (HDMI_1_4_P(sc)) {
+ pad_ctrl0 = 0x7e8000ff;
+ pad_ctrl1 = 0x01ded030;
+ pll_ctrl = 0xba48a308;
+ pll_ctrl |= __SHIFTIN(clk_div-1, AWIN_HDMI_PLL_CTRL_PREDIV);
+ } else {
+ pad_ctrl0 = 0xfe800000;
+ pad_ctrl1 = 0x00d8c830;
+ pll_ctrl = 0xfa4ef708;
+ pll_ctrl |= __SHIFTIN(clk_div, AWIN_HDMI_PLL_CTRL_PREDIV);
+ }
+ if (clk_dbl == false)
+ pad_ctrl1 |= 0x40;
+
+ HDMI_WRITE(sc, AWIN_HDMI_PAD_CTRL0_REG, pad_ctrl0);
+ HDMI_WRITE(sc, AWIN_HDMI_PAD_CTRL1_REG, pad_ctrl1);
+ HDMI_WRITE(sc, AWIN_HDMI_PLL_CTRL_REG, pll_ctrl);
+#if AWIN_HDMI_PLL == 7
+ HDMI_WRITE(sc, AWIN_HDMI_PLL_DBG0_REG, (1<<21));
+#elif AWIN_HDMI_PLL == 3
+ HDMI_WRITE(sc, AWIN_HDMI_PLL_DBG0_REG, (0<<21));
+#endif
+
+ val = HDMI_READ(sc, AWIN_HDMI_VID_CTRL_REG);
+ val |= __SHIFTIN(AWIN_HDMI_VID_CTRL_HDMI_MODE_HDMI,
+ AWIN_HDMI_VID_CTRL_HDMI_MODE);
+ val &= ~AWIN_HDMI_VID_CTRL_OUTPUT_FMT;
+ if (dblscan_p) {
+ val |= __SHIFTIN(AWIN_HDMI_VID_CTRL_REPEATER_SEL_2X,
+ AWIN_HDMI_VID_CTRL_REPEATER_SEL);
+ }
+ if (interlace_p) {
+ val |= __SHIFTIN(AWIN_HDMI_VID_CTRL_OUTPUT_FMT_INTERLACE,
+ AWIN_HDMI_VID_CTRL_OUTPUT_FMT);
+ }
+ HDMI_WRITE(sc, AWIN_HDMI_VID_CTRL_REG, val);
+
+ val = __SHIFTIN((mode->hdisplay << dblscan_p) - 1,
+ AWIN_HDMI_VID_TIMING_0_ACT_H);
+ val |= __SHIFTIN(mode->vdisplay - 1,
+ AWIN_HDMI_VID_TIMING_0_ACT_V);
+ HDMI_WRITE(sc, AWIN_HDMI_VID_TIMING_0_REG, val);
+
+ val = __SHIFTIN((hbp << dblscan_p) - 1,
+ AWIN_HDMI_VID_TIMING_1_HBP);
+ val |= __SHIFTIN(vbp - 1,
+ AWIN_HDMI_VID_TIMING_1_VBP);
+ HDMI_WRITE(sc, AWIN_HDMI_VID_TIMING_1_REG, val);
+
+ val = __SHIFTIN((hfp << dblscan_p) - 1,
+ AWIN_HDMI_VID_TIMING_2_HFP);
+ val |= __SHIFTIN(vfp - 1,
+ AWIN_HDMI_VID_TIMING_2_VFP);
+ HDMI_WRITE(sc, AWIN_HDMI_VID_TIMING_2_REG, val);
+
+ val = __SHIFTIN((hspw << dblscan_p) - 1,
+ AWIN_HDMI_VID_TIMING_3_HSPW);
+ val |= __SHIFTIN(vspw - 1,
+ AWIN_HDMI_VID_TIMING_3_VSPW);
+ HDMI_WRITE(sc, AWIN_HDMI_VID_TIMING_3_REG, val);
+
+ val = 0;
+ if (phsync_p) {
+ val |= AWIN_HDMI_VID_TIMING_4_HSYNC_ACTIVE_SEL;
+ }
+ if (pvsync_p) {
+ val |= AWIN_HDMI_VID_TIMING_4_VSYNC_ACTIVE_SEL;
+ }
+ val |= __SHIFTIN(AWIN_HDMI_VID_TIMING_4_TX_CLOCK_NORMAL,
+ AWIN_HDMI_VID_TIMING_4_TX_CLOCK);
+ HDMI_WRITE(sc, AWIN_HDMI_VID_TIMING_4_REG, val);
}
static void
-awin_hdmi_thread(void *priv)
+awin_hdmi_set_audiomode(struct awin_hdmi_softc *sc, const struct videomode *mode)
{
- struct awin_hdmi_softc *sc = priv;
+ /* TODO */
+ HDMI_WRITE(sc, AWIN_HDMI_AUD_CTRL_REG, 0);
+}
- for (;;) {
- uint32_t hpd = HDMI_READ(sc, AWIN_HDMI_HPD_REG);
- bool con = !!(hpd & AWIN_HDMI_HPD_HOTPLUG_DET);
+static void
+awin_hdmi_hpd(struct awin_hdmi_softc *sc)
+{
+ uint32_t hpd = HDMI_READ(sc, AWIN_HDMI_HPD_REG);
+ bool con = !!(hpd & AWIN_HDMI_HPD_HOTPLUG_DET);
- if (sc->sc_connected == con)
- goto next;
+ if (sc->sc_connected == con)
+ return;
- sc->sc_connected = con;
- if (con) {
- device_printf(sc->sc_dev, "display connected\n");
- awin_hdmi_connect(sc);
- awin_hdmi_read_edid(sc);
- } else {
- device_printf(sc->sc_dev, "display disconnected\n");
- }
+ sc->sc_connected = con;
+ if (con) {
+ device_printf(sc->sc_dev, "display connected\n");
+ awin_hdmi_read_edid(sc);
+ } else {
+ device_printf(sc->sc_dev, "display disconnected\n");
+ awin_tcon_set_videomode(NULL);
+ }
+}
-next:
+static void
+awin_hdmi_thread(void *priv)
+{
+ struct awin_hdmi_softc *sc = priv;
+
+ for (;;) {
+ awin_hdmi_hpd(sc);
kpause("hdmihotplug", false, mstohz(1000), NULL);
}
}
+#if 0
static int
awin_hdmi_intr(void *priv)
{
@@ -529,3 +704,41 @@ awin_hdmi_intr(void *priv)
return 1;
}
+#endif
+
+#if defined(DDB)
+void
+awin_hdmi_dump_regs(void)
+{
+ static const struct {
+ const char *name;
+ uint16_t reg;
+ } regs[] = {
+ { "CTRL", AWIN_HDMI_CTRL_REG },
+ { "INT_STATUS", AWIN_HDMI_INT_STATUS_REG },
+ { "VID_CTRL", AWIN_HDMI_VID_CTRL_REG },
+ { "VID_TIMING_0", AWIN_HDMI_VID_TIMING_0_REG },
+ { "VID_TIMING_1", AWIN_HDMI_VID_TIMING_1_REG },
+ { "VID_TIMING_2", AWIN_HDMI_VID_TIMING_2_REG },
+ { "VID_TIMING_3", AWIN_HDMI_VID_TIMING_3_REG },
+ { "VID_TIMING_4", AWIN_HDMI_VID_TIMING_4_REG },
+ { "PAD_CTRL0", AWIN_HDMI_PAD_CTRL0_REG },
+ { "PAD_CTRL1", AWIN_HDMI_PAD_CTRL1_REG },
+ { "PLL_CTRL", AWIN_HDMI_PLL_CTRL_REG },
+ { "PLL_DBG0", AWIN_HDMI_PLL_DBG0_REG },
+ { "PLL_DBG1", AWIN_HDMI_PLL_DBG1_REG },
+ };
+ struct awin_hdmi_softc *sc;
+ device_t dev;
+
+ dev = device_find_by_driver_unit("awinhdmi", 0);
+ if (dev == NULL)
+ return;
+ sc = device_private(dev);
+
+ for (int i = 0; i < __arraycount(regs); i++) {
+ printf("%s: 0x%08x\n", regs[i].name,
+ HDMI_READ(sc, regs[i].reg));
+ }
+}
+#endif
Index: src/sys/arch/arm/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.8.10.1 src/sys/arch/arm/allwinner/awin_io.c:1.8.10.2
--- src/sys/arch/arm/allwinner/awin_io.c:1.8.10.1 Sun Nov 9 14:42:33 2014
+++ src/sys/arch/arm/allwinner/awin_io.c Fri Nov 14 13:26:46 2014
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.8.10.1 2014/11/09 14:42:33 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.8.10.2 2014/11/14 13:26:46 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -108,11 +108,15 @@ static const struct awin_locators awin_l
{ "com", OFFANDSIZE(UART6), 6, AWIN_IRQ_UART6, A10|A20 },
{ "com", OFFANDSIZE(UART7), 7, AWIN_IRQ_UART7, A10|A20 },
{ "com", OFFANDSIZE(UART0), 0, AWIN_A31_IRQ_UART0, A31 },
+ { "awindebe", AWIN_DE_BE0_OFFSET, 0x1000, 0, NOINTR, AANY },
+ { "awindebe", AWIN_DE_BE1_OFFSET, 0x1000, 1, NOINTR, AANY },
+ { "awintcon", OFFANDSIZE(LCD0), 0, NOINTR, AANY },
+ { "awintcon", OFFANDSIZE(LCD1), 1, NOINTR, AANY },
+ { "awinhdmi", OFFANDSIZE(HDMI), NOPORT, AWIN_IRQ_HDMI0, A20 },
+ { "awinhdmi", OFFANDSIZE(HDMI), NOPORT, AWIN_A31_IRQ_HDMI, A31 },
{ "awinwdt", OFFANDSIZE(TMR), NOPORT, NOINTR, AANY },
{ "awinrtc", OFFANDSIZE(TMR), NOPORT, NOINTR, A10|A20 },
{ "awinrtc", OFFANDSIZE(A31_RTC), NOPORT, NOINTR, A31 },
- { "awinhdmi", OFFANDSIZE(HDMI), NOPORT, AWIN_IRQ_HDMI0, A20 },
- { "awinhdmi", OFFANDSIZE(HDMI), NOPORT, AWIN_A31_IRQ_HDMI, A31 },
{ "awinusb", OFFANDSIZE(USB1), 0, NOINTR, A10|A20 },
{ "awinusb", OFFANDSIZE(USB2), 1, NOINTR, A10|A20 },
{ "awinusb", OFFANDSIZE(A31_USB1), 0, NOINTR, A31 },
Index: src/sys/arch/arm/allwinner/files.awin
diff -u src/sys/arch/arm/allwinner/files.awin:1.8.10.1 src/sys/arch/arm/allwinner/files.awin:1.8.10.2
--- src/sys/arch/arm/allwinner/files.awin:1.8.10.1 Sun Nov 9 14:42:33 2014
+++ src/sys/arch/arm/allwinner/files.awin Fri Nov 14 13:26:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.awin,v 1.8.10.1 2014/11/09 14:42:33 martin Exp $
+# $NetBSD: files.awin,v 1.8.10.2 2014/11/14 13:26:46 martin Exp $
#
# Configuration info for Allwinner ARM Peripherals
#
@@ -28,6 +28,10 @@ defflag opt_allwinner.h ALLWINNER_A20
defflag opt_allwinner.h ALLWINNER_A31
defflag opt_allwinner.h ALLWINNER_A80
defflag opt_allwinner.h AWIN_GPIO_IGNORE_FW
+defflag opt_allwinner.h AWIN_HDMI_DEBUG
+defflag opt_allwinner.h AWIN_TCON_DEBUG
+defflag opt_allwinner.h AWIN_DEBE_DEBUG
+defparam opt_allwinner.h AWIN_DEBE_VIDEOMEM
# SoC I/O attach point
device awinio { [port=-1] } : bus_space_generic
@@ -135,10 +139,24 @@ attach awinac at awinio with awin_ac
file arch/arm/allwinner/awin_ac.c awin_ac
# A10/A20/A31 HDMI
-device awinhdmi: edid, ddc_read_edid
+device awinhdmi: edid, ddc_read_edid, videomode
attach awinhdmi at awinio with awin_hdmi
file arch/arm/allwinner/awin_hdmi.c awin_hdmi
+# A10/A20/A31 LCD/TV timing controller (TCON)
+device awintcon
+attach awintcon at awinio with awin_tcon
+file arch/arm/allwinner/awin_tcon.c awin_tcon | awin_hdmi
+
+# A10/A20/A31 Display engine backend (DE-BE)
+device awindebe { }
+attach awindebe at awinio with awin_debe
+file arch/arm/allwinner/awin_debe.c awin_debe | awin_hdmi
+
+# Framebuffer
+attach genfb at awindebe with awin_fb: edid
+file arch/arm/allwinner/awin_fb.c awin_fb needs-flag
+
# A10/A20/A31 Consumer IR (CIR)
device awinir: irbus
attach awinir at awinio with awin_ir
Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.2 src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.3
--- src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.2 Sun Nov 9 14:42:33 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Fri Nov 14 13:26:46 2014
@@ -915,9 +915,9 @@ struct awin_mmc_idma_descriptor {
#define AWIN_USB_CLK_REG 0x00CC
#define AWIN_SPI3_CLK_REG 0x00D4
#define AWIN_DRAM_CLK_REG 0x0100
-#define AWIN_BE0_SCLK_CFG_REG 0x0100
-#define AWIN_BE0_SCLK_CFG_REG 0x0100
-#define AWIN_FE0_CLK_REG 0x0100
+#define AWIN_BE0_SCLK_CFG_REG 0x0104
+#define AWIN_BE1_SCLK_CFG_REG 0x0108
+#define AWIN_FE0_CLK_REG 0x010C
#define AWIN_FE1_CLK_REG 0x0110
#define AWIN_MP_CLK_REG 0x0114
#define AWIN_LCD0_CH0_CLK_REG 0x0118
@@ -967,6 +967,7 @@ struct awin_mmc_idma_descriptor {
#define AWIN_PLL3_FACTOR_M __BITS(6,0)
#define AWIN_PLL5_CFG_DDR_CLK_EN __BIT(29)
+#define AWIN_PLL5_OUT_EXT_DIV_P __BITS(17,16)
#define AWIN_PLL5_CFG_LDO_EN __BIT(7)
#define AWIN_PLL5_CFG_FACTOR_M1 __BITS(3,2)
@@ -1111,12 +1112,22 @@ struct awin_mmc_idma_descriptor {
#define AWIN_GMAC_CLK_TCS_EXT_125 1
#define AWIN_GMAC_CLK_TCS_INT_RGMII 2
+#define AWIN_BEx_CLK_SCLK_GATING __BIT(31)
+#define AWIN_BEx_CLK_RST __BIT(30)
+#define AWIN_BEx_CLK_SRC_SEL __BITS(25,24)
+#define AWIN_BEx_CLK_SRC_SEL_PLL3 0
+#define AWIN_BEx_CLK_SRC_SEL_PLL7 1
+#define AWIN_BEx_CLK_SRC_SEL_PLL5 2
+#define AWIN_BEx_CLK_DIV_RATIO_M __BITS(3,0)
+
#define AWIN_LCDx_CH0_CLK_LCDx_RST __BIT(30)
#define AWIN_LCDx_CHx_CLK_SRC_SEL __BITS(25,24)
#define AWIN_LCDx_CHx_CLK_SRC_SEL_PLL3 0
#define AWIN_LCDx_CHx_CLK_SRC_SEL_PLL7 1
#define AWIN_LCDx_CHx_CLK_SRC_SEL_PLL3_2X 2
#define AWIN_LCDx_CHx_CLK_SRC_SEL_PLL6_2 3
+#define AWIN_LCDx_CH1_SCLK1_GATING __BIT(15)
+#define AWIN_LCDx_CH1_SCLK1_SRC_SEL __BIT(11)
#define AWIN_LCDx_CH1_CLK_DIV_RATIO_M __BITS(3,0)
#define AWIN_HDMI_CLK_SRC_SEL __BITS(25,24)
@@ -1600,6 +1611,164 @@ struct awin_mmc_idma_descriptor {
#define AWIN_HSTMR_TMR3_CURNT_LO_REG 0x007c
#define AWIN_HSTMR_TMR3_CURNT_HI_REG 0x0080
+/* DEBE */
+#define AWIN_DEBE_MODCTL_REG 0x0800
+#define AWIN_DEBE_BACKCOLOR_REG 0x0804
+#define AWIN_DEBE_DISSIZE_REG 0x0808
+#define AWIN_DEBE_LAYSIZE_REG 0x0810
+#define AWIN_DEBE_LAYCOOR_REG 0x0820
+#define AWIN_DEBE_LAYLINEWIDTH_REG 0x0840
+#define AWIN_DEBE_LAYFB_L32ADD_REG 0x0850
+#define AWIN_DEBE_LAYFB_H4ADD_REG 0x0860
+#define AWIN_DEBE_REGBUFFCTL_REG 0x0870
+#define AWIN_DEBE_CKMAX_REG 0x0880
+#define AWIN_DEBE_CKMIN_REG 0x0884
+#define AWIN_DEBE_CKCFG_REG 0x0888
+#define AWIN_DEBE_ATTCTL0_REG 0x0890
+#define AWIN_DEBE_ATTCTL1_REG 0x08A0
+#define AWIN_DEBE_HWCCTL_REG 0x08D8
+#define AWIN_DEBE_HWCFBCTL_REG 0x08E0
+#define AWIN_DEBE_WBCTL_REG 0x08F0
+#define AWIN_DEBE_WBADD_REG 0x08F4
+#define AWIN_DEBE_WBLINEWIDTH_REG 0x08F8
+#define AWIN_DEBE_IYUVCTL_REG 0x0920
+#define AWIN_DEBE_IYUVADD_REG 0x0930
+#define AWIN_DEBE_IYUVLINEWIDTH_REG 0x0940
+#define AWIN_DEBE_YGCOEF_REG 0x0950
+#define AWIN_DEBE_YGCONS_REG 0x095C
+#define AWIN_DEBE_URCOEF_REG 0x0960
+#define AWIN_DEBE_URCONS_REG 0x096C
+#define AWIN_DEBE_VBCOEF_REG 0x0970
+#define AWIN_DEBE_VBCONS_REG 0x097C
+#define AWIN_DEBE_OCCTL_REG 0x09C0
+#define AWIN_DEBE_OCRCOEF_REG 0x09D0
+#define AWIN_DEBE_OCRCONS_REG 0x09DC
+#define AWIN_DEBE_OCGCOEF_REG 0x09E0
+#define AWIN_DEBE_OCGCONS_REG 0x09EC
+#define AWIN_DEBE_OCBCOEF_REG 0x09F0
+#define AWIN_DEBE_OCBCONS_REG 0x09FC
+
+#define AWIN_DEBE_MODCTL_LINE_SEL __BIT(29)
+#define AWIN_DEBE_MODCTL_ITLMOD_EN __BIT(28)
+#define AWIN_DEBE_MODCTL_OUT_SEL __BITS(22,20)
+#define AWIN_DEBE_MODCTL_OUT_SEL_LCD 0
+#define AWIN_DEBE_MODCTL_OUT_SEL_FE0 6
+#define AWIN_DEBE_MODCTL_OUT_SEL_FE1 7
+#define AWIN_DEBE_MODCTL_OSCA_EN __BIT(17)
+#define AWIN_DEBE_MODCTL_HWC_EN __BIT(16)
+#define AWIN_DEBE_MODCTL_LAY3_EN __BIT(11)
+#define AWIN_DEBE_MODCTL_LAY2_EN __BIT(10)
+#define AWIN_DEBE_MODCTL_LAY1_EN __BIT(9)
+#define AWIN_DEBE_MODCTL_LAY0_EN __BIT(8)
+#define AWIN_DEBE_MODCTL_START_CTL __BIT(1)
+#define AWIN_DEBE_MODCTL_EN __BIT(0)
+
+#define AWIN_DEBE_ATTCTL0_LAY_GLBALPHA __BITS(31,24)
+#define AWIN_DEBE_ATTCTL0_LAY_WORKMOD __BITS(23,22)
+#define AWIN_DEBE_ATTCTL0_PREMUL __BIT(21,20)
+#define AWIN_DEBE_ATTCTL0_CKEN __BITS(19,18)
+#define AWIN_DEBE_ATTCTL0_LAY_PIPESEL __BIT(15)
+#define AWIN_DEBE_ATTCTL0_LAY_PRISEL __BITS(11,10)
+#define AWIN_DEBE_ATTCTL0_LAY_VDOSEL __BIT(4)
+#define AWIN_DEBE_ATTCTL0_LAY_YUVEN __BIT(2)
+#define AWIN_DEBE_ATTCTL0_LAY_VDOEN __BIT(1)
+#define AWIN_DEBE_ATTCTL0_LAY_GLBALPHAEN __BIT(0)
+
+#define AWIN_DEBE_ATTCTL1_LAY_HSCAFCT __BITS(15,14)
+#define AWIN_DEBE_ATTCTL1_LAY_WSCAFCT __BITS(13,12)
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT __BITS(11,8)
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_MONO_1BPP 0
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_MONO_2BPP 1
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_MONO_4BPP 2
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_MONO_8BPP 3
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_RGB655 4
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_RGB565 5
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_RGB556 6
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_ARGB1555 7
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_RGBA5551 8
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_XRGB8888 9
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_ARGB8888 10
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_RGB888 11
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_ARGB4444 12
+#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_RGBA4444 13
+#define AWIN_DEBE_ATTCTL1_LAY_BRSWAPEN __BIT(2)
+#define AWIN_DEBE_ATTCTL1_LAY_FBPS __BITS(1,0)
+
+#define AWIN_DEBE_REGBUFFCTL_REGAUTOLOAD_DIS __BIT(1)
+#define AWIN_DEBE_REGBUFFCTL_REGLOADCTL __BIT(0)
+
+/* TCON */
+#define AWIN_TCON_GCTL_REG 0x0000
+#define AWIN_TCON_GINT0_REG 0x0004
+#define AWIN_TCON_GINT1_REG 0x0008
+#define AWIN_TCON0_FRM_CTL_REG 0x0010
+#define AWIN_TCON0_CTL_REG 0x0040
+#define AWIN_TCON0_DCLK_REG 0x0044
+#define AWIN_TCON0_BASIC0_REG 0x0048
+#define AWIN_TCON0_BASIC1_REG 0x004C
+#define AWIN_TCON0_BASIC2_REG 0x0050
+#define AWIN_TCON0_BASIC3_REG 0x0054
+#define AWIN_TCON0_HV_IF_REG 0x0058
+#define AWIN_TCON0_CPU_IF_REG 0x0060
+#define AWIN_TCON0_CPU_WR_REG 0x0064
+#define AWIN_TCON0_CPU_RD0_REG 0x0068
+#define AWIN_TCON0_CPU_RD1_REG 0x006C
+#define AWIN_TCON0_LVDS_IF_REG 0x0084
+#define AWIN_TCON0_IO_POL_REG 0x0088
+#define AWIN_TCON0_IO_TRI_REG 0x008C
+#define AWIN_TCON1_CTL_REG 0x0090
+#define AWIN_TCON1_BASIC0_REG 0x0094
+#define AWIN_TCON1_BASIC1_REG 0x0098
+#define AWIN_TCON1_BASIC2_REG 0x009C
+#define AWIN_TCON1_BASIC3_REG 0x00A0
+#define AWIN_TCON1_BASIC4_REG 0x00A4
+#define AWIN_TCON1_BASIC5_REG 0x00A8
+#define AWIN_TCON1_IO_POL_REG 0x00F0
+#define AWIN_TCON1_IO_TRI_REG 0x00F4
+#define AWIN_TCON_CEU_CTL_REG 0x0100
+#define AWIN_TCON0_CPU_TRI0_REG 0x0160
+#define AWIN_TCON0_CPU_TRI1_REG 0x0164
+#define AWIN_TCON0_CPU_TRI2_REG 0x0168
+#define AWIN_TCON0_CPU_TRI3_REG 0x016C
+#define AWIN_TCON_CMAP_CTL_REG 0x0180
+#define AWIN_TCON_CMAP_ODD0_REG 0x0190
+#define AWIN_TCON_CMAP_ODD1_REG 0x0194
+#define AWIN_TCON_CMAP_EVEN0_REG 0x0198
+#define AWIN_TCON_CMAP_EVEN1_REG 0x019C
+#define AWIN_TCON_MUX_CTL_REG 0x0200
+
+#define AWIN_TCON_GCTL_EN __BIT(31)
+#define AWIN_TCON_GCTL_GAMMA_EN __BIT(30)
+#define AWIN_TCON_GCTL_IO_MAP_SEL __BIT(0)
+#define AWIN_TCON_GCTL_IO_MAP_SEL_TCON0 0
+#define AWIN_TCON_GCTL_IO_MAP_SEL_TCON1 1
+
+#define AWIN_TCON_GINT1_TCON0_LINENO __BITS(27,16)
+#define AWIN_TCON_GINT1_TCON1_LINENO __BITS(11,0)
+
+#define AWIN_TCON_CTL_EN __BIT(31)
+#define AWIN_TCON_CTL_INTERLACE_EN __BIT(20)
+#define AWIN_TCON_CTL_START_DELAY __BITS(8,4)
+#define AWIN_TCON_CTL_SRC_SEL __BITS(1,0)
+#define AWIN_TCON_CTL_SRC_SEL_DE0 0
+#define AWIN_TCON_CTL_SRC_SEL_DE1 1
+#define AWIN_TCON_CTL_SRC_SEL_BLUEDATA 2
+
+#define AWIN_TCON_IO_POL_IO2_INV __BIT(26)
+#define AWIN_TCON_IO_POL_PVSYNC __BIT(25)
+#define AWIN_TCON_IO_POL_PHSYNC __BIT(24)
+
+#define AWIN_TCON_IO_TRI_IO3 __BIT(27)
+#define AWIN_TCON_IO_TRI_IO2 __BIT(26)
+#define AWIN_TCON_IO_TRI_IO1 __BIT(25)
+#define AWIN_TCON_IO_TRI_IO0 __BIT(24)
+#define AWIN_TCON_IO_TRI_DATA __BITS(23,0)
+
+#define AWIN_TCON_MUX_CTL_HDMI_OUTPUT_SRC __BITS(9,8)
+#define AWIN_TCON_MUX_CTL_HDMI_OUTPUT_SRC_LCDC0_TCON1 0
+#define AWIN_TCON_MUX_CTL_HDMI_OUTPUT_SRC_LCDC1_TCON1 1
+#define AWIN_TCON_MUX_CTL_HDMI_OUTPUT_SRC_CLOSE 2
+
/* HDMI */
#define AWIN_HDMI_VERSION_ID_REG 0x0000
#define AWIN_HDMI_CTRL_REG 0x0004
@@ -1817,6 +1986,7 @@ struct awin_mmc_idma_descriptor {
#define AWIN_A31_CPU_AXI_CFG_REG 0x0050
+#define AWIN_A31_PLL10_CFG_REG 0x0048
#define AWIN_A31_GMAC_CLK_REG 0x00D0
#define AWIN_A31_AHB_RESET0_REG 0x02C0
#define AWIN_A31_AHB_RESET1_REG 0x02C4
@@ -1836,6 +2006,14 @@ struct awin_mmc_idma_descriptor {
#define AWIN_A31_PLL2_CFG_FACTOR_N __BITS(14,8)
#define AWIN_A31_PLL2_CFG_PREVDIV_M __BITS(4,0)
+#define AWIN_A31_PLL3_CFG_MODE __BIT(30)
+#define AWIN_A31_PLL3_CFG_LOCK __BIT(28)
+#define AWIN_A31_PLL3_CFG_FRAC_CLK_OUT __BIT(25)
+#define AWIN_A31_PLL3_CFG_MODE_SEL __BIT(24)
+#define AWIN_A31_PLL3_CFG_SDM_EN __BIT(20)
+#define AWIN_A31_PLL3_CFG_FACTOR_N __BITS(14,8)
+#define AWIN_A31_PLL3_CFG_PREDIV_M __BITS(3,0)
+
#define AWIN_A31_PLL7_CFG_MODE __BIT(30)
#define AWIN_A31_PLL7_CFG_LOCK __BIT(28)
#define AWIN_A31_PLL7_CFG_FRAC_CLK_OUT __BIT(25)
@@ -1844,6 +2022,16 @@ struct awin_mmc_idma_descriptor {
#define AWIN_A31_PLL7_CFG_FACTOR_N __BITS(14,8)
#define AWIN_A31_PLL7_CFG_PREDIV_M __BITS(3,0)
+#define AWIN_A31_PLL10_CFG_MODE __BIT(30)
+#define AWIN_A31_PLL10_CFG_LOCK __BIT(28)
+#define AWIN_A31_PLL10_CFG_FRAC_CLK_OUT __BIT(25)
+#define AWIN_A31_PLL10_CFG_MODE_SEL __BIT(24)
+#define AWIN_A31_PLL10_CFG_SDM_EN __BIT(20)
+#define AWIN_A31_PLL10_CFG_FACTOR_N __BITS(14,8)
+#define AWIN_A31_PLL10_CFG_PREDIV_M __BITS(3,0)
+
+#define AWIN_A31_AHB_GATING0_USB_OHCI2 __BIT(31)
+#define AWIN_A31_AHB_GATING0_USB_OHCI1 __BIT(30)
#define AWIN_A31_AHB_GATING0_USB_OHCI2 __BIT(31)
#define AWIN_A31_AHB_GATING0_USB_OHCI1 __BIT(30)
#define AWIN_A31_AHB_GATING0_USB_OHCI0 __BIT(29)
@@ -2069,6 +2257,14 @@ struct awin_a31_dma_desc {
};
#endif
+#define AWIN_A31_BEx_CLK_SRC_SEL __BITS(26,24)
+#define AWIN_A31_BEx_CLK_SRC_SEL_PLL3 0
+#define AWIN_A31_BEx_CLK_SRC_SEL_PLL7 1
+#define AWIN_A31_BEx_CLK_SRC_SEL_PLL6_2X 2
+#define AWIN_A31_BEx_CLK_SRC_SEL_PLL8 3
+#define AWIN_A31_BEx_CLK_SRC_SEL_PLL9 4
+#define AWIN_A31_BEx_CLK_SRC_SEL_PLL10 5
+
#define AWIN_A31_HDMI_DDC_CTRL_REG 0x0500
#define AWIN_A31_HDMI_DDC_EXCTRL_REG 0x0504
#define AWIN_A31_HDMI_DDC_COMMAND_REG 0x0508
Index: src/sys/arch/arm/allwinner/awin_var.h
diff -u src/sys/arch/arm/allwinner/awin_var.h:1.10.2.1 src/sys/arch/arm/allwinner/awin_var.h:1.10.2.2
--- src/sys/arch/arm/allwinner/awin_var.h:1.10.2.1 Sun Nov 9 14:42:33 2014
+++ src/sys/arch/arm/allwinner/awin_var.h Fri Nov 14 13:26:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_var.h,v 1.10.2.1 2014/11/09 14:42:33 martin Exp $ */
+/* $NetBSD: awin_var.h,v 1.10.2.2 2014/11/14 13:26:46 martin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -62,6 +62,15 @@ struct awinio_attach_args {
bus_dma_tag_t aio_coherent_dmat;
};
+struct awinfb_attach_args {
+ void *afb_fb;
+ uint32_t afb_width;
+ uint32_t afb_height;
+ bus_dma_tag_t afb_dmat;
+ bus_dma_segment_t *afb_dmasegs;
+ int afb_ndmasegs;
+};
+
struct awin_gpio_pinset {
uint8_t pinset_group;
uint8_t pinset_func;
@@ -86,8 +95,12 @@ psize_t awin_memprobe(void);
void awin_bootstrap(vaddr_t, vaddr_t);
void awin_dma_bootstrap(psize_t);
void awin_pll2_enable(void);
+void awin_pll3_enable(void);
void awin_pll6_enable(void);
void awin_pll7_enable(void);
+void awin_pll3_set_rate(uint32_t);
+uint32_t awin_pll5x_get_rate(void);
+uint32_t awin_pll6_get_rate(void);
void awin_cpu_hatch(struct cpu_info *);
#define AWIN_CHIP_ID_A10 AWIN_SRAM_VER_KEY_A10
@@ -111,6 +124,16 @@ void awin_dma_set_config(void *, uint32_
int awin_dma_transfer(void *, paddr_t, paddr_t, size_t);
void awin_dma_halt(void *);
+struct videomode;
+unsigned int awin_tcon_get_clk_div(void);
+bool awin_tcon_get_clk_dbl(void);
+void awin_tcon_set_videomode(const struct videomode *);
+void awin_tcon_enable(bool);
+void awin_debe_set_videomode(const struct videomode *);
+void awin_debe_enable(bool);
+void awin_fb_set_videomode(device_t, const struct videomode *);
+void awin_fb_ddb_trap_callback(int);
+
void awin_wdog_reset(void);
void awin_tmr_cpu_init(struct cpu_info *);
Index: src/sys/arch/evbarm/awin/awin_machdep.c
diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.8.2.5 src/sys/arch/evbarm/awin/awin_machdep.c:1.8.2.6
--- src/sys/arch/evbarm/awin/awin_machdep.c:1.8.2.5 Tue Nov 11 12:48:59 2014
+++ src/sys/arch/evbarm/awin/awin_machdep.c Fri Nov 14 13:26:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_machdep.c,v 1.8.2.5 2014/11/11 12:48:59 martin Exp $ */
+/* $NetBSD: awin_machdep.c,v 1.8.2.6 2014/11/14 13:26:46 martin Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.8.2.5 2014/11/11 12:48:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.8.2.6 2014/11/14 13:26:46 martin Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -138,6 +138,7 @@ __KERNEL_RCSID(0, "$NetBSD: awin_machdep
#include "com.h"
#include "ukbd.h"
+#include "genfb.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -759,6 +760,24 @@ awin_device_register(device_t self, void
#endif
return;
}
+
+#if NGENFB > 0
+ if (device_is_a(self, "genfb")) {
+#ifdef DDB
+ db_trap_callback = awin_fb_ddb_trap_callback;
+#endif
+ char *ptr;
+ if (get_bootconf_option(boot_args, "console",
+ BOOTOPT_TYPE_STRING, &ptr) && strncmp(ptr, "fb", 2) == 0) {
+ prop_dictionary_set_bool(dict, "is_console", true);
+#if NUKBD > 0
+ ukbd_cnattach();
+#endif
+ } else {
+ prop_dictionary_set_bool(dict, "is_console", false);
+ }
+ }
+#endif
}
#ifdef AWIN_SYSCONFIG
Index: src/sys/arch/evbarm/conf/BPI
diff -u src/sys/arch/evbarm/conf/BPI:1.2.2.4 src/sys/arch/evbarm/conf/BPI:1.2.2.5
--- src/sys/arch/evbarm/conf/BPI:1.2.2.4 Wed Nov 12 19:54:46 2014
+++ src/sys/arch/evbarm/conf/BPI Fri Nov 14 13:26:46 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: BPI,v 1.2.2.4 2014/11/12 19:54:46 martin Exp $
+# $NetBSD: BPI,v 1.2.2.5 2014/11/14 13:26:46 martin Exp $
#
# BPI -- Banana Pi - an Allwinner A20 Eval Board Kernel
#
@@ -252,27 +252,30 @@ awincnt0 at awinio0
awinac0 at awinio0
audio0 at awinac0
-# onboard video
-#awinfb* at obio0 addr 0x48050000 size 0x10000
-#wsdisplay* at wsemuldisplaydev? console ?
-
-# various options for wscons - we try to look as much like a standard
-# sun console as possible
-#options WSEMUL_VT100 # sun terminal emulation
-#options WS_DEFAULT_FG=WSCOL_BLACK
-#options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
-#options WS_KERNEL_FG=WSCOL_GREEN
-#options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
-#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
-#options WSDISPLAY_COMPAT_SYSCONS # emulate some more ioctls
-#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
-#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
-#options WSDISPLAY_DEFAULTSCREENS=4
-#options FONT_QVSS8x15
-#options FONT_GALLANT12x22 # the console font
+# HDMI
+awinhdmi0 at awinio0
+
+# TCON
+awintcon0 at awinio0 port 0
+
+# DE-BE
+awindebe0 at awinio0 port 0
+
+# Framebuffer
+genfb0 at awindebe0
+wsdisplay* at genfb?
+options VCONS_DRAW_INTR
+options WSEMUL_VT100
+options WS_KERNEL_FG=WSCOL_GREEN
+options WS_KERNEL_BG=WSCOL_BLACK
+options WSDISPLAY_COMPAT_PCVT
+options WSDISPLAY_COMPAT_SYSCONS
+options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_RAWKBD
+options WSDISPLAY_DEFAULTSCREENS=4
-#pseudo-device wsmux # mouse & keyboard multiplexor
-#pseudo-device wsfont
+pseudo-device wsmux # mouse & keyboard multiplexor
+pseudo-device wsfont
# Power, Reset and Clock Management
#prcm* at awinio?
Index: src/sys/arch/evbarm/conf/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.12.2.2 src/sys/arch/evbarm/conf/CUBIEBOARD:1.12.2.3
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.12.2.2 Wed Nov 12 19:54:46 2014
+++ src/sys/arch/evbarm/conf/CUBIEBOARD Fri Nov 14 13:26:46 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: CUBIEBOARD,v 1.12.2.2 2014/11/12 19:54:46 martin Exp $
+# $NetBSD: CUBIEBOARD,v 1.12.2.3 2014/11/14 13:26:46 martin Exp $
#
# CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
#
@@ -247,27 +247,30 @@ awinrtc* at awinio?
awinac0 at awinio0
audio0 at awinac0
-# onboard video
-#awinfb* at obio0 addr 0x48050000 size 0x10000
-#wsdisplay* at wsemuldisplaydev? console ?
-
-# various options for wscons - we try to look as much like a standard
-# sun console as possible
-#options WSEMUL_VT100 # sun terminal emulation
-#options WS_DEFAULT_FG=WSCOL_BLACK
-#options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
-#options WS_KERNEL_FG=WSCOL_GREEN
-#options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
-#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
-#options WSDISPLAY_COMPAT_SYSCONS # emulate some more ioctls
-#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
-#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
-#options WSDISPLAY_DEFAULTSCREENS=4
-#options FONT_QVSS8x15
-#options FONT_GALLANT12x22 # the console font
+# HDMI
+awinhdmi0 at awinio0
-#pseudo-device wsmux # mouse & keyboard multiplexor
-#pseudo-device wsfont
+# TCON
+awintcon0 at awinio0 port 0
+
+# DE-BE
+awindebe0 at awinio0 port 0
+
+# Framebuffer
+genfb0 at awindebe0
+wsdisplay* at genfb?
+options VCONS_DRAW_INTR
+options WSEMUL_VT100
+options WS_KERNEL_FG=WSCOL_GREEN
+options WS_KERNEL_BG=WSCOL_BLACK
+options WSDISPLAY_COMPAT_PCVT
+options WSDISPLAY_COMPAT_SYSCONS
+options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_RAWKBD
+options WSDISPLAY_DEFAULTSCREENS=4
+
+pseudo-device wsmux # mouse & keyboard multiplexor
+pseudo-device wsfont
# Power, Reset and Clock Management
#prcm* at awinio?
Index: src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
diff -u src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.19.2.2 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.19.2.3
--- src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.19.2.2 Fri Nov 14 10:04:40 2014
+++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31 Fri Nov 14 13:26:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: HUMMINGBIRD_A31,v 1.19.2.2 2014/11/14 10:04:40 martin Exp $
+# $NetBSD: HUMMINGBIRD_A31,v 1.19.2.3 2014/11/14 13:26:46 martin Exp $
#
# HUMMINGBIRD_A31 - Merrii Hummingbird A31
#
@@ -237,6 +237,25 @@ audio0 at awinac0
# GMAC Ethernet
awge0 at awinio0 port ?
+# TCON
+awintcon0 at awinio0 port 0
+
+# DE-BE
+awindebe0 at awinio0 port 0
+
+# Framebuffer
+genfb0 at awindebe0
+wsdisplay* at genfb?
+options VCONS_DRAW_INTR
+options WSEMUL_VT100
+options WS_KERNEL_FG=WSCOL_GREEN
+options WS_KERNEL_BG=WSCOL_BLACK
+options WSDISPLAY_COMPAT_PCVT
+options WSDISPLAY_COMPAT_SYSCONS
+options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_RAWKBD
+options WSDISPLAY_DEFAULTSCREENS=4
+
# On-board USB
awinusb0 at awinio0 port 0
awinusb1 at awinio0 port 1
@@ -278,4 +297,8 @@ pseudo-device pty # pseudo-terminals
pseudo-device ksyms # /dev/ksyms
pseudo-device lockstat # lock profiling
+# wscons pseudo-devices
+pseudo-device wsmux # mouse & keyboard mux
+pseudo-device wsfont
+
cinclude "arch/evbarm/conf/HUMMINGBIRD_A31.local"
Index: src/sys/dev/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.108 src/sys/dev/wscons/wsconsio.h:1.108.10.1
--- src/sys/dev/wscons/wsconsio.h:1.108 Mon Apr 29 13:39:47 2013
+++ src/sys/dev/wscons/wsconsio.h Fri Nov 14 13:26:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.108 2013/04/29 13:39:47 kiyohara Exp $ */
+/* $NetBSD: wsconsio.h,v 1.108.10.1 2014/11/14 13:26:46 martin Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -334,6 +334,7 @@ struct wsmouse_repeat {
#define WSDISPLAY_TYPE_OMAP3 57 /* OMAP 3530 */
#define WSDISPLAY_TYPE_WINDERMERE 58 /* SoC for EPOC32 Series 5mx */
#define WSDISPLAY_TYPE_CLPS711X 59 /* CL PS-711x */
+#define WSDISPLAY_TYPE_ALLWINNER 60 /* Allwinner ARM SoC */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {
Added files:
Index: src/sys/arch/arm/allwinner/awin_debe.c
diff -u /dev/null src/sys/arch/arm/allwinner/awin_debe.c:1.6.2.2
--- /dev/null Fri Nov 14 13:26:47 2014
+++ src/sys/arch/arm/allwinner/awin_debe.c Fri Nov 14 13:26:46 2014
@@ -0,0 +1,344 @@
+/* $NetBSD: awin_debe.c,v 1.6.2.2 2014/11/14 13:26:46 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 Jared D. McNeill <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "opt_allwinner.h"
+#include "genfb.h"
+
+#ifndef AWIN_DEBE_VIDEOMEM
+#define AWIN_DEBE_VIDEOMEM (16 * 1024 * 1024)
+#endif
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.6.2.2 2014/11/14 13:26:46 martin Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+
+#include <arm/allwinner/awin_reg.h>
+#include <arm/allwinner/awin_var.h>
+
+#include <dev/videomode/videomode.h>
+
+struct awin_debe_softc {
+ device_t sc_dev;
+ device_t sc_fbdev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+ bus_space_handle_t sc_ccm_bsh;
+ bus_dma_tag_t sc_dmat;
+ unsigned int sc_port;
+
+ bus_dma_segment_t sc_dmasegs[1];
+ bus_size_t sc_dmasize;
+ bus_dmamap_t sc_dmamap;
+ void *sc_dmap;
+};
+
+#define DEBE_READ(sc, reg) \
+ bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
+#define DEBE_WRITE(sc, reg, val) \
+ bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
+
+static int awin_debe_match(device_t, cfdata_t, void *);
+static void awin_debe_attach(device_t, device_t, void *);
+
+static int awin_debe_alloc_videomem(struct awin_debe_softc *);
+static void awin_debe_setup_fbdev(struct awin_debe_softc *,
+ const struct videomode *);
+
+CFATTACH_DECL_NEW(awin_debe, sizeof(struct awin_debe_softc),
+ awin_debe_match, awin_debe_attach, NULL, NULL);
+
+static int
+awin_debe_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct awinio_attach_args * const aio = aux;
+ const struct awin_locators * const loc = &aio->aio_loc;
+
+ if (strcmp(cf->cf_name, loc->loc_name))
+ return 0;
+
+ return 1;
+}
+
+static void
+awin_debe_attach(device_t parent, device_t self, void *aux)
+{
+ struct awin_debe_softc *sc = device_private(self);
+ struct awinio_attach_args * const aio = aux;
+ const struct awin_locators * const loc = &aio->aio_loc;
+ int error;
+
+ sc->sc_dev = self;
+ sc->sc_bst = aio->aio_core_bst;
+ sc->sc_dmat = aio->aio_dmat;
+ sc->sc_port = loc->loc_port;
+ bus_space_subregion(sc->sc_bst, aio->aio_core_bsh,
+ loc->loc_offset, loc->loc_size, &sc->sc_bsh);
+ bus_space_subregion(sc->sc_bst, aio->aio_ccm_bsh, 0, 0x1000,
+ &sc->sc_ccm_bsh);
+
+ aprint_naive("\n");
+ aprint_normal(": Display Engine Backend (BE%d)\n", loc->loc_port);
+
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_A31_AHB_RESET1_REG,
+ AWIN_A31_AHB_RESET1_BE0_RST << loc->loc_port,
+ 0);
+ } else {
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_BE0_SCLK_CFG_REG + (loc->loc_port * 4),
+ AWIN_BEx_CLK_RST,
+ 0);
+ }
+
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ uint32_t pll6_freq = awin_pll6_get_rate() * 2;
+ unsigned int clk_div = (pll6_freq + 299999999) / 300000000;
+
+#ifdef AWIN_DEBE_DEBUG
+ device_printf(sc->sc_dev, "PLL6 @ %u Hz\n", pll6_freq);
+ device_printf(sc->sc_dev, "div %d\n", clk_div);
+#endif
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_BE0_SCLK_CFG_REG + (loc->loc_port * 4),
+ __SHIFTIN(AWIN_A31_BEx_CLK_SRC_SEL_PLL6_2X,
+ AWIN_A31_BEx_CLK_SRC_SEL) |
+ __SHIFTIN(clk_div - 1, AWIN_BEx_CLK_DIV_RATIO_M),
+ AWIN_A31_BEx_CLK_SRC_SEL | AWIN_BEx_CLK_DIV_RATIO_M);
+ } else {
+ uint32_t pll5x_freq = awin_pll5x_get_rate();
+ unsigned int clk_div = (pll5x_freq + 299999999) / 300000000;
+
+#ifdef AWIN_DEBE_DEBUG
+ device_printf(sc->sc_dev, "PLL5x @ %u Hz\n", pll5x_freq);
+ device_printf(sc->sc_dev, "div %d\n", clk_div);
+#endif
+
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_BE0_SCLK_CFG_REG + (loc->loc_port * 4),
+ __SHIFTIN(AWIN_BEx_CLK_SRC_SEL_PLL5, AWIN_BEx_CLK_SRC_SEL) |
+ __SHIFTIN(clk_div - 1, AWIN_BEx_CLK_DIV_RATIO_M),
+ AWIN_BEx_CLK_SRC_SEL | AWIN_BEx_CLK_DIV_RATIO_M);
+ }
+
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_AHB_GATING1_REG, AWIN_AHB_GATING1_DE_BE0 << loc->loc_port, 0);
+
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_DRAM_CLK_REG,
+ AWIN_DRAM_CLK_BE0_DCLK_ENABLE << loc->loc_port, 0);
+
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_BE0_SCLK_CFG_REG + (loc->loc_port * 4),
+ AWIN_CLK_ENABLE, 0);
+
+ for (unsigned int reg = 0x800; reg < 0x1000; reg += 4) {
+ DEBE_WRITE(sc, reg, 0);
+ }
+
+ DEBE_WRITE(sc, AWIN_DEBE_MODCTL_REG, AWIN_DEBE_MODCTL_EN);
+
+ error = awin_debe_alloc_videomem(sc);
+ if (error) {
+ aprint_error_dev(sc->sc_dev,
+ "couldn't allocate video memory, error = %d\n", error);
+ return;
+ }
+}
+
+static int
+awin_debe_alloc_videomem(struct awin_debe_softc *sc)
+{
+ int error, nsegs;
+
+ sc->sc_dmasize = AWIN_DEBE_VIDEOMEM;
+ error = bus_dmamem_alloc(sc->sc_dmat, sc->sc_dmasize, 0,
+ sc->sc_dmasize, sc->sc_dmasegs, 1, &nsegs, BUS_DMA_WAITOK);
+ if (error)
+ return error;
+ error = bus_dmamem_map(sc->sc_dmat, sc->sc_dmasegs, nsegs,
+ sc->sc_dmasize, &sc->sc_dmap, BUS_DMA_WAITOK | BUS_DMA_COHERENT);
+ if (error)
+ goto free;
+ error = bus_dmamap_create(sc->sc_dmat, sc->sc_dmasize, 1,
+ sc->sc_dmasize, 0, BUS_DMA_WAITOK, &sc->sc_dmamap);
+ if (error)
+ goto unmap;
+ error = bus_dmamap_load(sc->sc_dmat, sc->sc_dmamap, sc->sc_dmap,
+ sc->sc_dmasize, NULL, BUS_DMA_WAITOK);
+ if (error)
+ goto destroy;
+
+ return 0;
+
+destroy:
+ bus_dmamap_destroy(sc->sc_dmat, sc->sc_dmamap);
+unmap:
+ bus_dmamem_unmap(sc->sc_dmat, sc->sc_dmap, sc->sc_dmasize);
+free:
+ bus_dmamem_free(sc->sc_dmat, sc->sc_dmasegs, nsegs);
+
+ sc->sc_dmasize = 0;
+ sc->sc_dmap = NULL;
+
+ return error;
+}
+
+static void
+awin_debe_setup_fbdev(struct awin_debe_softc *sc, const struct videomode *mode)
+{
+ if (mode && sc->sc_fbdev == NULL) {
+ const u_int interlace_p = !!(mode->flags & VID_INTERLACE);
+ struct awinfb_attach_args afb = {
+ .afb_fb = sc->sc_dmap,
+ .afb_width = mode->hdisplay,
+ .afb_height = (mode->vdisplay << interlace_p),
+ .afb_dmat = sc->sc_dmat,
+ .afb_dmasegs = sc->sc_dmasegs,
+ .afb_ndmasegs = 1
+ };
+ sc->sc_fbdev = config_found_ia(sc->sc_dev, "awindebe",
+ &afb, NULL);
+ }
+#if NGENFB > 0
+ else if (sc->sc_fbdev != NULL) {
+ awin_fb_set_videomode(sc->sc_fbdev, mode);
+ }
+#endif
+}
+
+void
+awin_debe_enable(bool enable)
+{
+ struct awin_debe_softc *sc;
+ device_t dev;
+ uint32_t val;
+
+ dev = device_find_by_driver_unit("awindebe", 0);
+ if (dev == NULL) {
+ printf("DEBE: no driver found\n");
+ return;
+ }
+ sc = device_private(dev);
+
+ if (enable) {
+ val = DEBE_READ(sc, AWIN_DEBE_REGBUFFCTL_REG);
+ val |= AWIN_DEBE_REGBUFFCTL_REGLOADCTL;
+ DEBE_WRITE(sc, AWIN_DEBE_REGBUFFCTL_REG, val);
+
+ val = DEBE_READ(sc, AWIN_DEBE_MODCTL_REG);
+ val |= AWIN_DEBE_MODCTL_START_CTL;
+ DEBE_WRITE(sc, AWIN_DEBE_MODCTL_REG, val);
+ } else {
+ val = DEBE_READ(sc, AWIN_DEBE_MODCTL_REG);
+ val &= ~AWIN_DEBE_MODCTL_START_CTL;
+ DEBE_WRITE(sc, AWIN_DEBE_MODCTL_REG, val);
+ }
+}
+
+void
+awin_debe_set_videomode(const struct videomode *mode)
+{
+ struct awin_debe_softc *sc;
+ device_t dev;
+ uint32_t val;
+
+ dev = device_find_by_driver_unit("awindebe", 0);
+ if (dev == NULL) {
+ printf("DEBE: no driver found\n");
+ return;
+ }
+ sc = device_private(dev);
+
+ if (mode) {
+ const u_int interlace_p = !!(mode->flags & VID_INTERLACE);
+ const u_int width = mode->hdisplay;
+ const u_int height = (mode->vdisplay << interlace_p);
+ uint32_t vmem = width * height * 4;
+
+ if (vmem > sc->sc_dmasize) {
+ device_printf(sc->sc_dev,
+ "not enough memory for %ux%u fb (req %u have %u)\n",
+ width, height, vmem, (unsigned int)sc->sc_dmasize);
+ return;
+ }
+
+ paddr_t pa = sc->sc_dmamap->dm_segs[0].ds_addr;
+ /*
+ * On 2GB systems, we need to subtract AWIN_SDRAM_PBASE from
+ * the phys addr.
+ */
+ if (pa >= AWIN_SDRAM_PBASE)
+ pa -= AWIN_SDRAM_PBASE;
+
+ /* notify fb */
+ awin_debe_setup_fbdev(sc, mode);
+
+ DEBE_WRITE(sc, AWIN_DEBE_DISSIZE_REG,
+ ((height - 1) << 16) | (width - 1));
+ DEBE_WRITE(sc, AWIN_DEBE_LAYSIZE_REG,
+ ((height - 1) << 16) | (width - 1));
+ DEBE_WRITE(sc, AWIN_DEBE_LAYLINEWIDTH_REG, (width << 5));
+ DEBE_WRITE(sc, AWIN_DEBE_LAYFB_L32ADD_REG, pa << 3);
+ DEBE_WRITE(sc, AWIN_DEBE_LAYFB_H4ADD_REG, pa >> 29);
+
+ val = DEBE_READ(sc, AWIN_DEBE_ATTCTL1_REG);
+ val &= ~AWIN_DEBE_ATTCTL1_LAY_FBFMT;
+ val |= __SHIFTIN(AWIN_DEBE_ATTCTL1_LAY_FBFMT_XRGB8888,
+ AWIN_DEBE_ATTCTL1_LAY_FBFMT);
+ val &= ~AWIN_DEBE_ATTCTL1_LAY_BRSWAPEN;
+ val &= ~AWIN_DEBE_ATTCTL1_LAY_FBPS;
+ DEBE_WRITE(sc, AWIN_DEBE_ATTCTL1_REG, val);
+
+ val = DEBE_READ(sc, AWIN_DEBE_MODCTL_REG);
+ val |= AWIN_DEBE_MODCTL_LAY0_EN;
+ if (interlace_p) {
+ val |= AWIN_DEBE_MODCTL_ITLMOD_EN;
+ } else {
+ val &= ~AWIN_DEBE_MODCTL_ITLMOD_EN;
+ }
+ DEBE_WRITE(sc, AWIN_DEBE_MODCTL_REG, val);
+ } else {
+ /* disable */
+ val = DEBE_READ(sc, AWIN_DEBE_MODCTL_REG);
+ val &= ~AWIN_DEBE_MODCTL_LAY0_EN;
+ val &= ~AWIN_DEBE_MODCTL_START_CTL;
+ DEBE_WRITE(sc, AWIN_DEBE_MODCTL_REG, val);
+
+ /* notify fb */
+ awin_debe_setup_fbdev(sc, mode);
+ }
+}
Index: src/sys/arch/arm/allwinner/awin_fb.c
diff -u /dev/null src/sys/arch/arm/allwinner/awin_fb.c:1.4.2.2
--- /dev/null Fri Nov 14 13:26:47 2014
+++ src/sys/arch/arm/allwinner/awin_fb.c Fri Nov 14 13:26:46 2014
@@ -0,0 +1,200 @@
+/* $NetBSD: awin_fb.c,v 1.4.2.2 2014/11/14 13:26:46 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 Jared D. McNeill <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: awin_fb.c,v 1.4.2.2 2014/11/14 13:26:46 martin Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+
+#include <arm/allwinner/awin_reg.h>
+#include <arm/allwinner/awin_var.h>
+
+#include <dev/videomode/videomode.h>
+#include <dev/wsfb/genfbvar.h>
+
+struct awin_fb_softc {
+ struct genfb_softc sc_gen;
+
+ bus_dma_tag_t sc_dmat;
+ bus_dma_segment_t *sc_dmasegs;
+ int sc_ndmasegs;
+};
+
+static device_t awin_fb_consoledev = NULL;
+
+static int awin_fb_match(device_t, cfdata_t, void *);
+static void awin_fb_attach(device_t, device_t, void *);
+
+static int awin_fb_ioctl(void *, void *, u_long, void *, int, lwp_t *);
+static paddr_t awin_fb_mmap(void *, void *, off_t, int);
+static bool awin_fb_shutdown(device_t, int);
+
+CFATTACH_DECL_NEW(awin_fb, sizeof(struct awin_fb_softc),
+ awin_fb_match, awin_fb_attach, NULL, NULL);
+
+static int
+awin_fb_match(device_t parent, cfdata_t cf, void *aux)
+{
+ return 1;
+}
+
+static void
+awin_fb_attach(device_t parent, device_t self, void *aux)
+{
+ struct awin_fb_softc *sc = device_private(self);
+ struct awinfb_attach_args * const afb = aux;
+ prop_dictionary_t cfg = device_properties(self);
+ struct genfb_ops ops;
+
+ if (awin_fb_consoledev == NULL)
+ awin_fb_consoledev = self;
+
+ sc->sc_gen.sc_dev = self;
+ sc->sc_dmat = afb->afb_dmat;
+ sc->sc_dmasegs = afb->afb_dmasegs;
+ sc->sc_ndmasegs = afb->afb_ndmasegs;
+
+ prop_dictionary_set_uint32(cfg, "width", afb->afb_width);
+ prop_dictionary_set_uint32(cfg, "height", afb->afb_height);
+ prop_dictionary_set_uint8(cfg, "depth", 32);
+ prop_dictionary_set_uint16(cfg, "linebytes", afb->afb_width * 4);
+ prop_dictionary_set_uint32(cfg, "address", 0);
+ prop_dictionary_set_uint32(cfg, "virtual_address",
+ (uintptr_t)afb->afb_fb);
+
+ genfb_init(&sc->sc_gen);
+
+ if (sc->sc_gen.sc_width == 0 || sc->sc_gen.sc_fbsize == 0) {
+ aprint_normal(": disabled\n");
+ return;
+ }
+
+ pmf_device_register1(self, NULL, NULL, awin_fb_shutdown);
+
+ memset(&ops, 0, sizeof(ops));
+ ops.genfb_ioctl = awin_fb_ioctl;
+ ops.genfb_mmap = awin_fb_mmap;
+
+ aprint_naive("\n");
+
+ bool is_console = false;
+ prop_dictionary_get_bool(cfg, "is_console", &is_console);
+
+ if (is_console)
+ aprint_normal(": switching to framebuffer console\n");
+ else
+ aprint_normal("\n");
+
+ genfb_attach(&sc->sc_gen, &ops);
+}
+
+static int
+awin_fb_ioctl(void *v, void *vs, u_long cmd, void *data, int flag, lwp_t *l)
+{
+ struct awin_fb_softc *sc = v;
+ struct wsdisplayio_bus_id *busid;
+ struct wsdisplayio_fbinfo *fbi;
+ struct rasops_info *ri;
+ int error;
+
+ switch (cmd) {
+ case WSDISPLAYIO_GTYPE:
+ *(u_int *)data = WSDISPLAY_TYPE_ALLWINNER;
+ return 0;
+ case WSDISPLAYIO_GET_BUSID:
+ busid = data;
+ busid->bus_type = WSDISPLAYIO_BUS_SOC;
+ return 0;
+ case WSDISPLAYIO_GET_FBINFO:
+ fbi = data;
+ ri = &sc->sc_gen.vd.active->scr_ri;
+ error = wsdisplayio_get_fbinfo(ri, fbi);
+ if (error == 0)
+ fbi->fbi_flags |= WSFB_VRAM_IS_RAM;
+ return error;
+ default:
+ return EPASSTHROUGH;
+ }
+}
+
+static paddr_t
+awin_fb_mmap(void *v, void *vs, off_t off, int prot)
+{
+ struct awin_fb_softc *sc = v;
+
+ if (off < 0 || off >= sc->sc_gen.sc_fbsize)
+ return -1;
+
+ return bus_dmamem_mmap(sc->sc_dmat, sc->sc_dmasegs, sc->sc_ndmasegs,
+ off, prot, BUS_DMA_PREFETCHABLE);
+}
+
+static bool
+awin_fb_shutdown(device_t self, int flags)
+{
+ genfb_enable_polling(self);
+ return true;
+}
+
+void
+awin_fb_ddb_trap_callback(int where)
+{
+ if (awin_fb_consoledev == NULL)
+ return;
+
+ if (where) {
+ genfb_enable_polling(awin_fb_consoledev);
+ } else {
+ genfb_disable_polling(awin_fb_consoledev);
+ }
+}
+
+void
+awin_fb_set_videomode(device_t dev, const struct videomode *mode)
+{
+ struct awin_fb_softc *sc = device_private(dev);
+
+ if (mode == NULL)
+ return;
+
+ const u_int interlace_p = !!(mode->flags & VID_INTERLACE);
+ const u_int width = mode->hdisplay;
+ const u_int height = (mode->vdisplay << interlace_p);
+
+ if (sc->sc_gen.sc_width != width || sc->sc_gen.sc_height != height) {
+ device_printf(sc->sc_gen.sc_dev,
+ "mode switching not yet supported\n");
+ }
+}
Index: src/sys/arch/arm/allwinner/awin_tcon.c
diff -u /dev/null src/sys/arch/arm/allwinner/awin_tcon.c:1.5.2.2
--- /dev/null Fri Nov 14 13:26:47 2014
+++ src/sys/arch/arm/allwinner/awin_tcon.c Fri Nov 14 13:26:46 2014
@@ -0,0 +1,349 @@
+/* $NetBSD: awin_tcon.c,v 1.5.2.2 2014/11/14 13:26:46 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 Jared D. McNeill <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "opt_allwinner.h"
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: awin_tcon.c,v 1.5.2.2 2014/11/14 13:26:46 martin Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+
+#include <arm/allwinner/awin_reg.h>
+#include <arm/allwinner/awin_var.h>
+
+#include <dev/videomode/videomode.h>
+
+#define DIVIDE(x,y) (((x) + ((y) / 2)) / (y))
+
+struct awin_tcon_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+ bus_space_handle_t sc_ch1clk_bsh;
+ unsigned int sc_port;
+ unsigned int sc_clk_div;
+ bool sc_clk_dbl;
+};
+
+#define TCON_READ(sc, reg) \
+ bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
+#define TCON_WRITE(sc, reg, val) \
+ bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
+
+static int awin_tcon_match(device_t, cfdata_t, void *);
+static void awin_tcon_attach(device_t, device_t, void *);
+
+static void awin_tcon_set_pll(struct awin_tcon_softc *,
+ const struct videomode *);
+
+CFATTACH_DECL_NEW(awin_tcon, sizeof(struct awin_tcon_softc),
+ awin_tcon_match, awin_tcon_attach, NULL, NULL);
+
+static int
+awin_tcon_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct awinio_attach_args * const aio = aux;
+ const struct awin_locators * const loc = &aio->aio_loc;
+
+ if (strcmp(cf->cf_name, loc->loc_name))
+ return 0;
+
+ return 1;
+}
+
+static void
+awin_tcon_attach(device_t parent, device_t self, void *aux)
+{
+ struct awin_tcon_softc *sc = device_private(self);
+ struct awinio_attach_args * const aio = aux;
+ const struct awin_locators * const loc = &aio->aio_loc;
+
+ sc->sc_dev = self;
+ sc->sc_bst = aio->aio_core_bst;
+ sc->sc_port = loc->loc_port;
+ bus_space_subregion(sc->sc_bst, aio->aio_core_bsh,
+ loc->loc_offset, loc->loc_size, &sc->sc_bsh);
+ bus_space_subregion(sc->sc_bst, aio->aio_ccm_bsh,
+ AWIN_LCD0_CH1_CLK_REG + (loc->loc_port * 4), 4, &sc->sc_ch1clk_bsh);
+
+ aprint_naive("\n");
+ aprint_normal(": LCD/TV timing controller (TCON%d)\n", loc->loc_port);
+
+ awin_pll3_enable();
+
+ if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_A31_AHB_RESET1_REG,
+ AWIN_A31_AHB_RESET1_LCD0_RST << loc->loc_port,
+ 0);
+ } else {
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_LCD0_CH0_CLK_REG + (loc->loc_port * 4),
+ AWIN_LCDx_CH0_CLK_LCDx_RST, 0);
+ }
+
+ awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+ AWIN_AHB_GATING1_REG, AWIN_AHB_GATING1_LCD0 << loc->loc_port, 0);
+
+ TCON_WRITE(sc, AWIN_TCON_GCTL_REG, 0);
+ TCON_WRITE(sc, AWIN_TCON_GINT0_REG, 0);
+ TCON_WRITE(sc, AWIN_TCON_GINT1_REG,
+ __SHIFTIN(0x20, AWIN_TCON_GINT1_TCON1_LINENO));
+ TCON_WRITE(sc, AWIN_TCON0_DCLK_REG, 0xf0000000);
+ TCON_WRITE(sc, AWIN_TCON0_IO_TRI_REG, 0xffffffff);
+ TCON_WRITE(sc, AWIN_TCON1_IO_TRI_REG, 0xffffffff);
+}
+
+static void
+awin_tcon_calc_pll(int f_ref, int f_out, int *pm, int *pn)
+{
+ int best = 1000000;
+ for (int m = 1; m <= 15; m++) {
+ for (int n = 9; n <= 127; n++) {
+ int f_cur = (n * f_ref) / m;
+ int diff = f_out - f_cur;
+ if (diff > 0 && diff < best) {
+ best = diff;
+ *pm = m;
+ *pn = n;
+ }
+ }
+ }
+}
+
+static void
+awin_tcon_set_pll(struct awin_tcon_softc *sc, const struct videomode *mode)
+{
+ int n = 0, m = 0, n2 = 0, m2 = 0;
+ bool dbl = false;
+
+ awin_tcon_calc_pll(3000, mode->dot_clock, &m, &n);
+ awin_tcon_calc_pll(6000, mode->dot_clock, &m2, &n2);
+
+ int f_single = m ? (n * 3000) / m : 0;
+ int f_double = m2 ? (n2 * 6000) / m2 : 0;
+
+ if (f_double > f_single) {
+ dbl = true;
+ n = n2;
+ m = m2;
+ }
+
+ if (n == 0 || m == 0) {
+ device_printf(sc->sc_dev, "couldn't set pll to %d Hz\n",
+ mode->dot_clock * 1000);
+ sc->sc_clk_div = 0;
+ return;
+ }
+
+#ifdef AWIN_TCON_DEBUG
+ device_printf(sc->sc_dev, "pll n=%d m=%d dbl=%c freq=%d\n", n, m,
+ dbl ? 'Y' : 'N', n * 3000000);
+#endif
+
+ awin_pll3_set_rate(n * 3000000);
+
+ awin_reg_set_clear(sc->sc_bst, sc->sc_ch1clk_bsh, 0,
+ AWIN_CLK_OUT_ENABLE |
+ AWIN_LCDx_CH1_SCLK1_GATING |
+ __SHIFTIN(dbl ? AWIN_LCDx_CHx_CLK_SRC_SEL_PLL3_2X :
+ AWIN_LCDx_CHx_CLK_SRC_SEL_PLL3,
+ AWIN_LCDx_CHx_CLK_SRC_SEL) |
+ __SHIFTIN(m - 1, AWIN_LCDx_CH1_CLK_DIV_RATIO_M),
+ AWIN_LCDx_CH1_CLK_DIV_RATIO_M |
+ AWIN_LCDx_CHx_CLK_SRC_SEL |
+ AWIN_LCDx_CH1_SCLK1_SRC_SEL);
+
+ sc->sc_clk_div = m;
+ sc->sc_clk_dbl = dbl;
+}
+
+void
+awin_tcon_enable(bool enable)
+{
+ struct awin_tcon_softc *sc;
+ device_t dev;
+ uint32_t val;
+
+ dev = device_find_by_driver_unit("awintcon", 0);
+ if (dev == NULL) {
+ printf("TCON: no driver found\n");
+ return;
+ }
+ sc = device_private(dev);
+
+ val = TCON_READ(sc, AWIN_TCON_GCTL_REG);
+ if (enable) {
+ val |= AWIN_TCON_GCTL_EN;
+ } else {
+ val &= ~AWIN_TCON_GCTL_EN;
+ }
+ TCON_WRITE(sc, AWIN_TCON_GCTL_REG, val);
+
+ val = TCON_READ(sc, AWIN_TCON1_IO_TRI_REG);
+ if (enable) {
+ val &= ~0x03000000;
+ } else {
+ val |= 0x03000000;
+ }
+ TCON_WRITE(sc, AWIN_TCON1_IO_TRI_REG, val);
+}
+
+void
+awin_tcon_set_videomode(const struct videomode *mode)
+{
+ struct awin_tcon_softc *sc;
+ device_t dev;
+ uint32_t val;
+
+ dev = device_find_by_driver_unit("awintcon", 0);
+ if (dev == NULL) {
+ printf("TCON: no driver found\n");
+ return;
+ }
+ sc = device_private(dev);
+
+ if (mode) {
+ const u_int interlace_p = !!(mode->flags & VID_INTERLACE);
+ const u_int phsync_p = !!(mode->flags & VID_PHSYNC);
+ const u_int pvsync_p = !!(mode->flags & VID_PVSYNC);
+ const u_int hspw = mode->hsync_end - mode->hsync_start;
+ const u_int hbp = mode->htotal - mode->hsync_start;
+ const u_int vspw = mode->vsync_end - mode->vsync_start;
+ const u_int vbp = mode->vtotal - mode->vsync_start;
+ const u_int vblank_len =
+ ((mode->vtotal << interlace_p) >> 1) - mode->vdisplay - 2;
+ const u_int start_delay =
+ vblank_len >= 32 ? 30 : vblank_len - 2;
+
+ val = TCON_READ(sc, AWIN_TCON_GCTL_REG);
+ val |= AWIN_TCON_GCTL_IO_MAP_SEL;
+ TCON_WRITE(sc, AWIN_TCON_GCTL_REG, val);
+
+ /* enable */
+ val = AWIN_TCON_CTL_EN;
+ if (interlace_p)
+ val |= AWIN_TCON_CTL_INTERLACE_EN;
+ val |= __SHIFTIN(start_delay, AWIN_TCON_CTL_START_DELAY);
+#ifdef AWIN_TCON_BLUEDATA
+ val |= __SHIFTIN(AWIN_TCON_CTL_SRC_SEL_BLUEDATA,
+ AWIN_TCON_CTL_SRC_SEL);
+#else
+ val |= __SHIFTIN(AWIN_TCON_CTL_SRC_SEL_DE0,
+ AWIN_TCON_CTL_SRC_SEL);
+#endif
+ TCON_WRITE(sc, AWIN_TCON1_CTL_REG, val);
+
+ /* Source width/height */
+ TCON_WRITE(sc, AWIN_TCON1_BASIC0_REG,
+ ((mode->hdisplay - 1) << 16) | (mode->vdisplay - 1));
+ /* Scaler width/height */
+ TCON_WRITE(sc, AWIN_TCON1_BASIC1_REG,
+ ((mode->hdisplay - 1) << 16) | (mode->vdisplay - 1));
+ /* Output width/height */
+ TCON_WRITE(sc, AWIN_TCON1_BASIC2_REG,
+ ((mode->hdisplay - 1) << 16) | (mode->vdisplay - 1));
+ /* Horizontal total + back porch */
+ TCON_WRITE(sc, AWIN_TCON1_BASIC3_REG,
+ ((mode->htotal - 1) << 16) | (hbp - 1));
+ /* Vertical total + back porch */
+ u_int vtotal = mode->vtotal * 2;
+ if (interlace_p) {
+ u_int framerate =
+ DIVIDE(DIVIDE(mode->dot_clock * 1000, mode->htotal),
+ mode->vtotal);
+ u_int clk = mode->htotal * (mode->vtotal * 2 + 1) *
+ framerate;
+ if ((clk / 2) == mode->dot_clock * 1000)
+ vtotal += 1;
+ }
+ TCON_WRITE(sc, AWIN_TCON1_BASIC4_REG,
+ (vtotal << 16) | (vbp - 1));
+
+ /* Sync */
+ TCON_WRITE(sc, AWIN_TCON1_BASIC5_REG,
+ ((hspw - 1) << 16) | (vspw - 1));
+ /* Polarity */
+ val = AWIN_TCON_IO_POL_IO2_INV;
+ if (phsync_p)
+ val |= AWIN_TCON_IO_POL_PHSYNC;
+ if (pvsync_p)
+ val |= AWIN_TCON_IO_POL_PVSYNC;
+ TCON_WRITE(sc, AWIN_TCON1_IO_POL_REG, val);
+
+ TCON_WRITE(sc, AWIN_TCON_GINT1_REG,
+ __SHIFTIN(start_delay + 2, AWIN_TCON_GINT1_TCON1_LINENO));
+
+ /* Setup LCDx CH1 PLL */
+ awin_tcon_set_pll(sc, mode);
+ } else {
+ /* disable */
+ val = TCON_READ(sc, AWIN_TCON1_CTL_REG);
+ val &= ~AWIN_TCON_CTL_EN;
+ TCON_WRITE(sc, AWIN_TCON1_CTL_REG, val);
+ }
+}
+
+unsigned int
+awin_tcon_get_clk_div(void)
+{
+ struct awin_tcon_softc *sc;
+ device_t dev;
+
+ dev = device_find_by_driver_unit("awintcon", 0);
+ if (dev == NULL) {
+ printf("TCON: no driver found\n");
+ return 0;
+ }
+ sc = device_private(dev);
+
+ return sc->sc_clk_div;
+}
+
+bool
+awin_tcon_get_clk_dbl(void)
+{
+ struct awin_tcon_softc *sc;
+ device_t dev;
+
+ dev = device_find_by_driver_unit("awintcon", 0);
+ if (dev == NULL) {
+ printf("TCON: no driver found\n");
+ return 0;
+ }
+ sc = device_private(dev);
+
+ return sc->sc_clk_dbl;
+}
