Commit f90ce9ec authored by Jeffrey Lee's avatar Jeffrey Lee

Fix SD activity LED on 3B+

Detail:
  hdr/BCM2835 - Add some new board revision values
  s/SDIO - Treat the 3B+ the same as the 3B when handling the activity LED. Also detect the Embest-manufactured CM1 and treat it the same as the Sony one.
Admin:
  Tested on Raspberry Pi 3B+


Version 0.74. Tagged as 'BCM2835-0_74'
parent 640e2cc1
/* (0.73)
/* (0.74)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.73
#define Module_MajorVersion_CMHG 0.74
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 10 Sep 2017
#define Module_Date_CMHG 19 Mar 2018
#define Module_MajorVersion "0.73"
#define Module_Version 73
#define Module_MajorVersion "0.74"
#define Module_Version 74
#define Module_MinorVersion ""
#define Module_Date "10 Sep 2017"
#define Module_Date "19 Mar 2018"
#define Module_ApplicationDate "10-Sep-17"
#define Module_ApplicationDate "19-Mar-18"
#define Module_ComponentName "BCM2835"
#define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835"
#define Module_FullVersion "0.73"
#define Module_HelpVersion "0.73 (10 Sep 2017)"
#define Module_LibraryVersionInfo "0:73"
#define Module_FullVersion "0.74"
#define Module_HelpVersion "0.74 (19 Mar 2018)"
#define Module_LibraryVersionInfo "0:74"
......@@ -314,16 +314,19 @@ $label BIC$cond $startaddr, $startaddr, #&1f
MEND
; Board revision values (pre Pi 2), enumerated scheme
; Ref: http://elinux.org/RPi_HardwareHistory#Board_Revision_History
BoardRevision_AorB256_First * &2 ; } Either an A or B
BoardRevision_AorB256_Last * &9 ; } various manufacturers
BoardRevision_AorB512_First * &D ; } Either an A or B
BoardRevision_AorB512_Last * &F ; } various manufacturers
BoardRevision_AorB_First * &2 ; } Either an A or B, 256MB or 512MB
BoardRevision_AorB_Last * &F ; } and various manufacturers
BoardRevision_BPlus * &10 ; Significant board revisions
BoardRevision_Compute * &11
BoardRevision_APlus * &12
; Ref: https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md
BoardRevision_AorB256_First * &2 ; } Either an A or B
BoardRevision_AorB256_Last * &9 ; } various manufacturers
BoardRevision_AorB512_First * &D ; } Either an A or B
BoardRevision_AorB512_Last * &F ; } various manufacturers
BoardRevision_AorB_First * &2 ; } Either an A or B, 256MB or 512MB
BoardRevision_AorB_Last * &F ; } and various manufacturers
BoardRevision_BPlus_Sony * &10 ; Significant board revisions
BoardRevision_Compute_Sony * &11
BoardRevision_APlus_Sony * &12
BoardRevision_BPlus_Embest * &13
BoardRevision_Compute_Embest * &14
BoardRevision_APlus_Embest * &15
; Board revision values (Pi 2 and later), bitfield scheme
BoardRevision_User_Shift * 24
......@@ -359,6 +362,8 @@ BoardRevision_Model_Compute * 6 :SHL: BoardRevision_Model_Shift
BoardRevision_Model_B3 * 8 :SHL: BoardRevision_Model_Shift
BoardRevision_Model_Zero * 9 :SHL: BoardRevision_Model_Shift
BoardRevision_Model_Compute3 * 10 :SHL: BoardRevision_Model_Shift
BoardRevision_Model_ZeroW * 12 :SHL: BoardRevision_Model_Shift
BoardRevision_Model_B3Plus * 13 :SHL: BoardRevision_Model_Shift
BoardRevision_Rev_Shift * 0
BoardRevision_Rev_Mask * 15 :SHL: BoardRevision_Rev_Shift
......
......@@ -329,9 +329,10 @@ SDIO_InitDevices ROUT
BIC a3, a3, #BoardRevision_User_Mask ; mask off overclocking / user bits
TST a3, #BoardRevision_NewScheme
BNE %FT01
ASSERT BoardRevision_AorB_Last < BoardRevision_BPlus
CMP a3, #BoardRevision_BPlus
TEQ a3, #BoardRevision_Compute
ASSERT BoardRevision_AorB_Last < BoardRevision_BPlus_Sony
CMP a3, #BoardRevision_BPlus_Sony
TEQ a3, #BoardRevision_Compute_Sony
TEQNE a3, #BoardRevision_Compute_Embest
B %FT02
01 AND a3, a3, #BoardRevision_Model_Mask
ASSERT BoardRevision_Model_A < BoardRevision_Model_APlus
......@@ -386,6 +387,7 @@ SDIO_InitDevices ROUT
ADRL a2, GetCardDetect_AB
ADDHS a2, a2, #GetCardDetect_BPlus_Compute - GetCardDetect_AB
TEQ a3, #BoardRevision_Model_B3
TEQNE a3, #BoardRevision_Model_B3Plus
ADREQL a1, SetActivity_B3
STR a1, SDHCIDevice + HALDevice_SDHCISetActivity
STR a2, SDHCIDevice + HALDevice_SDHCIGetCardDetect
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment