From a3f48ea5b836489c8b31c3b65091d0192ea3e117 Mon Sep 17 00:00:00 2001 From: zwei4 Date: Fri, 5 May 2017 18:38:36 +0800 Subject: Use GP_CAMERASB10 as Board_ID3. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: zwei4 CC: Mang Guo CC: Shifei Lu --- .../Board/LeafHill/BoardInitPreMem/PlatformId.c | 24 ++++++++++++++-------- .../MinnowBoard3/BoardInitPreMem/PlatformId.c | 24 ++++++++++++++-------- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c index d550fd400c..40554b95ee 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c @@ -64,24 +64,30 @@ GetEmbeddedBoardIdFabId( padConfg0.r.PMode = 0; padConfg0.r.GPIORxTxDis = 0x1; GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCnf0); + // - // Board_ID3: PMIC_PWRGOOD + // Board_ID3: GP_CAMERASB10 // - CommAndOffset = GetCommOffset (NORTHWEST, 0x00C0); + + CommAndOffset = GetCommOffset (NORTH, 0x01E0); padConfg0.padCnf0 = GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET); - padConfg0.r.PMode = 0; - padConfg0.r.GPIORxTxDis = 0x1; + padConfg1.padCnf1 = GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET); + + padConfg0.r.PMode = M0; // Set to GPIO mode + padConfg0.r.GPIORxTxDis = GPI; // Set to GPI GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCnf0); + + padConfg1.r.IOSTerm = EnPu; // Enable pull-up + padConfg1.r.Term = P_20K_H; // Set to 20K pull-up + GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCnf1); + // - // Set to Pull Up 20K + // Read out Board_ID // - padConfg1.r.Term = 0xC; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCnf1); - *BoardId = (UINT8) (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00F0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) | \ (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00D0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 1) | \ (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00C8) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \ - (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00C0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3)); + (((GpioPadRead (GetCommOffset (NORTH, 0x01E0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3)); DEBUG ((DEBUG_INFO, "BoardId from PMIC strap: %02X\n", *BoardId)); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c index d550fd400c..bacdab1f22 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c @@ -64,24 +64,30 @@ GetEmbeddedBoardIdFabId( padConfg0.r.PMode = 0; padConfg0.r.GPIORxTxDis = 0x1; GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCnf0); + // - // Board_ID3: PMIC_PWRGOOD + // Board_ID3: GP_CAMERASB10 // - CommAndOffset = GetCommOffset (NORTHWEST, 0x00C0); + + CommAndOffset = GetCommOffset (NORTH, 0x01E0); padConfg0.padCnf0 = GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET); - padConfg0.r.PMode = 0; - padConfg0.r.GPIORxTxDis = 0x1; + padConfg1.padCnf1 = GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET); + + padConfg0.r.PMode = M0; // Set to GPIO mode + padConfg0.r.GPIORxTxDis = GPI; // Set to GPI GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCnf0); + + padConfg1.r.IOSTerm = EnPu; // Enable pull-up + padConfg1.r.Term = P_20K_H; // Set to 20K pull-up + GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCnf1); + // - // Set to Pull Up 20K + // Read out Board_ID // - padConfg1.r.Term = 0xC; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCnf1); - *BoardId = (UINT8) (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00F0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) | \ (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00D0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 1) | \ (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00C8) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \ - (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00C0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3)); + (((GpioPadRead (GetCommOffset (NORTH, 0x01E0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3)); DEBUG ((DEBUG_INFO, "BoardId from PMIC strap: %02X\n", *BoardId)); -- cgit v1.2.3