Skip to content

Commit 678e14c

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann: "The device tree changes this time are all for NXP i.MX platforms, addressing issues with clocks and regulators on i.MX7 and i.MX8. The old OMAP2 based Nokia N8x0 tablet get a couple of code fixes for regressions that came in. The ARM SCMI and FF-A firmware interfaces get a couple of minor bug fixes. A regression fix for RISC-V cache management addresses a problem with probe order on Sifive cores" * tag 'soc-fixes-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (23 commits) MAINTAINERS: Change Krzysztof Kozlowski's email address arm64: dts: imx8qm-ss-dma: fix can lpcg indices arm64: dts: imx8-ss-dma: fix can lpcg indices arm64: dts: imx8-ss-dma: fix adc lpcg indices arm64: dts: imx8-ss-dma: fix pwm lpcg indices arm64: dts: imx8-ss-dma: fix spi lpcg indices arm64: dts: imx8-ss-conn: fix usb lpcg indices arm64: dts: imx8-ss-lsio: fix pwm lpcg indices ARM: dts: imx7s-warp: Pass OV2680 link-frequencies ARM: dts: imx7-mba7: Use 'no-mmc' property arm64: dts: imx8-ss-conn: fix usdhc wrong lpcg clock order arm64: dts: freescale: imx8mp-venice-gw73xx-2x: fix USB vbus regulator arm64: dts: freescale: imx8mp-venice-gw72xx-2x: fix USB vbus regulator cache: sifive_ccache: Partially convert to a platform driver firmware: arm_scmi: Make raw debugfs entries non-seekable firmware: arm_scmi: Fix wrong fastchannel initialization firmware: arm_ffa: Fix the partition ID check in ffa_notification_info_get() ARM: OMAP2+: fix USB regression on Nokia N8x0 mmc: omap: restore original power up/down steps mmc: omap: fix deferred probe ...
2 parents c7c4e13 + 011d79e commit 678e14c

File tree

15 files changed

+158
-121
lines changed

15 files changed

+158
-121
lines changed

‎MAINTAINERS‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2707,7 +2707,7 @@ F: sound/soc/rockchip/
27072707
N: rockchip
27082708

27092709
ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
2710-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
2710+
M: Krzysztof Kozlowski <krzk@kernel.org>
27112711
R: Alim Akhtar <alim.akhtar@samsung.com>
27122712
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
27132713
L: linux-samsung-soc@vger.kernel.org
@@ -5555,7 +5555,7 @@ F: drivers/cpuidle/cpuidle-big_little.c
55555555
CPUIDLE DRIVER - ARM EXYNOS
55565556
M: Daniel Lezcano <daniel.lezcano@linaro.org>
55575557
M: Kukjin Kim <kgene@kernel.org>
5558-
R: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
5558+
R: Krzysztof Kozlowski <krzk@kernel.org>
55595559
L: linux-pm@vger.kernel.org
55605560
L: linux-samsung-soc@vger.kernel.org
55615561
S: Maintained
@@ -8994,7 +8994,7 @@ F: drivers/i2c/muxes/i2c-mux-gpio.c
89948994
F: include/linux/platform_data/i2c-mux-gpio.h
89958995

89968996
GENERIC GPIO RESET DRIVER
8997-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
8997+
M: Krzysztof Kozlowski <krzk@kernel.org>
89988998
S: Maintained
89998999
F: drivers/reset/reset-gpio.c
90009000

@@ -13289,7 +13289,7 @@ F: drivers/iio/adc/max11205.c
1328913289

1329013290
MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
1329113291
R: Iskren Chernev <iskren.chernev@gmail.com>
13292-
R: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
13292+
R: Krzysztof Kozlowski <krzk@kernel.org>
1329313293
R: Marek Szyprowski <m.szyprowski@samsung.com>
1329413294
R: Matheus Castello <matheus@castello.eng.br>
1329513295
L: linux-pm@vger.kernel.org
@@ -13299,7 +13299,7 @@ F: drivers/power/supply/max17040_battery.c
1329913299

1330013300
MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
1330113301
R: Hans de Goede <hdegoede@redhat.com>
13302-
R: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
13302+
R: Krzysztof Kozlowski <krzk@kernel.org>
1330313303
R: Marek Szyprowski <m.szyprowski@samsung.com>
1330413304
R: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
1330513305
R: Purism Kernel Team <kernel@puri.sm>
@@ -13357,7 +13357,7 @@ F: Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml
1335713357
F: drivers/power/supply/max77976_charger.c
1335813358

1335913359
MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
13360-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
13360+
M: Krzysztof Kozlowski <krzk@kernel.org>
1336113361
L: linux-pm@vger.kernel.org
1336213362
S: Maintained
1336313363
B: mailto:linux-samsung-soc@vger.kernel.org
@@ -13368,7 +13368,7 @@ F: drivers/power/supply/max77693_charger.c
1336813368

1336913369
MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
1337013370
M: Chanwoo Choi <cw00.choi@samsung.com>
13371-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
13371+
M: Krzysztof Kozlowski <krzk@kernel.org>
1337213372
L: linux-kernel@vger.kernel.org
1337313373
S: Maintained
1337413374
B: mailto:linux-samsung-soc@vger.kernel.org
@@ -14152,7 +14152,7 @@ F: mm/mm_init.c
1415214152
F: tools/testing/memblock/
1415314153

1415414154
MEMORY CONTROLLER DRIVERS
14155-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
14155+
M: Krzysztof Kozlowski <krzk@kernel.org>
1415614156
L: linux-kernel@vger.kernel.org
1415714157
S: Maintained
1415814158
B: mailto:krzysztof.kozlowski@linaro.org
@@ -15533,7 +15533,7 @@ F: include/uapi/linux/nexthop.h
1553315533
F: net/ipv4/nexthop.c
1553415534

1553515535
NFC SUBSYSTEM
15536-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
15536+
M: Krzysztof Kozlowski <krzk@kernel.org>
1553715537
L: netdev@vger.kernel.org
1553815538
S: Maintained
1553915539
F: Documentation/devicetree/bindings/net/nfc/
@@ -15910,7 +15910,7 @@ F: Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
1591015910
F: drivers/regulator/pf8x00-regulator.c
1591115911

1591215912
NXP PTN5150A CC LOGIC AND EXTCON DRIVER
15913-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
15913+
M: Krzysztof Kozlowski <krzk@kernel.org>
1591415914
L: linux-kernel@vger.kernel.org
1591515915
S: Maintained
1591615916
F: Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@ -16521,7 +16521,7 @@ K: of_overlay_remove
1652116521

1652216522
OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
1652316523
M: Rob Herring <robh@kernel.org>
16524-
M: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
16524+
M: Krzysztof Kozlowski <krzk+dt@kernel.org>
1652516525
M: Conor Dooley <conor+dt@kernel.org>
1652616526
L: devicetree@vger.kernel.org
1652716527
S: Maintained
@@ -17478,7 +17478,7 @@ F: Documentation/devicetree/bindings/pinctrl/renesas,*
1747817478
F: drivers/pinctrl/renesas/
1747917479

1748017480
PIN CONTROLLER - SAMSUNG
17481-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
17481+
M: Krzysztof Kozlowski <krzk@kernel.org>
1748217482
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
1748317483
R: Alim Akhtar <alim.akhtar@samsung.com>
1748417484
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -19446,7 +19446,7 @@ F: Documentation/devicetree/bindings/sound/samsung*
1944619446
F: sound/soc/samsung/
1944719447

1944819448
SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
19449-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
19449+
M: Krzysztof Kozlowski <krzk@kernel.org>
1945019450
L: linux-crypto@vger.kernel.org
1945119451
L: linux-samsung-soc@vger.kernel.org
1945219452
S: Maintained
@@ -19481,7 +19481,7 @@ S: Maintained
1948119481
F: drivers/platform/x86/samsung-laptop.c
1948219482

1948319483
SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
19484-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
19484+
M: Krzysztof Kozlowski <krzk@kernel.org>
1948519485
L: linux-kernel@vger.kernel.org
1948619486
L: linux-samsung-soc@vger.kernel.org
1948719487
S: Maintained
@@ -19507,7 +19507,7 @@ F: drivers/media/platform/samsung/s3c-camif/
1950719507
F: include/media/drv-intf/s3c_camif.h
1950819508

1950919509
SAMSUNG S3FWRN5 NFC DRIVER
19510-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
19510+
M: Krzysztof Kozlowski <krzk@kernel.org>
1951119511
S: Maintained
1951219512
F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
1951319513
F: drivers/nfc/s3fwrn5
@@ -19528,7 +19528,7 @@ S: Supported
1952819528
F: drivers/media/i2c/s5k5baf.c
1952919529

1953019530
SAMSUNG S5P Security SubSystem (SSS) DRIVER
19531-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
19531+
M: Krzysztof Kozlowski <krzk@kernel.org>
1953219532
M: Vladimir Zapolskiy <vz@mleia.com>
1953319533
L: linux-crypto@vger.kernel.org
1953419534
L: linux-samsung-soc@vger.kernel.org
@@ -19550,7 +19550,7 @@ F: Documentation/devicetree/bindings/media/samsung,fimc.yaml
1955019550
F: drivers/media/platform/samsung/exynos4-is/
1955119551

1955219552
SAMSUNG SOC CLOCK DRIVERS
19553-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
19553+
M: Krzysztof Kozlowski <krzk@kernel.org>
1955419554
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
1955519555
M: Chanwoo Choi <cw00.choi@samsung.com>
1955619556
R: Alim Akhtar <alim.akhtar@samsung.com>
@@ -19582,7 +19582,7 @@ F: drivers/net/ethernet/samsung/sxgbe/
1958219582

1958319583
SAMSUNG THERMAL DRIVER
1958419584
M: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
19585-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
19585+
M: Krzysztof Kozlowski <krzk@kernel.org>
1958619586
L: linux-pm@vger.kernel.org
1958719587
L: linux-samsung-soc@vger.kernel.org
1958819588
S: Maintained
@@ -23779,7 +23779,7 @@ S: Orphan
2377923779
F: drivers/mmc/host/vub300.c
2378023780

2378123781
W1 DALLAS'S 1-WIRE BUS
23782-
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
23782+
M: Krzysztof Kozlowski <krzk@kernel.org>
2378323783
S: Maintained
2378423784
F: Documentation/devicetree/bindings/w1/
2378523785
F: Documentation/w1/

‎arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@
666666
bus-width = <4>;
667667
no-1-8-v;
668668
no-sdio;
669-
no-emmc;
669+
no-mmc;
670670
status = "okay";
671671
};
672672

‎arch/arm/boot/dts/nxp/imx/imx7s-warp.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@
210210
remote-endpoint = <&mipi_from_sensor>;
211211
clock-lanes = <0>;
212212
data-lanes = <1>;
213+
link-frequencies = /bits/ 64 <330000000>;
213214
};
214215
};
215216
};

‎arch/arm/mach-omap2/board-n8x0.c‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,8 @@ static struct musb_hdrc_platform_data tusb_data = {
7979
static struct gpiod_lookup_table tusb_gpio_table = {
8080
.dev_id = "musb-tusb",
8181
.table = {
82-
GPIO_LOOKUP("gpio-0-15", 0, "enable",
83-
GPIO_ACTIVE_HIGH),
84-
GPIO_LOOKUP("gpio-48-63", 10, "int",
85-
GPIO_ACTIVE_HIGH),
82+
GPIO_LOOKUP("gpio-0-31", 0, "enable", GPIO_ACTIVE_HIGH),
83+
GPIO_LOOKUP("gpio-32-63", 26, "int", GPIO_ACTIVE_HIGH),
8684
{ }
8785
},
8886
};
@@ -140,25 +138,24 @@ static int slot1_cover_open;
140138
static int slot2_cover_open;
141139
static struct device *mmc_device;
142140

143-
static struct gpiod_lookup_table nokia8xx_mmc_gpio_table = {
141+
static struct gpiod_lookup_table nokia800_mmc_gpio_table = {
144142
.dev_id = "mmci-omap.0",
145143
.table = {
146144
/* Slot switch, GPIO 96 */
147-
GPIO_LOOKUP("gpio-80-111", 16,
148-
"switch", GPIO_ACTIVE_HIGH),
145+
GPIO_LOOKUP("gpio-96-127", 0, "switch", GPIO_ACTIVE_HIGH),
149146
{ }
150147
},
151148
};
152149

153150
static struct gpiod_lookup_table nokia810_mmc_gpio_table = {
154151
.dev_id = "mmci-omap.0",
155152
.table = {
153+
/* Slot switch, GPIO 96 */
154+
GPIO_LOOKUP("gpio-96-127", 0, "switch", GPIO_ACTIVE_HIGH),
156155
/* Slot index 1, VSD power, GPIO 23 */
157-
GPIO_LOOKUP_IDX("gpio-16-31", 7,
158-
"vsd", 1, GPIO_ACTIVE_HIGH),
156+
GPIO_LOOKUP_IDX("gpio-0-31", 23, "vsd", 1, GPIO_ACTIVE_HIGH),
159157
/* Slot index 1, VIO power, GPIO 9 */
160-
GPIO_LOOKUP_IDX("gpio-0-15", 9,
161-
"vio", 1, GPIO_ACTIVE_HIGH),
158+
GPIO_LOOKUP_IDX("gpio-0-31", 9, "vio", 1, GPIO_ACTIVE_HIGH),
162159
{ }
163160
},
164161
};
@@ -415,8 +412,6 @@ static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC];
415412

416413
static void __init n8x0_mmc_init(void)
417414
{
418-
gpiod_add_lookup_table(&nokia8xx_mmc_gpio_table);
419-
420415
if (board_is_n810()) {
421416
mmc1_data.slots[0].name = "external";
422417

@@ -429,6 +424,8 @@ static void __init n8x0_mmc_init(void)
429424
mmc1_data.slots[1].name = "internal";
430425
mmc1_data.slots[1].ban_openended = 1;
431426
gpiod_add_lookup_table(&nokia810_mmc_gpio_table);
427+
} else {
428+
gpiod_add_lookup_table(&nokia800_mmc_gpio_table);
432429
}
433430

434431
mmc1_data.nr_slots = 2;

‎arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ conn_subsys: bus@5b000000 {
4141
interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
4242
fsl,usbphy = <&usbphy1>;
4343
fsl,usbmisc = <&usbmisc1 0>;
44-
clocks = <&usb2_lpcg 0>;
44+
clocks = <&usb2_lpcg IMX_LPCG_CLK_6>;
4545
ahb-burst-config = <0x0>;
4646
tx-burst-size-dword = <0x10>;
4747
rx-burst-size-dword = <0x10>;
@@ -58,7 +58,7 @@ conn_subsys: bus@5b000000 {
5858
usbphy1: usbphy@5b100000 {
5959
compatible = "fsl,imx7ulp-usbphy";
6060
reg = <0x5b100000 0x1000>;
61-
clocks = <&usb2_lpcg 1>;
61+
clocks = <&usb2_lpcg IMX_LPCG_CLK_7>;
6262
power-domains = <&pd IMX_SC_R_USB_0_PHY>;
6363
status = "disabled";
6464
};
@@ -67,8 +67,8 @@ conn_subsys: bus@5b000000 {
6767
interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>;
6868
reg = <0x5b010000 0x10000>;
6969
clocks = <&sdhc0_lpcg IMX_LPCG_CLK_4>,
70-
<&sdhc0_lpcg IMX_LPCG_CLK_0>,
71-
<&sdhc0_lpcg IMX_LPCG_CLK_5>;
70+
<&sdhc0_lpcg IMX_LPCG_CLK_5>,
71+
<&sdhc0_lpcg IMX_LPCG_CLK_0>;
7272
clock-names = "ipg", "ahb", "per";
7373
power-domains = <&pd IMX_SC_R_SDHC_0>;
7474
status = "disabled";
@@ -78,8 +78,8 @@ conn_subsys: bus@5b000000 {
7878
interrupts = <GIC_SPI 233 IRQ_TYPE_LEVEL_HIGH>;
7979
reg = <0x5b020000 0x10000>;
8080
clocks = <&sdhc1_lpcg IMX_LPCG_CLK_4>,
81-
<&sdhc1_lpcg IMX_LPCG_CLK_0>,
82-
<&sdhc1_lpcg IMX_LPCG_CLK_5>;
81+
<&sdhc1_lpcg IMX_LPCG_CLK_5>,
82+
<&sdhc1_lpcg IMX_LPCG_CLK_0>;
8383
clock-names = "ipg", "ahb", "per";
8484
power-domains = <&pd IMX_SC_R_SDHC_1>;
8585
fsl,tuning-start-tap = <20>;
@@ -91,8 +91,8 @@ conn_subsys: bus@5b000000 {
9191
interrupts = <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;
9292
reg = <0x5b030000 0x10000>;
9393
clocks = <&sdhc2_lpcg IMX_LPCG_CLK_4>,
94-
<&sdhc2_lpcg IMX_LPCG_CLK_0>,
95-
<&sdhc2_lpcg IMX_LPCG_CLK_5>;
94+
<&sdhc2_lpcg IMX_LPCG_CLK_5>,
95+
<&sdhc2_lpcg IMX_LPCG_CLK_0>;
9696
clock-names = "ipg", "ahb", "per";
9797
power-domains = <&pd IMX_SC_R_SDHC_2>;
9898
status = "disabled";

0 commit comments

Comments
 (0)