tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
"We've been sitting on fixes for a while, and they keep trickling in at
a low rate. Nothing in here comes across as particularly scary or
noteworthy, for the most part it's a large collection of small DT
tweaks"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (24 commits)
ARM: dts: da850-evm: fix read access to SPI flash
ARM: dts: omap3: Fix Card Detect and Write Protect on Logic PD SOM-LV
ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS
ARM: dts: OMAP5 / DRA7: indicate that SATA port 0 is available.
ARM: dts: NSP: Fix DT ranges error
ARM: multi_v7_defconfig: set bcm47xx watchdog
ARM: multi_v7_defconfig: fix config typo
ARM: dts: dra72-evm-revc: fix typo in ethernet-phy node
soc: ti: wkup_m3_ipc: Fix error return code in wkup_m3_ipc_probe()
ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation
ARM: dts: sunxi: Change node name for pwrseq pin on Olinuxino-lime2-emmc
ARM: dts: sun8i: Support DTB build for NanoPi M1
ARM: dts: sun6i: hummingbird: Enable display engine again
ARM: dts: sun6i: Disable display pipeline by default
ARM, ARM64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 3
ARM: dts: imx6qdl-nitrogen6_som2: fix sgtl5000 pinctrl init
ARM: dts: imx6qdl-nitrogen6_max: fix sgtl5000 pinctrl init
ARM: OMAP1: DMA: Correct the number of logical channels
ARM: dts: am335x-icev2: Remove the duplicated pinmux setting
ARM: OMAP2+: Fix WL1283 Bluetooth Baud Rate
...

Linus Torvalds 44b4b461 6e0362b3

+47 -40
+1
MAINTAINERS
··· 1690 1690 R: Javier Martinez Canillas <javier@osg.samsung.com> 1691 1691 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1692 1692 L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) 1693 + Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/ 1693 1694 S: Maintained 1694 1695 F: arch/arm/boot/dts/s3c* 1695 1696 F: arch/arm/boot/dts/s5p*
+1
arch/arm/boot/dts/Makefile
··· 846 846 sun8i-a83t-allwinner-h8homlet-v2.dtb \ 847 847 sun8i-a83t-cubietruck-plus.dtb \ 848 848 sun8i-h3-bananapi-m2-plus.dtb \ 849 + sun8i-h3-nanopi-m1.dtb \ 849 850 sun8i-h3-nanopi-neo.dtb \ 850 851 sun8i-h3-orangepi-2.dtb \ 851 852 sun8i-h3-orangepi-lite.dtb \
-1
arch/arm/boot/dts/am335x-icev2.dts
··· 170 170 AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0) /* (G16) mmc0_dat0.mmc0_dat0 */ 171 171 AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0) /* (G17) mmc0_clk.mmc0_clk */ 172 172 AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0) /* (G18) mmc0_cmd.mmc0_cmd */ 173 - AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE5) /* (C15) spi0_cs1.mmc0_sdcd */ 174 173 >; 175 174 }; 176 175
+1 -1
arch/arm/boot/dts/bcm-nsp.dtsi
··· 160 160 161 161 axi { 162 162 compatible = "simple-bus"; 163 - ranges = <0x00000000 0x18000000 0x0011c40a>; 163 + ranges = <0x00000000 0x18000000 0x0011c40c>; 164 164 #address-cells = <1>; 165 165 #size-cells = <1>; 166 166
+1
arch/arm/boot/dts/da850-evm.dts
··· 99 99 #size-cells = <1>; 100 100 compatible = "m25p64"; 101 101 spi-max-frequency = <30000000>; 102 + m25p,fast-read; 102 103 reg = <0>; 103 104 partition@0 { 104 105 label = "U-Boot-SPL";
+1
arch/arm/boot/dts/dra7.dtsi
··· 1378 1378 phy-names = "sata-phy"; 1379 1379 clocks = <&sata_ref_clk>; 1380 1380 ti,hwmods = "sata"; 1381 + ports-implemented = <0x1>; 1381 1382 }; 1382 1383 1383 1384 rtc: rtc@48838000 {
+1 -1
arch/arm/boot/dts/dra72-evm-revc.dts
··· 75 75 ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>; 76 76 ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>; 77 77 ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>; 78 - ti,min-output-imepdance; 78 + ti,min-output-impedance; 79 79 }; 80 80 };
+2 -2
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
··· 319 319 compatible = "fsl,imx6q-nitrogen6_max-sgtl5000", 320 320 "fsl,imx-audio-sgtl5000"; 321 321 model = "imx6q-nitrogen6_max-sgtl5000"; 322 - pinctrl-names = "default"; 323 - pinctrl-0 = <&pinctrl_sgtl5000>; 324 322 ssi-controller = <&ssi1>; 325 323 audio-codec = <&codec>; 326 324 audio-routing = ··· 400 402 401 403 codec: sgtl5000@0a { 402 404 compatible = "fsl,sgtl5000"; 405 + pinctrl-names = "default"; 406 + pinctrl-0 = <&pinctrl_sgtl5000>; 403 407 reg = <0x0a>; 404 408 clocks = <&clks IMX6QDL_CLK_CKO>; 405 409 VDDA-supply = <&reg_2p5v>;
+2 -2
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
··· 250 250 compatible = "fsl,imx6q-nitrogen6_som2-sgtl5000", 251 251 "fsl,imx-audio-sgtl5000"; 252 252 model = "imx6q-nitrogen6_som2-sgtl5000"; 253 - pinctrl-names = "default"; 254 - pinctrl-0 = <&pinctrl_sgtl5000>; 255 253 ssi-controller = <&ssi1>; 256 254 audio-codec = <&codec>; 257 255 audio-routing = ··· 318 320 319 321 codec: sgtl5000@0a { 320 322 compatible = "fsl,sgtl5000"; 323 + pinctrl-names = "default"; 324 + pinctrl-0 = <&pinctrl_sgtl5000>; 321 325 reg = <0x0a>; 322 326 clocks = <&clks IMX6QDL_CLK_CKO>; 323 327 VDDA-supply = <&reg_2p5v>;
+3 -8
arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts
··· 158 158 &mmc1 { 159 159 interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; 160 160 pinctrl-names = "default"; 161 - pinctrl-0 = <&mmc1_pins &mmc1_cd>; 161 + pinctrl-0 = <&mmc1_pins>; 162 162 wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */ 163 163 cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>; /* gpio_110 */ 164 164 vmmc-supply = <&vmmc1>; ··· 193 193 OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */ 194 194 OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */ 195 195 OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */ 196 - OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_strobe.gpio_126 sdmmc1_wp*/ 196 + OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_strobe.gpio_126 */ 197 + OMAP3_CORE1_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_d11.gpio_110 */ 197 198 >; 198 199 }; 199 200 ··· 241 240 backlight_pins: pinmux_backlight_pins { 242 241 pinctrl-single,pins = < 243 242 OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4) /* sys_boot6.gpio_8 */ 244 - >; 245 - }; 246 - 247 - mmc1_cd: pinmux_mmc1_cd { 248 - pinctrl-single,pins = < 249 - OMAP3_WKUP_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_d11.gpio_110 */ 250 243 >; 251 244 }; 252 245 };
+1
arch/arm/boot/dts/omap5.dtsi
··· 988 988 phy-names = "sata-phy"; 989 989 clocks = <&sata_ref_clk>; 990 990 ti,hwmods = "sata"; 991 + ports-implemented = <0x1>; 991 992 }; 992 993 993 994 dss: dss@58000000 {
+1 -1
arch/arm/boot/dts/qcom-mdm9615.dtsi
··· 357 357 }; 358 358 359 359 amba { 360 - compatible = "arm,amba-bus"; 360 + compatible = "simple-bus"; 361 361 #address-cells = <1>; 362 362 #size-cells = <1>; 363 363 ranges;
+4
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
··· 140 140 cpu-supply = <&reg_dcdc3>; 141 141 }; 142 142 143 + &de { 144 + status = "okay"; 145 + }; 146 + 143 147 &ehci0 { 144 148 status = "okay"; 145 149 };
+1
arch/arm/boot/dts/sun6i-a31.dtsi
··· 234 234 de: display-engine { 235 235 compatible = "allwinner,sun6i-a31-display-engine"; 236 236 allwinner,pipelines = <&fe0>; 237 + status = "disabled"; 237 238 }; 238 239 239 240 soc@01c00000 {
+1 -1
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
··· 56 56 }; 57 57 58 58 &pio { 59 - mmc2_pins_nrst: mmc2@0 { 59 + mmc2_pins_nrst: mmc2-rst-pin { 60 60 allwinner,pins = "PC16"; 61 61 allwinner,function = "gpio_out"; 62 62 allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+2 -2
arch/arm/configs/multi_v7_defconfig
··· 471 471 CONFIG_DW_WATCHDOG=y 472 472 CONFIG_DIGICOLOR_WATCHDOG=y 473 473 CONFIG_BCM2835_WDT=y 474 - CONFIG_BCM47XX_WATCHDOG=y 474 + CONFIG_BCM47XX_WDT=y 475 475 CONFIG_BCM7038_WDT=m 476 476 CONFIG_BCM_KONA_WDT=y 477 477 CONFIG_MFD_ACT8945A=y ··· 893 893 CONFIG_RASPBERRYPI_FIRMWARE=y 894 894 CONFIG_EFI_VARS=m 895 895 CONFIG_EFI_CAPSULE_LOADER=m 896 - CONFIG_CONFIG_BCM47XX_NVRAM=y 896 + CONFIG_BCM47XX_NVRAM=y 897 897 CONFIG_BCM47XX_SPROM=y 898 898 CONFIG_EXT4_FS=y 899 899 CONFIG_AUTOFS4_FS=y
+3 -3
arch/arm/configs/s3c2410_defconfig
··· 86 86 CONFIG_NETFILTER=y 87 87 CONFIG_NF_CONNTRACK=m 88 88 CONFIG_NF_CONNTRACK_EVENTS=y 89 - CONFIG_NF_CT_PROTO_DCCP=m 90 - CONFIG_NF_CT_PROTO_SCTP=m 91 - CONFIG_NF_CT_PROTO_UDPLITE=m 89 + CONFIG_NF_CT_PROTO_DCCP=y 90 + CONFIG_NF_CT_PROTO_SCTP=y 91 + CONFIG_NF_CT_PROTO_UDPLITE=y 92 92 CONFIG_NF_CONNTRACK_AMANDA=m 93 93 CONFIG_NF_CONNTRACK_FTP=m 94 94 CONFIG_NF_CONNTRACK_H323=m
+7 -9
arch/arm/mach-omap1/dma.c
··· 32 32 #include "soc.h" 33 33 34 34 #define OMAP1_DMA_BASE (0xfffed800) 35 - #define OMAP1_LOGICAL_DMA_CH_COUNT 17 36 35 37 36 static u32 enable_1510_mode; 38 37 ··· 347 348 goto exit_iounmap; 348 349 } 349 350 350 - d->lch_count = OMAP1_LOGICAL_DMA_CH_COUNT; 351 - 352 351 /* Valid attributes for omap1 plus processors */ 353 352 if (cpu_is_omap15xx()) 354 353 d->dev_caps = ENABLE_1510_MODE; ··· 363 366 d->dev_caps |= CLEAR_CSR_ON_READ; 364 367 d->dev_caps |= IS_WORD_16; 365 368 366 - if (cpu_is_omap15xx()) 367 - d->chan_count = 9; 368 - else if (cpu_is_omap16xx() || cpu_is_omap7xx()) { 369 - if (!(d->dev_caps & ENABLE_1510_MODE)) 370 - d->chan_count = 16; 369 + /* available logical channels */ 370 + if (cpu_is_omap15xx()) { 371 + d->lch_count = 9; 372 + } else { 373 + if (d->dev_caps & ENABLE_1510_MODE) 374 + d->lch_count = 9; 371 375 else 372 - d->chan_count = 9; 376 + d->lch_count = 16; 373 377 } 374 378 375 379 p = dma_plat_info;
+1 -1
arch/arm/mach-omap2/pdata-quirks.c
··· 161 161 .nshutdown_gpio = 162, 162 162 .dev_name = "/dev/ttyO1", 163 163 .flow_cntrl = 1, 164 - .baud_rate = 300000, 164 + .baud_rate = 3000000, 165 165 }; 166 166 167 167 static struct platform_device wl128x_device = {
+2 -2
arch/arm/mach-ux500/pm.c
··· 134 134 */ 135 135 bool prcmu_is_cpu_in_wfi(int cpu) 136 136 { 137 - return readl(PRCM_ARM_WFI_STANDBY) & cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : 138 - PRCM_ARM_WFI_STANDBY_WFI0; 137 + return readl(PRCM_ARM_WFI_STANDBY) & 138 + (cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : PRCM_ARM_WFI_STANDBY_WFI0); 139 139 } 140 140 141 141 /*
+4
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
··· 137 137 }; 138 138 }; 139 139 140 + &scpi_clocks { 141 + status = "disabled"; 142 + }; 143 + 140 144 &uart_AO { 141 145 status = "okay"; 142 146 pinctrl-0 = <&uart_ao_a_pins>;
+1 -1
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
··· 55 55 mboxes = <&mailbox 1 &mailbox 2>; 56 56 shmem = <&cpu_scp_lpri &cpu_scp_hpri>; 57 57 58 - clocks { 58 + scpi_clocks: clocks { 59 59 compatible = "arm,scpi-clocks"; 60 60 61 61 scpi_dvfs: scpi_clocks@0 {
+1 -1
arch/arm64/boot/dts/exynos/exynos5433.dtsi
··· 1367 1367 }; 1368 1368 1369 1369 amba { 1370 - compatible = "arm,amba-bus"; 1370 + compatible = "simple-bus"; 1371 1371 #address-cells = <1>; 1372 1372 #size-cells = <1>; 1373 1373 ranges;
+1 -1
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
··· 27 27 stdout-path = "serial0:115200n8"; 28 28 }; 29 29 30 - memory { 30 + memory@0 { 31 31 device_type = "memory"; 32 32 reg = <0x0 0x0 0x0 0x40000000>; 33 33 };
+3 -3
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
··· 72 72 <1 10 0xf08>; 73 73 }; 74 74 75 - amba_apu { 75 + amba_apu: amba_apu@0 { 76 76 compatible = "simple-bus"; 77 77 #address-cells = <2>; 78 78 #size-cells = <1>; ··· 175 175 }; 176 176 177 177 i2c0: i2c@ff020000 { 178 - compatible = "cdns,i2c-r1p10"; 178 + compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10"; 179 179 status = "disabled"; 180 180 interrupt-parent = <&gic>; 181 181 interrupts = <0 17 4>; ··· 185 185 }; 186 186 187 187 i2c1: i2c@ff030000 { 188 - compatible = "cdns,i2c-r1p10"; 188 + compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10"; 189 189 status = "disabled"; 190 190 interrupt-parent = <&gic>; 191 191 interrupts = <0 18 4>;
+1
drivers/soc/ti/wkup_m3_ipc.c
··· 459 459 460 460 if (IS_ERR(task)) { 461 461 dev_err(dev, "can't create rproc_boot thread\n"); 462 + ret = PTR_ERR(task); 462 463 goto err_put_rproc; 463 464 } 464 465