From mboxrd@z Thu Jan 1 00:00:00 1970 From: York Sun Date: Fri, 16 Aug 2013 09:42:22 -0700 Subject: [U-Boot] [u-boot-release] [PATCH][v2] powerpc/common/vsc3316: remove const from vsc3316_config parameter define In-Reply-To: <1376044897-26970-1-git-send-email-Shaohui.Xie@freescale.com> References: <1376044897-26970-1-git-send-email-Shaohui.Xie@freescale.com> Message-ID: <520E566E.2080900@freescale.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 08/09/2013 03:41 AM, Shaohui Xie wrote: > Since the parameters need to be modified according to different Serdes > protocols at runtime, the const will block this. Also remove const from > arrays define used by vsc3316_config. > > Signed-off-by: Shaohui Xie > --- > changes for V2: > 1. changed subject; > 2. fix broken on B4xxx boards; > > board/freescale/b4860qds/b4860qds_crossbar_con.h | 12 ++++++------ > board/freescale/common/vsc3316_3308.c | 2 +- > board/freescale/common/vsc3316_3308.h | 2 +- > board/freescale/t4qds/t4qds.c | 8 ++++---- > 4 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/board/freescale/b4860qds/b4860qds_crossbar_con.h b/board/freescale/b4860qds/b4860qds_crossbar_con.h > index 6e64745..db0cf28 100644 > --- a/board/freescale/b4860qds/b4860qds_crossbar_con.h > +++ b/board/freescale/b4860qds/b4860qds_crossbar_con.h > @@ -13,10 +13,10 @@ > static const int8_t vsc16_tx_amc[8][2] = { {15, 3}, {0, 2}, {7, 4}, {9, 10}, > {5, 11}, {4, 5}, {2, 6}, {12, 9} }; > > -static const int8_t vsc16_tx_sfp[8][2] = { {15, 7}, {0, 1}, {7, 8}, {9, 0}, > +static int8_t vsc16_tx_sfp[8][2] = { {15, 7}, {0, 1}, {7, 8}, {9, 0}, > {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1} }; > > -static const int8_t vsc16_tx_4sfp_sgmii_12_56[8][2] = { {15, 7}, {0, 1}, > +static int8_t vsc16_tx_4sfp_sgmii_12_56[8][2] = { {15, 7}, {0, 1}, > {7, 8}, {9, 0}, {2, 14}, {12, 15}, > {-1, -1}, {-1, -1} }; > > @@ -25,7 +25,7 @@ static const int8_t vsc16_tx_4sfp_sgmii_34[8][2] = { {15, 7}, {0, 1}, > {-1, -1}, {-1, -1} }; > > #ifdef CONFIG_PPC_B4420 > -static const int8_t vsc16_tx_sgmii_lane_cd[8][2] = { {5, 14}, {4, 15}, > +static int8_t vsc16_tx_sgmii_lane_cd[8][2] = { {5, 14}, {4, 15}, > {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1} }; > #endif > > @@ -35,10 +35,10 @@ static const int8_t vsc16_tx_aurora[8][2] = { {2, 13}, {12, 12}, {-1, -1}, > static const int8_t vsc16_rx_amc[8][2] = { {3, 15}, {2, 1}, {4, 8}, {10, 9}, > {11, 11}, {5, 10}, {6, 3}, {9, 12} }; > > -static const int8_t vsc16_rx_sfp[8][2] = { {8, 15}, {0, 1}, {7, 8}, {1, 9}, > +static int8_t vsc16_rx_sfp[8][2] = { {8, 15}, {0, 1}, {7, 8}, {1, 9}, > {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1} }; > > -static const int8_t vsc16_rx_4sfp_sgmii_12_56[8][2] = { {8, 15}, {0, 1}, > +static int8_t vsc16_rx_4sfp_sgmii_12_56[8][2] = { {8, 15}, {0, 1}, > {7, 8}, {1, 9}, {14, 3}, {15, 12}, > {-1, -1}, {-1, -1} }; > > @@ -47,7 +47,7 @@ static const int8_t vsc16_rx_4sfp_sgmii_34[8][2] = { {8, 15}, {0, 1}, > {-1, -1}, {-1, -1} }; > > #ifdef CONFIG_PPC_B4420 > -static const int8_t vsc16_rx_sgmii_lane_cd[8][2] = { {14, 11}, {15, 10}, > +static int8_t vsc16_rx_sgmii_lane_cd[8][2] = { {14, 11}, {15, 10}, > {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1} }; > #endif > > diff --git a/board/freescale/common/vsc3316_3308.c b/board/freescale/common/vsc3316_3308.c > index 8a3dc33..97a25e8 100644 > --- a/board/freescale/common/vsc3316_3308.c > +++ b/board/freescale/common/vsc3316_3308.c > @@ -31,7 +31,7 @@ int vsc_if_enable(unsigned int vsc_addr) > return i2c_write(vsc_addr, INTERFACE_MODE_REG, 1, &data, 1); > } > > -int vsc3316_config(unsigned int vsc_addr, const int8_t con_arr[][2], > +int vsc3316_config(unsigned int vsc_addr, int8_t con_arr[][2], > unsigned int num_con) > { > unsigned int i; > diff --git a/board/freescale/common/vsc3316_3308.h b/board/freescale/common/vsc3316_3308.h > index 4003fcd..2a49187 100644 > --- a/board/freescale/common/vsc3316_3308.h > +++ b/board/freescale/common/vsc3316_3308.h > @@ -12,7 +12,7 @@ > #include > > int vsc_if_enable(unsigned int vsc_addr); > -int vsc3316_config(unsigned int vsc_addr, const int8_t con_arr[][2], > +int vsc3316_config(unsigned int vsc_addr, int8_t con_arr[][2], > unsigned int num_con); > int vsc3308_config(unsigned int vsc_addr, const int8_t con_arr[][2], > unsigned int num_con); > diff --git a/board/freescale/t4qds/t4qds.c b/board/freescale/t4qds/t4qds.c > index aa6a217..2dade85 100644 > --- a/board/freescale/t4qds/t4qds.c > +++ b/board/freescale/t4qds/t4qds.c > @@ -26,16 +26,16 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -static const int8_t vsc3316_fsm1_tx[8][2] = { {0, 0}, {1, 1}, {6, 6}, {7, 7}, > +static int8_t vsc3316_fsm1_tx[8][2] = { {0, 0}, {1, 1}, {6, 6}, {7, 7}, > {8, 8}, {9, 9}, {14, 14}, {15, 15} }; > > -static const int8_t vsc3316_fsm2_tx[8][2] = { {2, 2}, {3, 3}, {4, 4}, {5, 5}, > +static int8_t vsc3316_fsm2_tx[8][2] = { {2, 2}, {3, 3}, {4, 4}, {5, 5}, > {10, 10}, {11, 11}, {12, 12}, {13, 13} }; > > -static const int8_t vsc3316_fsm1_rx[8][2] = { {2, 12}, {3, 13}, {4, 5}, {5, 4}, > +static int8_t vsc3316_fsm1_rx[8][2] = { {2, 12}, {3, 13}, {4, 5}, {5, 4}, > {10, 11}, {11, 10}, {12, 2}, {13, 3} }; > > -static const int8_t vsc3316_fsm2_rx[8][2] = { {0, 15}, {1, 14}, {6, 7}, {7, 6}, > +static int8_t vsc3316_fsm2_rx[8][2] = { {0, 15}, {1, 14}, {6, 7}, {7, 6}, > {8, 9}, {9, 8}, {14, 1}, {15, 0} }; > > int checkboard(void) > Shaohui, Please rebase your patch to latest master branch. (I keep the whole patch in this replay, hoping patchwork can catch it this time) York