-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
meta-lxatac-bsp: linux-lxatac: upgrade to 6.7-rc2
umpf tag is now: 6.7/customers/lxa/lxatac/20231124-1. The tag includes the following topic branches: - v6.7/customers/lxa/lxatac - v6.7/topic/pwm-stm32 - v6.7/topic/pwm-backlight - v6.7/topic/tty-trigger No interesting changes this time around. The KSZ drive strength HACK got even HACKier because the #defines are no longer in scope, so I replaced them with the computed value. Signed-off-by: Leonard Göhrs <[email protected]>
- Loading branch information
Showing
14 changed files
with
123 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ Signed-off-by: Leonard Göhrs <[email protected]> | |
| 1 file changed, 4 insertions(+) | ||
|
|
||
| diff --git a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | ||
| index 184b8bb4ebbf..1bb193440415 100644 | ||
| index f09b7c384bd9..b67da69ad748 100644 | ||
| --- a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | ||
| +++ b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | ||
| @@ -580,6 +580,10 @@ &usbotg_hs { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ Signed-off-by: Leonard Göhrs <[email protected]> | |
| 1 file changed, 4 insertions(+) | ||
|
|
||
| diff --git a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | ||
| index e5dad090551c..c940ea305412 100644 | ||
| index 788c9d099639..7e002b591071 100644 | ||
| --- a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | ||
| +++ b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | ||
| @@ -471,6 +471,10 @@ switch: switch@0 { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,21 +16,19 @@ The values could be tweaked higher if we ever notice issues with the RGMII link. | |
|
|
||
| Signed-off-by: Leonard Göhrs <[email protected]> | ||
| --- | ||
| drivers/net/dsa/microchip/ksz9477.c | 5 +++++ | ||
| 1 file changed, 5 insertions(+) | ||
| drivers/net/dsa/microchip/ksz9477.c | 3 +++ | ||
| 1 file changed, 3 insertions(+) | ||
|
|
||
| diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c | ||
| index 83b7f2d5c1ea..d1219872e29b 100644 | ||
| index 7f745628c84d..046c498f3f7a 100644 | ||
| --- a/drivers/net/dsa/microchip/ksz9477.c | ||
| +++ b/drivers/net/dsa/microchip/ksz9477.c | ||
| @@ -1126,6 +1126,11 @@ int ksz9477_setup(struct dsa_switch *ds) | ||
| /* enable global MIB counter freeze function */ | ||
| ksz_cfg(dev, REG_SW_MAC_CTRL_6, SW_MIB_COUNTER_FREEZE, true); | ||
| @@ -1323,6 +1323,9 @@ int ksz9477_setup(struct dsa_switch *ds) | ||
| */ | ||
| ksz_write8(dev, REG_SW_PME_CTRL, 0); | ||
|
|
||
| + /* set drive strenghts */ | ||
| + ksz_write8(dev, REG_SW_IO_STRENGTH__1, | ||
| + (SW_DRIVE_STRENGTH_8MA << SW_LO_SPEED_DRIVE_STRENGTH_S) | | ||
| + (SW_DRIVE_STRENGTH_2MA << SW_HI_SPEED_DRIVE_STRENGTH_S)); | ||
| + ksz_write8(dev, 0x010D, 0x02); | ||
| + | ||
| return 0; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ Signed-off-by: Philipp Zabel <[email protected]> | |
| 1 file changed, 1 insertion(+), 16 deletions(-) | ||
|
|
||
| diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c | ||
| index 3d6be7749e23..fda85e452007 100644 | ||
| index 3303a754ea02..5e48584e3bd4 100644 | ||
| --- a/drivers/pwm/pwm-stm32.c | ||
| +++ b/drivers/pwm/pwm-stm32.c | ||
| @@ -52,21 +52,6 @@ static u32 active_channels(struct stm32_pwm *dev) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ Signed-off-by: Philipp Zabel <[email protected]> | |
| 1 file changed, 4 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c | ||
| index fda85e452007..c0ef1f3431b8 100644 | ||
| index 5e48584e3bd4..009f9c1a5eca 100644 | ||
| --- a/drivers/pwm/pwm-stm32.c | ||
| +++ b/drivers/pwm/pwm-stm32.c | ||
| @@ -308,7 +308,7 @@ static int stm32_pwm_capture(struct pwm_chip *chip, struct pwm_device *pwm, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,10 +12,10 @@ Signed-off-by: Philipp Zabel <[email protected]> | |
| 1 file changed, 2 insertions(+), 15 deletions(-) | ||
|
|
||
| diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c | ||
| index c0ef1f3431b8..1ecbb4107816 100644 | ||
| index 009f9c1a5eca..cc6cae07c02c 100644 | ||
| --- a/drivers/pwm/pwm-stm32.c | ||
| +++ b/drivers/pwm/pwm-stm32.c | ||
| @@ -564,10 +564,9 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv) | ||
| @@ -563,10 +563,9 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv) | ||
| priv->have_complementary_output = (ccer != 0); | ||
| } | ||
|
|
||
|
|
@@ -27,7 +27,7 @@ index c0ef1f3431b8..1ecbb4107816 100644 | |
|
|
||
| /* | ||
| * If channels enable bits don't exist writing 1 will have no | ||
| @@ -577,19 +576,7 @@ static int stm32_pwm_detect_channels(struct stm32_pwm *priv) | ||
| @@ -576,19 +575,7 @@ static int stm32_pwm_detect_channels(struct stm32_pwm *priv) | ||
| regmap_read(priv->regmap, TIM_CCER, &ccer); | ||
| regmap_clear_bits(priv->regmap, TIM_CCER, TIM_CCER_CCXE); | ||
|
|
||
|
|
||
Oops, something went wrong.