浏览代码

Merged TI feature connectivity into ti-linux-4.19.y

* 'connectivity-ti-linux-4.19.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/connectivity:
  ARM: dts: k3-j721e-common-proc-board: Update MMC1 pinmux from the latest pinmux tool
  phy: ti: j721e-wiz: Fix build warning
  phy: cadence: Sierra: Fix build warning

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
LCPD Auto Merger 6 年之前
父节点
当前提交
bfb1c75b6e

+ 1 - 1
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts

@@ -346,13 +346,13 @@
 		pinctrl-single,pins = <
 			J721E_IOPAD(0x254, PIN_INPUT, 0) /* (R29) MMC1_CMD */
 			J721E_IOPAD(0x250, PIN_INPUT, 0) /* (P25) MMC1_CLK */
+			J721E_IOPAD(0x2ac, PIN_INPUT, 0) /* (P25) MMC1_CLKLB */
 			J721E_IOPAD(0x24c, PIN_INPUT, 0) /* (R24) MMC1_DAT0 */
 			J721E_IOPAD(0x248, PIN_INPUT, 0) /* (P24) MMC1_DAT1 */
 			J721E_IOPAD(0x244, PIN_INPUT, 0) /* (R25) MMC1_DAT2 */
 			J721E_IOPAD(0x240, PIN_INPUT, 0) /* (R26) MMC1_DAT3 */
 			J721E_IOPAD(0x258, PIN_INPUT, 0) /* (P23) MMC1_SDCD */
 			J721E_IOPAD(0x25c, PIN_INPUT, 0) /* (R28) MMC1_SDWP */
-			J721E_IOPAD(0x2ac, PIN_INPUT, 0)
 		>;
 	};
 

+ 0 - 1
drivers/phy/cadence/phy-cadence-sierra.c

@@ -335,7 +335,6 @@ static int cdns_sierra_phy_on(struct phy *gphy)
 static int cdns_sierra_phy_off(struct phy *gphy)
 {
 	struct cdns_sierra_inst *ins = phy_get_drvdata(gphy);
-	struct cdns_sierra_phy *sp = dev_get_drvdata(gphy->dev.parent);
 
 	return reset_control_assert(ins->lnk_rst);
 }

+ 0 - 2
drivers/phy/ti/phy-j721e-wiz.c

@@ -689,8 +689,6 @@ static int wiz_phy_reset_deassert(struct reset_controller_dev *rcdev,
 
 	/* if typec-dir gpio was specified, set LN10 SWAP bit based on that */
 	if (id == 0 && wiz->gpio_typec_dir) {
-		u32 reg;
-
 		if (gpiod_get_value_cansleep(wiz->gpio_typec_dir)) {
 			regmap_update_bits(wiz->regmap, WIZ_SERDES_TYPEC,
 					   WIZ_SERDES_TYPEC_LN10_SWAP,