OMAP3 pandora: pin mux updates
cover OMAP3 pandora: pin mux updates
This patch series clean up and update pin mux for pandora. The update is needed for rev3 or later boards to work properly, but older boards still work after this.
Grazvydas Ignotas (4):
OMAP3 pandora: pin mux cleanup
OMAP3 pandora: setup pin mux for pins used on rev3 boards OMAP3 pandora: setup pulls for various GPIOs OMAP3 pandora: Fix CKE1 MUX setting to allow self-refresh
board/omap3/pandora/pandora.h | 86 +++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 51 deletions(-)
PATCH 1/4 OMAP3 pandora: pin mux cleanup
Remove configuration of not unused pins, effectively leaving them in safe mode.
--- board/omap3/pandora/pandora.h | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-)
board/omap3/pandora/pandora.h +0 -25
@@ -107,15 +107,6 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(GPMC_D15), (IEN | PTD | DIS | M0)) /*GPMC_D15*/\ MUX_VAL(CP(GPMC_NCS0), (IDIS | PTU | EN | M0)) /*GPMC_nCS0*/\ MUX_VAL(CP(GPMC_NCS1), (IDIS | PTU | EN | M0)) /*GPMC_nCS1*/\ - MUX_VAL(CP(GPMC_NCS2), (IDIS | PTU | EN | M0)) /*GPMC_nCS2*/\ - MUX_VAL(CP(GPMC_NCS3), (IDIS | PTU | EN | M0)) /*GPMC_nCS3*/\ - MUX_VAL(CP(GPMC_NCS4), (IDIS | PTU | EN | M0))\ - MUX_VAL(CP(GPMC_NCS5), (IDIS | PTD | DIS | M0))\ - MUX_VAL(CP(GPMC_NCS6), (IEN | PTD | DIS | M1))\ - MUX_VAL(CP(GPMC_NCS7), (IEN | PTU | EN | M1))\ - MUX_VAL(CP(GPMC_NBE1), (IEN | PTD | DIS | M0))\ - MUX_VAL(CP(GPMC_WAIT2), (IEN | PTU | EN | M0))\ - MUX_VAL(CP(GPMC_WAIT3), (IEN | PTU | EN | M0))\ MUX_VAL(CP(GPMC_CLK), (IDIS | PTD | DIS | M0)) /*GPMC_CLK*/\ MUX_VAL(CP(GPMC_NADV_ALE), (IDIS | PTD | DIS | M0)) /*GPMC_nADV_ALE*/\MUX_VAL (CP (GPMC_NOE ), (IDIS |PTD |DIS |M0 ))/*GPMC_nOE*/ \
@@ -254,16 +245,10 @@ const omap3_sysinfo sysinfo = {MUX_VAL (CP (CAM_WEN ), (IEN |PTU |DIS |M4 ))/*GPIO_167*/ \/* - nIRQ_NUB2*/ \ /*Various other stuff*/\ -MUX_VAL (CP (CAM_VS ), (IEN |PTU |DIS |M4 ))/*GPIO_95*/ \ - /* - nTOUCH_BUSY*/\MUX_VAL (CP (UART3_CTS_RCTX ), (IEN |PTD |DIS |M4 ))/*GPIO_163*/ \ /* - nOC_USB5*/\ -MUX_VAL (CP (MCBSP1_CLKX ), (IDIS |PTD |DIS |M4 ))/*GPIO_162*/ \ - /* - START_ADC*/\MUX_VAL (CP (ETK_D8_ES2 ), (IEN |PTD |DIS |M4 ))/*GPIO_22*/ \/* - MSECURE*/ \ -MUX_VAL (CP (CAM_STROBE ), (IEN |PTU |DIS |M4 ))/*GPIO_126*/ \ -/* - HP_DETECT*/ \ /*External Resets and Enables*/\MUX_VAL (CP (ETK_D0_ES2 ), (IDIS |PTD |DIS |M4 ))/*GPIO_14*/ \/* - nHDPHN_SHUTDOWN*/ \
@@ -277,14 +262,6 @@ const omap3_sysinfo sysinfo = {/* - RESET_NUBS*/ \MUX_VAL (CP (UART3_RTS_SD ), (IDIS |PTU |EN |M4 ))/*GPIO_164*/ \/* - EN_USB_5V*/ \ - /*Unused*/\ - MUX_VAL(CP(HDQ_SIO), (IEN | PTU | EN | M0)) /*HDQ_SIO - NC*/\ - MUX_VAL(CP(CSI2_DX0), (IEN | PTD | DIS | M0)) /*CSI2_DX0 - NC*/\ - MUX_VAL(CP(CSI2_DY0), (IEN | PTD | DIS | M0)) /*CSI2_DY0 - NC*/\ - MUX_VAL(CP(CSI2_DX1), (IEN | PTD | DIS | M0)) /*CSI2_DX1 - NC*/\ - MUX_VAL(CP(CSI2_DY1), (IEN | PTD | DIS | M0)) /*CSI2_DY1 - NC*/\ - MUX_VAL(CP(I2C2_SCL), (IEN | PTU | EN | M0)) /*I2C2_SCL - NC*/\ -MUX_VAL (CP (I2C2_SDA ), (IEN |PTU |EN |M0 ))/*I2C2_SDA - NC*/ \ /*HS USB OTG Port (connects to HSUSB0)*/\ MUX_VAL(CP(HSUSB0_CLK), (IEN | PTD | DIS | M0)) /*HSUSB0_CLK*/\MUX_VAL (CP (HSUSB0_STP ), (IDIS |PTU |EN |M0 ))/*HSUSB0_STP*/ \
@@ -338,8 +315,6 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(SYS_BOOT5), (IEN | PTD | DIS | M4)) /*GPIO_7*/\ MUX_VAL(CP(SYS_BOOT6), (IEN | PTD | DIS | M4)) /*GPIO_8*/\MUX_VAL (CP (SYS_OFF_MODE ), (IEN |PTD |DIS |M0 ))/*SYS_OFF_MODE*/ \ - MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M4)) /*SYS_CLKOUT1 - NC*/\ -MUX_VAL (CP (SYS_CLKOUT2 ), (IEN |PTD |DIS |M4 ))/*SYS_CLKOUT2 - NC*/ \ /*JTAG*/\ MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) /*JTAG_nTRST*/\MUX_VAL (CP (JTAG_TCK ), (IEN |PTD |DIS |M0 ))/*JTAG_TCK*/ \
Signature · 1 line
1.5.6.3
PATCH 2/4 OMAP3 pandora: setup pin mux for pins used on rev3 boards
Setup pin mux for GPIO pins connected on rev3 or later boards. Also change NUB2 IRQ pin. This should not affect older boards because they don't have any nubs (analog controllers) attached to them.
--- board/omap3/pandora/pandora.h | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
board/omap3/pandora/pandora.h +10 -1
@@ -242,13 +242,15 @@ const omap3_sysinfo sysinfo = {/* - WIFI_IRQ*/ \MUX_VAL (CP (MCBSP1_FSX ), (IEN |PTD |DIS |M4 ))/*GPIO_161*/ \ /* - nIRQ_NUB1*/\ -MUX_VAL (CP (CAM_WEN ), (IEN |PTU |DIS |M4 ))/*GPIO_167*/ \ +MUX_VAL (CP (MCBSP1_CLKX ), (IEN |PTU |DIS |M4 ))/*GPIO_162*/ \/* - nIRQ_NUB2*/ \ /*Various other stuff*/\MUX_VAL (CP (UART3_CTS_RCTX ), (IEN |PTD |DIS |M4 ))/*GPIO_163*/ \ /* - nOC_USB5*/\MUX_VAL (CP (ETK_D8_ES2 ), (IEN |PTD |DIS |M4 ))/*GPIO_22*/ \ /* - MSECURE*/\ +MUX_VAL (CP (CSI2_DY1 ), (IEN |PTD |DIS |M4 ))/*GPIO_115*/ \ +/* - POP_OVERHEAT*/ \ /*External Resets and Enables*/\MUX_VAL (CP (ETK_D0_ES2 ), (IDIS |PTD |DIS |M4 ))/*GPIO_14*/ \/* - nHDPHN_SHUTDOWN*/ \
@@ -262,6 +264,13 @@ const omap3_sysinfo sysinfo = {/* - RESET_NUBS*/ \MUX_VAL (CP (UART3_RTS_SD ), (IDIS |PTU |EN |M4 ))/*GPIO_164*/ \/* - EN_USB_5V*/ \ + /*Spare GPIOs*/\ + MUX_VAL(CP(GPMC_NCS7), (IEN | PTD | EN | M4)) /*GPIO_58*/\ + MUX_VAL(CP(GPMC_WAIT2), (IEN | PTD | EN | M4)) /*GPIO_64*/\ + MUX_VAL(CP(GPMC_WAIT3), (IEN | PTD | EN | M4)) /*GPIO_65*/\ + MUX_VAL(CP(CAM_VS), (IEN | PTU | EN | M4)) /*GPIO_95*/\ + MUX_VAL(CP(CAM_WEN), (IEN | PTD | EN | M4)) /*GPIO_167*/\ +MUX_VAL (CP (HDQ_SIO ), (IEN |PTD |EN |M4 ))/*GPIO_170*/ \ /*HS USB OTG Port (connects to HSUSB0)*/\ MUX_VAL(CP(HSUSB0_CLK), (IEN | PTD | DIS | M0)) /*HSUSB0_CLK*/\MUX_VAL (CP (HSUSB0_STP ), (IDIS |PTU |EN |M0 ))/*HSUSB0_STP*/ \
Signature · 1 line
1.5.6.3
PATCH 3/4 OMAP3 pandora: setup pulls for various GPIOs
Set pullups or pulldowns for GPIOs which need them. Disable them for others, which have external pulls. Also make disabled pull setting consistent (some pins had type set to "up" even if pull type selection was disabled).
--- board/omap3/pandora/pandora.h | 50 ++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 25 deletions(-)
board/omap3/pandora/pandora.h +25 -25
@@ -145,26 +145,26 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(DSS_DATA22), (IDIS | PTD | DIS | M0)) /*DSS_DATA22*/\MUX_VAL (CP (DSS_DATA23 ), (IDIS |PTD |DIS |M0 ))/*DSS_DATA23*/ \ /*GPIO based game buttons*/\ - MUX_VAL(CP(CAM_XCLKA), (IEN | PTU | DIS | M4)) /*GPIO_96 - LEFT*/\ - MUX_VAL(CP(CAM_PCLK), (IEN | PTU | DIS | M4)) /*GPIO_97 - L2*/\ - MUX_VAL(CP(CAM_FLD), (IEN | PTU | DIS | M4)) /*GPIO_98 - RIGHT*/\ - MUX_VAL(CP(CAM_D0), (IEN | PTU | DIS | M4)) /*GPIO_99 - MENU*/\ - MUX_VAL(CP(CAM_D1), (IEN | PTU | DIS | M4)) /*GPIO_100 - START*/\ - MUX_VAL(CP(CAM_D2), (IEN | PTU | DIS | M4)) /*GPIO_101 - Y*/\ - MUX_VAL(CP(CAM_D3), (IEN | PTU | DIS | M4)) /*GPIO_102 - L1*/\ - MUX_VAL(CP(CAM_D4), (IEN | PTU | DIS | M4)) /*GPIO_103 - DOWN*/\ - MUX_VAL(CP(CAM_D5), (IEN | PTU | DIS | M4)) /*GPIO_104 - SELECT*/\ - MUX_VAL(CP(CAM_D6), (IEN | PTU | DIS | M4)) /*GPIO_105 - R1*/\ - MUX_VAL(CP(CAM_D7), (IEN | PTU | DIS | M4)) /*GPIO_106 - B*/\ - MUX_VAL(CP(CAM_D8), (IEN | PTU | DIS | M4)) /*GPIO_107 - R2*/\ - MUX_VAL(CP(CAM_D10), (IEN | PTU | DIS | M4)) /*GPIO_109 - X*/\ - MUX_VAL(CP(CAM_D11), (IEN | PTU | DIS | M4)) /*GPIO_110 - UP*/\ -MUX_VAL (CP (CAM_XCLKB ), (IEN |PTU |DIS |M4 ))/*GPIO_111 - A*/ \ + MUX_VAL(CP(CAM_XCLKA), (IEN | PTD | DIS | M4)) /*GPIO_96 - LEFT*/\ + MUX_VAL(CP(CAM_PCLK), (IEN | PTD | DIS | M4)) /*GPIO_97 - L2*/\ + MUX_VAL(CP(CAM_FLD), (IEN | PTD | DIS | M4)) /*GPIO_98 - RIGHT*/\ + MUX_VAL(CP(CAM_D0), (IEN | PTD | DIS | M4)) /*GPIO_99 - MENU*/\ + MUX_VAL(CP(CAM_D1), (IEN | PTD | DIS | M4)) /*GPIO_100 - START*/\ + MUX_VAL(CP(CAM_D2), (IEN | PTD | DIS | M4)) /*GPIO_101 - Y*/\ + MUX_VAL(CP(CAM_D3), (IEN | PTD | DIS | M4)) /*GPIO_102 - L1*/\ + MUX_VAL(CP(CAM_D4), (IEN | PTD | DIS | M4)) /*GPIO_103 - DOWN*/\ + MUX_VAL(CP(CAM_D5), (IEN | PTD | DIS | M4)) /*GPIO_104 - SELECT*/\ + MUX_VAL(CP(CAM_D6), (IEN | PTD | DIS | M4)) /*GPIO_105 - R1*/\ + MUX_VAL(CP(CAM_D7), (IEN | PTD | DIS | M4)) /*GPIO_106 - B*/\ + MUX_VAL(CP(CAM_D8), (IEN | PTD | DIS | M4)) /*GPIO_107 - R2*/\ + MUX_VAL(CP(CAM_D10), (IEN | PTD | DIS | M4)) /*GPIO_109 - X*/\ + MUX_VAL(CP(CAM_D11), (IEN | PTD | DIS | M4)) /*GPIO_110 - UP*/\ +MUX_VAL (CP (CAM_XCLKB ), (IEN |PTD |DIS |M4 ))/*GPIO_111 - A*/ \ /*Audio Interface To External DAC (Headphone, Speakers)*/\ MUX_VAL(CP(MCBSP2_FSX), (IDIS | PTD | DIS | M0)) /*McBSP2_FSX*/\ MUX_VAL(CP(MCBSP2_CLKX), (IDIS | PTD | DIS | M0)) /*McBSP2_CLKX*/\ MUX_VAL(CP(MCBSP2_DX), (IDIS | PTD | DIS | M0)) /*McBSP2_DX*/\ - MUX_VAL(CP(MCBSP_CLKS), (IEN | PTU | DIS | M0)) /*McBSP_CLKS*/\ + MUX_VAL(CP(MCBSP_CLKS), (IEN | PTD | DIS | M0)) /*McBSP_CLKS*/\MUX_VAL (CP (MCBSP2_DR ), (IDIS |PTD |DIS |M4 ))/*GPIO_118*/ \/* - nPOWERDOWN_DAC*/ \/*Expansion card 1*/ \
@@ -210,13 +210,13 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(MCBSP4_DX), (IDIS | PTD | DIS | M0)) /*McBSP4_DX*/\MUX_VAL (CP (MCBSP4_FSX ), (IEN |PTD |DIS |M0 ))/*McBSP4_FSX*/ \ /*GPIO definitions for muxed pins on AV connector*/\ -MUX_VAL (CP (UART2_CTS ), (IEN |PTU |EN |M4 ))/*GPIO_144,*/ \ +MUX_VAL (CP (UART2_CTS ), (IEN |PTD |EN |M4 ))/*GPIO_144,*/ \ /*UART2_CTS*/\ -MUX_VAL (CP (UART2_RTS ), (IEN |PTU |DIS |M4 ))/*GPIO_145,*/ \ +MUX_VAL (CP (UART2_RTS ), (IEN |PTD |EN |M4 ))/*GPIO_145,*/ \ /*UART2_RTS*/\ -MUX_VAL (CP (UART2_TX ), (IEN |PTU |EN |M4 ))/*GPIO_146,*/ \ +MUX_VAL (CP (UART2_TX ), (IEN |PTD |EN |M4 ))/*GPIO_146,*/ \ /*UART2_TX*/\ -MUX_VAL (CP (UART2_RX ), (IEN |PTD |DIS |M4 ))/*GPIO_147,*/ \ +MUX_VAL (CP (UART2_RX ), (IEN |PTD |EN |M4 ))/*GPIO_147,*/ \/*UART2_RX*/ \ /*Serial Interface (Peripheral boot, Linux console, on AV connector)*/\MUX_VAL (CP (UART3_RX_IRRX ), (IEN |PTD |DIS |M0 ))/*UART3_RX*/ \
@@ -231,18 +231,18 @@ const omap3_sysinfo sysinfo = {MUX_VAL (CP (MCBSP1_DR ), (IDIS |PTD |DIS |M4 ))/*GPIO_159*/ \/* - LED_WIFI*/ \ /*Switches*/\ -MUX_VAL (CP (MCSPI1_CS2 ), (IEN |PTU |DIS |M4 ))/*GPIO_176*/ \ +MUX_VAL (CP (MCSPI1_CS2 ), (IEN |PTD |DIS |M4 ))/*GPIO_176*/ \ /* - nHOLD_SWITCH*/\ -MUX_VAL (CP (CAM_D9 ), (IEN |PTU |DIS |M4 ))/*GPIO_108*/ \ +MUX_VAL (CP (CAM_D9 ), (IEN |PTD |DIS |M4 ))/*GPIO_108*/ \/* - nLID_SWITCH*/ \ /*External IRQs*/\ -MUX_VAL (CP (CAM_HS ), (IEN |PTU |DIS |M4 ))/*GPIO_94*/ \ +MUX_VAL (CP (CAM_HS ), (IEN |PTD |DIS |M4 ))/*GPIO_94*/ \ /* - nTOUCH_IRQ*/\MUX_VAL (CP (ETK_D7_ES2 ), (IEN |PTD |DIS |M4 ))/*GPIO_21*/ \ /* - WIFI_IRQ*/\MUX_VAL (CP (MCBSP1_FSX ), (IEN |PTD |DIS |M4 ))/*GPIO_161*/ \ /* - nIRQ_NUB1*/\ -MUX_VAL (CP (MCBSP1_CLKX ), (IEN |PTU |DIS |M4 ))/*GPIO_162*/ \ +MUX_VAL (CP (MCBSP1_CLKX ), (IEN |PTD |DIS |M4 ))/*GPIO_162*/ \/* - nIRQ_NUB2*/ \ /*Various other stuff*/\MUX_VAL (CP (UART3_CTS_RCTX ), (IEN |PTD |DIS |M4 ))/*GPIO_163*/ \
@@ -262,7 +262,7 @@ const omap3_sysinfo sysinfo = {/* - nLCD_RESET*/ \MUX_VAL (CP (MCBSP1_CLKR ), (IDIS |PTD |DIS |M4 ))/*GPIO_156*/ \ /* - RESET_NUBS*/\ -MUX_VAL (CP (UART3_RTS_SD ), (IDIS |PTU |EN |M4 ))/*GPIO_164*/ \ +MUX_VAL (CP (UART3_RTS_SD ), (IDIS |PTD |DIS |M4 ))/*GPIO_164*/ \/* - EN_USB_5V*/ \ /*Spare GPIOs*/\MUX_VAL (CP (GPMC_NCS7 ), (IEN |PTD |EN |M4 ))/*GPIO_58*/ \
Signature · 1 line
1.5.6.3
PATCH 4/4 OMAP3 pandora: Fix CKE1 MUX setting to allow self-refresh
Pandora is using both SDRC CSes. The MUX setting is needed for the second CS clock signal to allow the 2 RAM parts to be put in self-refresh correctly.
Based on similar patch for beagle and overo by Jean Pihet and Steve Sakoman.
--- board/omap3/pandora/pandora.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
board/omap3/pandora/pandora.h +1 -1
@@ -396,6 +396,6 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(D2D_MBUSFLAG), (IEN | PTD | DIS | M0)) /*d2d_mbusflag*/\ MUX_VAL(CP(D2D_SBUSFLAG), (IEN | PTD | DIS | M0)) /*d2d_sbusflag*/\ MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)) /*sdrc_cke0*/\ - MUX_VAL(CP(SDRC_CKE1), (IDIS | PTD | DIS | M7)) /*sdrc_cke1*/ + MUX_VAL(CP(SDRC_CKE1), (IDIS | PTU | EN | M0)) /*sdrc_cke1*/#endif
Signature · 1 line
1.5.6.3
cover OMAP3 pandora: pin mux updates
In reply to Grazvydas IgnotasQuoted 4 lines · Grazvydas Ignotas
This patch series clean up and update pin mux for pandora. The update is needed for rev3 or later boards to work properly, but older boards still work after this.
Quoted 9 lines
Grazvydas Ignotas (4):
OMAP3 pandora: pin mux cleanup
OMAP3 pandora: setup pin mux for pins used on rev3 boards OMAP3 pandora: setup pulls for various GPIOs OMAP3 pandora: Fix CKE1 MUX setting to allow self-refreshboard/omap3/pandora/pandora.h | 86 +++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 51 deletions(-)
what is the status of the precedent rev at the end of the patch series?
Best Regards,
J.
cover OMAP3 pandora: pin mux updates
Quoted 11 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 10 lines · Grazvydas Ignotas
This patch series clean up and update pin mux for pandora. The update is needed for rev3 or later boards to work properly, but older boards still work after this.
Grazvydas Ignotas (4):
? OMAP3 pandora: pin mux cleanup
? OMAP3 pandora: setup pin mux for pins used on rev3 boards ? OMAP3 pandora: setup pulls for various GPIOs
? OMAP3 pandora: Fix CKE1 MUX setting to allow self-refresh
Quoted 4 lines
Quoted 3 lines
?board/omap3/pandora/pandora.h | ? 86 +++++++++++++++++------------------------ ?1 files changed, 35 insertions(+), 51 deletions(-)
what is the status of the precedent rev at the end of the patch series?
Works fine except one analog controller, but I have the only rev2 board with them and don't mind about that. All other boards with analog controllers are rev3 and need these patches to work.