phy: meson8b-usb2: fix offsets for some of the registers
Subsystems (2)
Martin Blumenstingl
reviewerPATCH 1/1 phy: meson8b-usb2: fix offsets for some of the registers
The register offsets for REG_DBG_UART (and all following) were off by 0x4. This was not a problem yet because these registers are currently not used by the driver.
--- drivers/phy/phy-meson8b-usb2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/phy/phy-meson8b-usb2.c +3 -3
@@ -81,9 +81,9 @@#define REG_ADP_BC_ACA_PIN_GND BIT(25)#define REG_ADP_BC_ACA_PIN_FLOAT BIT(26) -#define REG_DBG_UART 0x14 +#define REG_DBG_UART 0x10 -#define REG_TEST 0x18 +#define REG_TEST 0x14#define REG_TEST_DATA_IN_MASK GENMASK(3, 0)#define REG_TEST_EN_MASK GENMASK(7, 4)#define REG_TEST_ADDR_MASK GENMASK(11, 8)
@@ -93,7 +93,7 @@#define REG_TEST_DATA_OUT_MASK GENMASK(19, 16)#define REG_TEST_DISABLE_ID_PULLUP BIT(20) -#define REG_TUNE 0x1c +#define REG_TUNE 0x18#define REG_TUNE_TX_RES_TUNE_MASK GENMASK(1, 0)#define REG_TUNE_TX_HSXV_TUNE_MASK GENMASK(3, 2)#define REG_TUNE_TX_VREF_TUNE_MASK GENMASK(7, 4)
Signature · 1 line
2.11.0
Martin Blumenstingl
reviewerPATCH 1/1 phy: meson8b-usb2: fix offsets for some of the registers
Hi Kishon, Hi Kevin,
did you have time to look into this yet?
Quoted 35 lines · Martin Blumenstingl
The register offsets for
REG_DBG_UART(and all following) were off by0x4. This was not a problem yet because these registers are currently not used by the driver.Signed-off-by Martin Blumenstingl <[email protected]>--- drivers/phy/phy-meson8b-usb2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/phy/phy-meson8b-usb2.c +3
-4@@ -81,9 +81,9 @@#define REG_ADP_BC_ACA_PIN_GND BIT(25)#define REG_ADP_BC_ACA_PIN_FLOAT BIT(26) -#define REG_DBG_UART 0x14 +#define REG_DBG_UART 0x10 -#define REG_TEST 0x18 +#define REG_TEST 0x14#define REG_TEST_DATA_IN_MASK GENMASK(3, 0)#define REG_TEST_EN_MASK GENMASK(7, 4)#define REG_TEST_ADDR_MASK GENMASK(11, 8)@@ -93,7 +93,7 @@#define REG_TEST_DATA_OUT_MASK GENMASK(19, 16)#define REG_TEST_DISABLE_ID_PULLUP BIT(20) -#define REG_TUNE 0x1c +#define REG_TUNE 0x18#define REG_TUNE_TX_RES_TUNE_MASK GENMASK(1, 0)#define REG_TUNE_TX_HSXV_TUNE_MASK GENMASK(3, 2)#define REG_TUNE_TX_VREF_TUNE_MASK GENMASK(7, 4) --
Quoted 2 lines
2.11.0
this is the struct (which represents the register mapping) from Amlogic's kernel sources [0]:
typedef struct usb_peri_reg {
volatile uint32_t config;
volatile uint32_t ctrl;
volatile uint32_t endp_intr;
volatile uint32_t adp_bc;
volatile uint32_t dbg_uart;
volatile uint32_t test;
volatile uint32_t tune;
volatile uint32_t reserved;
} usb_peri_reg_t;Jerome Brunet
reviewerPATCH 1/1 phy: meson8b-usb2: fix offsets for some of the registers
In reply to Martin BlumenstinglQuoted 6 lines · Martin Blumenstingl
The register offsets for
REG_DBG_UART(and all following) were off by0x4. This was not a problem yet because these registers are currently not used by the driver.Signed-off-by: Martin Blumenstingl
<[email protected]>
Good catch ! Thx.
Quoted 38 lines
---
?drivers/phy/phy-meson8b-usb2.c | 6 +++---
?1 file changed, 3 insertions(+), 3 deletions(-)drivers/phy/phy- renamed from drivers/phy/phy-meson8b-usb2.c +0
-0
meson8b-usb2.c
index33c9f4ba157d..30f56a6a411f100644drivers/phy/phy-meson8b-usb2.c +0
-0@@ -81,9 +81,9 @@? #define
REG_ADP_BC_ACA_PIN_GNDBIT(25
)
? #defineREG_ADP_BC_ACA_PIN_FLOATBIT(26)
?drivers/phy/phy-meson8b-usb2.c +1
-1-#define REG_DBG_UART 0x14 +#define REG_DBG_UART 0x10?
drivers/phy/phy-meson8b-usb2.c +1
-1-#define REG_TEST 0x18 +#define REG_TEST 0x14? #define
REG_TEST_DATA_IN_MASKGENMASK
(3, 0)
? #defineREG_TEST_EN_MASKGENMASK(7,
4)
? #defineREG_TEST_ADDR_MASKGENMASK(11
, 8)drivers/phy/phy-meson8b-usb2.c +0
-0@@ -93,7 +93,7 @@? #define
REG_TEST_DATA_OUT_MASKGENMASK(19, 16)
? #defineREG_TEST_DISABLE_ID_PULLUPBIT(20)
?drivers/phy/phy-meson8b-usb2.c +1
-1-#define REG_TUNE 0x1c +#define REG_TUNE 0x18? #define
REG_TUNE_TX_RES_TUNE_MASKGENMASK(1,
0)
? #defineREG_TUNE_TX_HSXV_TUNE_MASKGENMASK(3,
2)
? #defineREG_TUNE_TX_VREF_TUNE_MASKGENMASK(7,
4)
Martin Blumenstingl
reviewerPATCH v2 1/1 phy: meson8b-usb2: fix offsets for some of the registers
In reply to Martin BlumenstinglThe register offsets for REG_DBG_UART (and all following) were off by 0x4. This was not a problem yet because these registers are currently not used by the driver.
---
changes since v1:
- added Jerome's Reviewed-By
drivers/phy/phy-meson8b-usb2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/phy/phy-meson8b-usb2.c +3 -3
@@ -81,9 +81,9 @@#define REG_ADP_BC_ACA_PIN_GND BIT(25)#define REG_ADP_BC_ACA_PIN_FLOAT BIT(26) -#define REG_DBG_UART 0x14 +#define REG_DBG_UART 0x10 -#define REG_TEST 0x18 +#define REG_TEST 0x14#define REG_TEST_DATA_IN_MASK GENMASK(3, 0)#define REG_TEST_EN_MASK GENMASK(7, 4)#define REG_TEST_ADDR_MASK GENMASK(11, 8)
@@ -93,7 +93,7 @@#define REG_TEST_DATA_OUT_MASK GENMASK(19, 16)#define REG_TEST_DISABLE_ID_PULLUP BIT(20) -#define REG_TUNE 0x1c +#define REG_TUNE 0x18#define REG_TUNE_TX_RES_TUNE_MASK GENMASK(1, 0)#define REG_TUNE_TX_HSXV_TUNE_MASK GENMASK(3, 2)#define REG_TUNE_TX_VREF_TUNE_MASK GENMASK(7, 4)
Signature · 1 line
2.12.0
Martin Blumenstingl
reviewerPATCH v2 1/1 phy: meson8b-usb2: fix offsets for some of the registers
Hi Kishon,
Quoted 6 lines · Martin Blumenstingl
The register offsets for
REG_DBG_UART(and all following) were off by0x4. This was not a problem yet because these registers are currently not used by the driver.Signed-off-by Martin Blumenstingl <[email protected]>Reviewed-by Jerome Brunet <[email protected]>
gentle ping - please let me know if something is missing (for example some ACK orreview) before you are going to apply this
Quoted 33 lines
---
changes since v1:
- added Jerome's Reviewed-Bydrivers/phy/phy-meson8b-usb2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/phy/phy-meson8b-usb2.c +3
-4@@ -81,9 +81,9 @@#define REG_ADP_BC_ACA_PIN_GND BIT(25)#define REG_ADP_BC_ACA_PIN_FLOAT BIT(26) -#define REG_DBG_UART 0x14 +#define REG_DBG_UART 0x10 -#define REG_TEST 0x18 +#define REG_TEST 0x14#define REG_TEST_DATA_IN_MASK GENMASK(3, 0)#define REG_TEST_EN_MASK GENMASK(7, 4)#define REG_TEST_ADDR_MASK GENMASK(11, 8)@@ -93,7 +93,7 @@#define REG_TEST_DATA_OUT_MASK GENMASK(19, 16)#define REG_TEST_DISABLE_ID_PULLUP BIT(20) -#define REG_TUNE 0x1c +#define REG_TUNE 0x18#define REG_TUNE_TX_RES_TUNE_MASK GENMASK(1, 0)#define REG_TUNE_TX_HSXV_TUNE_MASK GENMASK(3, 2)#define REG_TUNE_TX_VREF_TUNE_MASK GENMASK(7, 4) --
Quoted 2 lines
2.12.0
Regards,
Martin
PATCH v2 1/1 phy: meson8b-usb2: fix offsets for some of the registers
Quoted 4 lines · Martin Blumenstingl
Hi Kishon,
On Sat, Mar 4, 2017 at 11:20 AM, Martin Blumenstingl <[email protected]> wrote:
Quoted 9 lines
Quoted 6 lines
The register offsets for
REG_DBG_UART(and all following) were off by0x4. This was not a problem yet because these registers are currently not used by the driver.Signed-off-by Martin Blumenstingl <[email protected]>Reviewed-by Jerome Brunet <[email protected]>gentle ping - please let me know if something is missing (for example some ACK orreview) before you are going to apply this
merged it now.
Thanks
Kishon
Quoted 40 lines
Quoted 33 lines
---
changes since v1:
- added Jerome's Reviewed-Bydrivers/phy/phy-meson8b-usb2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/phy/phy-meson8b-usb2.c +3
-4@@ -81,9 +81,9 @@#define REG_ADP_BC_ACA_PIN_GND BIT(25)#define REG_ADP_BC_ACA_PIN_FLOAT BIT(26) -#define REG_DBG_UART 0x14 +#define REG_DBG_UART 0x10 -#define REG_TEST 0x18 +#define REG_TEST 0x14#define REG_TEST_DATA_IN_MASK GENMASK(3, 0)#define REG_TEST_EN_MASK GENMASK(7, 4)#define REG_TEST_ADDR_MASK GENMASK(11, 8)@@ -93,7 +93,7 @@#define REG_TEST_DATA_OUT_MASK GENMASK(19, 16)#define REG_TEST_DISABLE_ID_PULLUP BIT(20) -#define REG_TUNE 0x1c +#define REG_TUNE 0x18#define REG_TUNE_TX_RES_TUNE_MASK GENMASK(1, 0)#define REG_TUNE_TX_HSXV_TUNE_MASK GENMASK(3, 2)#define REG_TUNE_TX_VREF_TUNE_MASK GENMASK(7, 4) --Quoted 2 lines
2.12.0
Regards,
Martin