Skip to content

Commit d0ac5d8

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-for-linus' 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 our fixes branch for a while, so this batch is unfortunately on the large side. A lot of these are tweaks and fixes to device trees, fixing various bugs around clocks, reg ranges, etc. There's also a few defconfig updates (which are on the late side, no more of those). All in all the diffstat is bigger than ideal at this time, but nothing in here seems particularly risky" * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits) reset: sunxi: fix spinlock initialization ARM: dts: disable CCI on exynos5420 based arndale-octa drivers: bus: check cci device tree node status ARM: rockchip: disable jtag/sdmmc autoswitching on rk3288 ARM: nomadik: fix up leftover device tree pins ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree ARM: at91/dt: sam9263: Add missing clocks to lcdc node ARM: at91: sama5d3: dt: correct the sound route ARM: at91/dt: sama5d4: fix the timer reg length ARM: exynos_defconfig: Enable LM90 driver ARM: exynos_defconfig: Enable options for display panel support arm: dts: Use pmu_system_controller phandle for dp phy ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances ARM: dts: berlin: correct BG2Q's SM GPIO location. ARM: dts: berlin: add broken-cd and set bus width for eMMC in Marvell DMP DT ARM: dts: berlin: fix io clk and add missing core clk for BG2Q sdhci2 host ARM: dts: Revert disabling of smc91x for n900 ARM: dts: imx51-babbage: Fix ULPI PHY reset modelling ARM: dts: dra7-evm: fix qspi device tree partition size ARM: omap2plus_defconfig: use CONFIG_CPUFREQ_DT ...
2 parents 12ba857 + 966903a commit d0ac5d8

32 files changed

+272
-80
lines changed

‎arch/arm/boot/dts/at91sam9263.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,8 @@
953953
interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;
954954
pinctrl-names = "default";
955955
pinctrl-0 = <&pinctrl_fb>;
956+
clocks = <&lcd_clk>, <&lcd_clk>;
957+
clock-names = "lcdc_clk", "hclk";
956958
status = "disabled";
957959
};
958960

‎arch/arm/boot/dts/berlin2q-marvell-dmp.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
};
6666

6767
&sdhci2 {
68+
broken-cd;
69+
bus-width = <8>;
6870
non-removable;
6971
status = "okay";
7072
};

‎arch/arm/boot/dts/berlin2q.dtsi

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@
8383
compatible = "mrvl,pxav3-mmc";
8484
reg = <0xab1000 0x200>;
8585
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
86-
clocks = <&chip CLKID_SDIO1XIN>;
86+
clocks = <&chip CLKID_NFC_ECC>, <&chip CLKID_NFC>;
87+
clock-names = "io", "core";
8788
status = "disabled";
8889
};
8990

@@ -348,36 +349,6 @@
348349
interrupt-parent = <&gic>;
349350
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
350351
};
351-
352-
gpio4: gpio@5000 {
353-
compatible = "snps,dw-apb-gpio";
354-
reg = <0x5000 0x400>;
355-
#address-cells = <1>;
356-
#size-cells = <0>;
357-
358-
porte: gpio-port@4 {
359-
compatible = "snps,dw-apb-gpio-port";
360-
gpio-controller;
361-
#gpio-cells = <2>;
362-
snps,nr-gpios = <32>;
363-
reg = <0>;
364-
};
365-
};
366-
367-
gpio5: gpio@c000 {
368-
compatible = "snps,dw-apb-gpio";
369-
reg = <0xc000 0x400>;
370-
#address-cells = <1>;
371-
#size-cells = <0>;
372-
373-
portf: gpio-port@5 {
374-
compatible = "snps,dw-apb-gpio-port";
375-
gpio-controller;
376-
#gpio-cells = <2>;
377-
snps,nr-gpios = <32>;
378-
reg = <0>;
379-
};
380-
};
381352
};
382353

383354
chip: chip-control@ea0000 {
@@ -466,6 +437,21 @@
466437
ranges = <0 0xfc0000 0x10000>;
467438
interrupt-parent = <&sic>;
468439

440+
sm_gpio1: gpio@5000 {
441+
compatible = "snps,dw-apb-gpio";
442+
reg = <0x5000 0x400>;
443+
#address-cells = <1>;
444+
#size-cells = <0>;
445+
446+
portf: gpio-port@5 {
447+
compatible = "snps,dw-apb-gpio-port";
448+
gpio-controller;
449+
#gpio-cells = <2>;
450+
snps,nr-gpios = <32>;
451+
reg = <0>;
452+
};
453+
};
454+
469455
i2c2: i2c@7000 {
470456
compatible = "snps,designware-i2c";
471457
#address-cells = <1>;
@@ -516,6 +502,21 @@
516502
status = "disabled";
517503
};
518504

505+
sm_gpio0: gpio@c000 {
506+
compatible = "snps,dw-apb-gpio";
507+
reg = <0xc000 0x400>;
508+
#address-cells = <1>;
509+
#size-cells = <0>;
510+
511+
porte: gpio-port@4 {
512+
compatible = "snps,dw-apb-gpio-port";
513+
gpio-controller;
514+
#gpio-cells = <2>;
515+
snps,nr-gpios = <32>;
516+
reg = <0>;
517+
};
518+
};
519+
519520
sysctrl: pin-controller@d000 {
520521
compatible = "marvell,berlin2q-system-ctrl";
521522
reg = <0xd000 0x100>;

‎arch/arm/boot/dts/dra7-evm.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -499,23 +499,23 @@
499499
};
500500
partition@5 {
501501
label = "QSPI.u-boot-spl-os";
502-
reg = <0x00140000 0x00010000>;
502+
reg = <0x00140000 0x00080000>;
503503
};
504504
partition@6 {
505505
label = "QSPI.u-boot-env";
506-
reg = <0x00150000 0x00010000>;
506+
reg = <0x001c0000 0x00010000>;
507507
};
508508
partition@7 {
509509
label = "QSPI.u-boot-env.backup1";
510-
reg = <0x00160000 0x0010000>;
510+
reg = <0x001d0000 0x0010000>;
511511
};
512512
partition@8 {
513513
label = "QSPI.kernel";
514-
reg = <0x00170000 0x0800000>;
514+
reg = <0x001e0000 0x0800000>;
515515
};
516516
partition@9 {
517517
label = "QSPI.file-system";
518-
reg = <0x00970000 0x01690000>;
518+
reg = <0x009e0000 0x01620000>;
519519
};
520520
};
521521
};

‎arch/arm/boot/dts/exynos5250.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@
736736

737737
dp_phy: video-phy@10040720 {
738738
compatible = "samsung,exynos5250-dp-video-phy";
739-
reg = <0x10040720 4>;
739+
samsung,pmu-syscon = <&pmu_system_controller>;
740740
#phy-cells = <0>;
741741
};
742742

‎arch/arm/boot/dts/exynos5420-arndale-octa.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,3 +372,7 @@
372372
&usbdrd_dwc3_1 {
373373
dr_mode = "host";
374374
};
375+
376+
&cci {
377+
status = "disabled";
378+
};

‎arch/arm/boot/dts/exynos5420.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
};
121121
};
122122

123-
cci@10d20000 {
123+
cci: cci@10d20000 {
124124
compatible = "arm,cci-400";
125125
#address-cells = <1>;
126126
#size-cells = <1>;
@@ -503,8 +503,8 @@
503503
};
504504

505505
dp_phy: video-phy@10040728 {
506-
compatible = "samsung,exynos5250-dp-video-phy";
507-
reg = <0x10040728 4>;
506+
compatible = "samsung,exynos5420-dp-video-phy";
507+
samsung,pmu-syscon = <&pmu_system_controller>;
508508
#phy-cells = <0>;
509509
};
510510

‎arch/arm/boot/dts/imx25.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
#size-cells = <0>;
163163
compatible = "fsl,imx25-cspi", "fsl,imx35-cspi";
164164
reg = <0x43fa4000 0x4000>;
165-
clocks = <&clks 62>, <&clks 62>;
165+
clocks = <&clks 78>, <&clks 78>;
166166
clock-names = "ipg", "per";
167167
interrupts = <14>;
168168
status = "disabled";

‎arch/arm/boot/dts/imx51-babbage.dts

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -127,24 +127,12 @@
127127
#address-cells = <1>;
128128
#size-cells = <0>;
129129

130-
reg_usbh1_vbus: regulator@0 {
131-
compatible = "regulator-fixed";
132-
pinctrl-names = "default";
133-
pinctrl-0 = <&pinctrl_usbh1reg>;
134-
reg = <0>;
135-
regulator-name = "usbh1_vbus";
136-
regulator-min-microvolt = <5000000>;
137-
regulator-max-microvolt = <5000000>;
138-
gpio = <&gpio2 5 GPIO_ACTIVE_HIGH>;
139-
enable-active-high;
140-
};
141-
142-
reg_usbotg_vbus: regulator@1 {
130+
reg_hub_reset: regulator@0 {
143131
compatible = "regulator-fixed";
144132
pinctrl-names = "default";
145133
pinctrl-0 = <&pinctrl_usbotgreg>;
146-
reg = <1>;
147-
regulator-name = "usbotg_vbus";
134+
reg = <0>;
135+
regulator-name = "hub_reset";
148136
regulator-min-microvolt = <5000000>;
149137
regulator-max-microvolt = <5000000>;
150138
gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
@@ -176,6 +164,7 @@
176164
reg = <0>;
177165
clocks = <&clks IMX5_CLK_DUMMY>;
178166
clock-names = "main_clk";
167+
reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
179168
};
180169
};
181170
};
@@ -419,7 +408,7 @@
419408
&usbh1 {
420409
pinctrl-names = "default";
421410
pinctrl-0 = <&pinctrl_usbh1>;
422-
vbus-supply = <&reg_usbh1_vbus>;
411+
vbus-supply = <&reg_hub_reset>;
423412
fsl,usbphy = <&usbh1phy>;
424413
phy_type = "ulpi";
425414
status = "okay";
@@ -429,7 +418,6 @@
429418
dr_mode = "otg";
430419
disable-over-current;
431420
phy_type = "utmi_wide";
432-
vbus-supply = <&reg_usbotg_vbus>;
433421
status = "okay";
434422
};
435423

‎arch/arm/boot/dts/imx6qdl.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,8 @@
335335
vpu: vpu@02040000 {
336336
compatible = "cnm,coda960";
337337
reg = <0x02040000 0x3c000>;
338-
interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>,
339-
<0 12 IRQ_TYPE_LEVEL_HIGH>;
338+
interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>,
339+
<0 3 IRQ_TYPE_LEVEL_HIGH>;
340340
interrupt-names = "bit", "jpeg";
341341
clocks = <&clks IMX6QDL_CLK_VPU_AXI>,
342342
<&clks IMX6QDL_CLK_MMDC_CH0_AXI>,

‎arch/arm/boot/dts/ls1021a.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
scfg: scfg@1570000 {
143143
compatible = "fsl,ls1021a-scfg", "syscon";
144144
reg = <0x0 0x1570000 0x0 0x10000>;
145+
big-endian;
145146
};
146147

147148
clockgen: clocking@1ee1000 {

‎arch/arm/boot/dts/omap3-n900.dts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -700,11 +700,9 @@
700700
};
701701
};
702702

703+
/* Ethernet is on some early development boards and qemu */
703704
ethernet@gpmc {
704705
compatible = "smsc,lan91c94";
705-
706-
status = "disabled";
707-
708706
interrupt-parent = <&gpio2>;
709707
interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */
710708
reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */

‎arch/arm/boot/dts/rk3288-evb.dtsi

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,15 @@
155155
};
156156

157157
&pinctrl {
158+
pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
159+
drive-strength = <8>;
160+
};
161+
162+
pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
163+
bias-pull-up;
164+
drive-strength = <8>;
165+
};
166+
158167
backlight {
159168
bl_en: bl-en {
160169
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -173,6 +182,27 @@
173182
};
174183
};
175184

185+
sdmmc {
186+
/*
187+
* Default drive strength isn't enough to achieve even
188+
* high-speed mode on EVB board so bump up to 8ma.
189+
*/
190+
sdmmc_bus4: sdmmc-bus4 {
191+
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
192+
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
193+
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
194+
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
195+
};
196+
197+
sdmmc_clk: sdmmc-clk {
198+
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>;
199+
};
200+
201+
sdmmc_cmd: sdmmc-cmd {
202+
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
203+
};
204+
};
205+
176206
usb {
177207
host_vbus_drv: host-vbus-drv {
178208
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;

‎arch/arm/boot/dts/sama5d3xmb.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
"Headphone Jack", "HPOUTR",
177177
"IN2L", "Line In Jack",
178178
"IN2R", "Line In Jack",
179-
"MICBIAS", "IN1L",
179+
"Mic", "MICBIAS",
180180
"IN1L", "Mic";
181181

182182
atmel,ssc-controller = <&ssc0>;

‎arch/arm/boot/dts/sama5d4.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@
10081008

10091009
pit: timer@fc068630 {
10101010
compatible = "atmel,at91sam9260-pit";
1011-
reg = <0xfc068630 0xf>;
1011+
reg = <0xfc068630 0x10>;
10121012
interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;
10131013
clocks = <&h32ck>;
10141014
};

‎arch/arm/boot/dts/ste-nomadik-nhk15.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@
2525
stmpe2401_1 {
2626
stmpe2401_1_nhk_mode: stmpe2401_1_nhk {
2727
nhk_cfg1 {
28-
ste,pins = "GPIO76_B20"; // IRQ line
28+
pins = "GPIO76_B20"; // IRQ line
2929
ste,input = <0>;
3030
};
3131
nhk_cfg2 {
32-
ste,pins = "GPIO77_B8"; // reset line
32+
pins = "GPIO77_B8"; // reset line
3333
ste,output = <1>;
3434
};
3535
};
3636
};
3737
stmpe2401_2 {
3838
stmpe2401_2_nhk_mode: stmpe2401_2_nhk {
3939
nhk_cfg1 {
40-
ste,pins = "GPIO78_A8"; // IRQ line
40+
pins = "GPIO78_A8"; // IRQ line
4141
ste,input = <0>;
4242
};
4343
nhk_cfg2 {
44-
ste,pins = "GPIO79_C9"; // reset line
44+
pins = "GPIO79_C9"; // reset line
4545
ste,output = <1>;
4646
};
4747
};

‎arch/arm/configs/exynos_defconfig

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ CONFIG_DEBUG_GPIO=y
8484
CONFIG_POWER_SUPPLY=y
8585
CONFIG_BATTERY_SBS=y
8686
CONFIG_CHARGER_TPS65090=y
87-
# CONFIG_HWMON is not set
87+
CONFIG_HWMON=y
88+
CONFIG_SENSORS_LM90=y
8889
CONFIG_THERMAL=y
8990
CONFIG_EXYNOS_THERMAL=y
9091
CONFIG_EXYNOS_THERMAL_CORE=y
@@ -109,11 +110,26 @@ CONFIG_REGULATOR_S2MPA01=y
109110
CONFIG_REGULATOR_S2MPS11=y
110111
CONFIG_REGULATOR_S5M8767=y
111112
CONFIG_REGULATOR_TPS65090=y
113+
CONFIG_DRM=y
114+
CONFIG_DRM_BRIDGE=y
115+
CONFIG_DRM_PTN3460=y
116+
CONFIG_DRM_PS8622=y
117+
CONFIG_DRM_EXYNOS=y
118+
CONFIG_DRM_EXYNOS_FIMD=y
119+
CONFIG_DRM_EXYNOS_DP=y
120+
CONFIG_DRM_PANEL=y
121+
CONFIG_DRM_PANEL_SIMPLE=y
112122
CONFIG_FB=y
113123
CONFIG_FB_MODE_HELPERS=y
114124
CONFIG_FB_SIMPLE=y
115125
CONFIG_EXYNOS_VIDEO=y
116126
CONFIG_EXYNOS_MIPI_DSI=y
127+
CONFIG_BACKLIGHT_LCD_SUPPORT=y
128+
CONFIG_LCD_CLASS_DEVICE=y
129+
CONFIG_LCD_PLATFORM=y
130+
CONFIG_BACKLIGHT_CLASS_DEVICE=y
131+
CONFIG_BACKLIGHT_GENERIC=y
132+
CONFIG_BACKLIGHT_PWM=y
117133
CONFIG_FRAMEBUFFER_CONSOLE=y
118134
CONFIG_FONTS=y
119135
CONFIG_FONT_7x14=y

0 commit comments

Comments
 (0)