diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-03-22 21:42:53 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-03-23 00:47:24 +0100 |
| commit | 3214a0f8f0b0e29a2ca4cc9b8c3d251fe2bc1bb0 (patch) | |
| tree | eb26be7c8afad1795cf564ecbf64eb7f72b66101 | |
| parent | dc4bef8cf8fa37eb0c581ba4c32a73cf27818e9d (diff) | |
| download | kernel_replicant_linux-replicant-11-i9300-modem-libgpiod.tar.gz kernel_replicant_linux-replicant-11-i9300-modem-libgpiod.tar.bz2 kernel_replicant_linux-replicant-11-i9300-modem-libgpiod.zip | |
Try to replace the gpiohack driverreplicant-11-i9300-modem-libgpiod
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-midas-3g.dtsi | 29 | ||||
| -rw-r--r-- | arch/arm/configs/replicant_defconfig | 2 | ||||
| -rw-r--r-- | drivers/gpio/gpio-aggregator.c | 1 |
3 files changed, 19 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/exynos4412-midas-3g.dtsi b/arch/arm/boot/dts/exynos4412-midas-3g.dtsi index f7a7ce703c9d..a24b323ed01f 100644 --- a/arch/arm/boot/dts/exynos4412-midas-3g.dtsi +++ b/arch/arm/boot/dts/exynos4412-midas-3g.dtsi @@ -91,19 +91,24 @@ }; xmm6262 { - compatible = "samsung,modem-ctl"; - cp-on-gpios = <&gpl2 5 GPIO_ACTIVE_HIGH>; - cp-reset-gpios = <&gpx3 2 GPIO_ACTIVE_HIGH>; - cp-dump-gpios = <&gpx1 2 GPIO_ACTIVE_HIGH>; - phone-active-gpios = <&gpx1 6 GPIO_ACTIVE_HIGH>; - reset-req-gpios = <&gpm3 3 GPIO_ACTIVE_HIGH>; - pda-active-gpios = <&gpf1 6 GPIO_ACTIVE_HIGH>; - link-active-gpios = <&gpf1 1 GPIO_ACTIVE_HIGH>; - link-slavewake-gpios = <&gpx1 0 GPIO_ACTIVE_HIGH>; - suspend-req-gpios = <&gpm2 4 GPIO_ACTIVE_HIGH>; + compatible = "samsung,modem-ctl"; + + gpios = <&gpl2 5 GPIO_ACTIVE_HIGH>, + <&gpx3 2 GPIO_ACTIVE_HIGH>, + <&gpx1 2 GPIO_ACTIVE_HIGH>, + <&gpx1 6 GPIO_ACTIVE_HIGH>, + <&gpm3 3 GPIO_ACTIVE_HIGH>, + <&gpf1 6 GPIO_ACTIVE_HIGH>, + <&gpf1 1 GPIO_ACTIVE_HIGH>, + <&gpx1 0 GPIO_ACTIVE_HIGH>, + <&gpm2 4 GPIO_ACTIVE_HIGH>; + + gpio-line-names = "cp-on", "cp-reset", "cp-dump", + "phone-active", "reset-req", "pda-active", + "link-active", "link-slavewake", + "suspend-req"; clocks = <&max77686 MAX77686_CLK_CP>; clock-names = "cp_clk"; - }; - + }; }; diff --git a/arch/arm/configs/replicant_defconfig b/arch/arm/configs/replicant_defconfig index fd579cbffef5..f4dfcaceedba 100644 --- a/arch/arm/configs/replicant_defconfig +++ b/arch/arm/configs/replicant_defconfig @@ -193,7 +193,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_SAMSUNG_MODEMCTL=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y @@ -260,6 +259,7 @@ CONFIG_SPI_GPIO=y CONFIG_SPI_S3C64XX=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_WM8994=y +CONFIG_GPIO_AGGREGATOR=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_POWER_SUPPLY=y CONFIG_BATTERY_SBS=y diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c index dfd8a4876a27..e7ff1ec63e55 100644 --- a/drivers/gpio/gpio-aggregator.c +++ b/drivers/gpio/gpio-aggregator.c @@ -545,6 +545,7 @@ static const struct of_device_id gpio_aggregator_dt_ids[] = { * Add GPIO-operated devices controlled from userspace below, * or use "driver_override" in sysfs */ + { .compatible = "samsung,modem-ctl" }, {}, }; MODULE_DEVICE_TABLE(of, gpio_aggregator_dt_ids); |