Skip to content

Commit 1dc0fc7

Browse files
mdrjrmdrjr
committed
Merge pull request #56 from hsnaves/odroid-3.13.y
Odroid 3.13.y
2 parents 77a7854 + 3c519d4 commit 1dc0fc7

File tree

21 files changed

+1120
-451
lines changed

21 files changed

+1120
-451
lines changed

‎arch/arm/boot/dts/exynos5410-odroidxu.dts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@
540540

541541

542542
i2s@03830000 {
543-
status = "okay";
543+
status = "okay";
544544
};
545545

546546
sound {
@@ -549,8 +549,8 @@
549549
samsung,i2s-controller = <&i2s0>;
550550
samsung,audio-codec = <&max98090>;
551551
card-name = "ODROID-I2S-98090";
552-
clocks = <&clock CLK_FOUT_EPLL>, <&clock CLK_SCLK_EPLL>, <&clock CLK_MOUT_AUDIO0>,
553-
<&clock CLK_SCLK_MAUDIO0>, <&clock_audss EXYNOS_MOUT_AUDSS>,
552+
clocks = <&clock CLK_FOUT_EPLL>, <&clock CLK_MOUT_EPLL>, <&clock CLK_MOUT_MAU_AUDIO0>,
553+
<&clock CLK_SCLK_MAU_AUDIO0>, <&clock_audss EXYNOS_MOUT_AUDSS>,
554554
<&clock_audss EXYNOS_MOUT_I2S>;
555555
clock-names = "fout_epll", "sclk_epll", "mout_audio0",
556556
"sclk_audio0", "mout_audss", "mout_i2s";

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,10 @@
322322
clock-names = "hdmi", "sclk_hdmi", "div_hdmi_pixel",
323323
"sclk_hdmiphy", "mout_hdmi";
324324
phy = <&hdmiphy>;
325+
326+
hdmi-audio {
327+
compatible = "samsung,exynos-hdmi-audio";
328+
};
325329
};
326330

327331
hdmiphy: hdmiphy@145D0000 {
@@ -386,7 +390,7 @@
386390
reg = <0x12110000 0x100>;
387391
interrupts = <0 71 0>;
388392

389-
clocks = <&clock CLK_USBH20>;
393+
clocks = <&clock CLK_USB2>;
390394
clock-names = "usbhost";
391395
};
392396

@@ -395,14 +399,14 @@
395399
reg = <0x12120000 0x100>;
396400
interrupts = <0 71 0>;
397401

398-
clocks = <&clock CLK_USBH20>;
402+
clocks = <&clock CLK_USB2>;
399403
clock-names = "usbhost";
400404
};
401405

402406
usb2_phy: usbphy@12130000 {
403407
compatible = "samsung,exynos5250-usb2phy";
404408
reg = <0x12130000 0x100>;
405-
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USBH20>;
409+
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USB2>;
406410
clock-names = "ext_xtal", "usbhost";
407411
#address-cells = <1>;
408412
#size-cells = <1>;
@@ -417,7 +421,7 @@
417421
usb3_phy0: usbphy@12100000 {
418422
compatible = "samsung,exynos5250-usb3phy";
419423
reg = <0x12100000 0x100>;
420-
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USBD300>;
424+
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USBPHY300>;
421425
clock-names = "ext_xtal", "usbdrd30";
422426
#address-cells = <1>;
423427
#size-cells = <1>;
@@ -432,7 +436,7 @@
432436
usb3_phy1: usbphy@12500000 {
433437
compatible = "samsung,exynos5250-usb3phy";
434438
reg = <0x12500000 0x100>;
435-
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USBD301>;
439+
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_USBPHY301>;
436440
clock-names = "ext_xtal", "usbdrd30";
437441
#address-cells = <1>;
438442
#size-cells = <1>;
@@ -446,7 +450,7 @@
446450

447451
usb@12000000 {
448452
compatible = "samsung,exynos5250-dwusb3";
449-
clocks = <&clock CLK_USBD300>;
453+
clocks = <&clock CLK_USBPHY300>;
450454
clock-names = "usbdrd30";
451455
#address-cells = <1>;
452456
#size-cells = <1>;
@@ -462,7 +466,7 @@
462466

463467
usb@12400000 {
464468
compatible = "samsung,exynos5250-dwusb3";
465-
clocks = <&clock CLK_USBD301>;
469+
clocks = <&clock CLK_USBPHY301>;
466470
clock-names = "usbdrd30";
467471
#address-cells = <1>;
468472
#size-cells = <1>;
@@ -573,10 +577,10 @@
573577
};
574578

575579
clock_audss: audss-clock-controller@3810000 {
576-
compatible = "samsung,exynos5250-audss-clock"; /* Is it compatible with exynos5420 or exynos5250? */
580+
compatible = "samsung,exynos5250-audss-clock";
577581
reg = <0x03810000 0x0C>;
578582
#clock-cells = <1>;
579-
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_FOUT_EPLL>, <&clock CLK_SCLK_MAUDIO0>, <&clock CLK_SCLK_MAUPCM0>;
583+
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_FOUT_EPLL>, <&clock CLK_SCLK_MAU_AUDIO0>, <&clock CLK_SCLK_MAU_PCM0>;
580584
clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in";
581585
};
582586

@@ -611,6 +615,7 @@
611615
#dma-channels = <8>;
612616
#dma-requests = <32>;
613617
};
618+
*/
614619

615620
mdma0: mdma@10800000 {
616621
compatible = "arm,pl330", "arm,primecell";
@@ -623,6 +628,7 @@
623628
#dma-requests = <1>;
624629
};
625630

631+
/*
626632
mdma1: mdma@11C10000 {
627633
compatible = "arm,pl330", "arm,primecell";
628634
reg = <0x11C10000 0x1000>;
@@ -647,9 +653,6 @@
647653
<&clock_audss EXYNOS_I2S_BUS>,
648654
<&clock_audss EXYNOS_SCLK_I2S>;
649655
clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
650-
samsung,supports-6ch;
651-
samsung,supports-rstclr;
652-
samsung,supports-secdai;
653656
samsung,idma-addr = <0x03000000>;
654657
pinctrl-names = "default";
655658
pinctrl-0 = <&i2s0_bus>;
@@ -669,6 +672,7 @@
669672
pinctrl-0 = <&i2s1_bus>;
670673
status = "disabled";
671674
};
675+
*/
672676

673677
i2s2: i2s@12D70000 {
674678
compatible = "samsung,s5pv210-i2s";
@@ -681,5 +685,5 @@
681685
pinctrl-names = "default";
682686
pinctrl-0 = <&i2s2_bus>;
683687
status = "disabled";
684-
};*/
688+
};
685689
};

‎arch/arm/configs/odroidxu_defconfig‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
109109
CONFIG_DEVTMPFS=y
110110
CONFIG_DEVTMPFS_MOUNT=y
111111
CONFIG_EXTRA_FIRMWARE="edid/1024x768.fw edid/1280x1024.fw edid/1280x720.fw edid/1920x1080.fw"
112+
# CONFIG_FW_LOADER_USER_HELPER is not set
112113
CONFIG_DMA_CMA=y
113114
CONFIG_CMA_SIZE_MBYTES=128
114115
CONFIG_CONNECTOR=y
@@ -117,6 +118,7 @@ CONFIG_BLK_DEV_LOOP=y
117118
CONFIG_BLK_DEV_RAM=y
118119
CONFIG_BLK_DEV_RAM_SIZE=65536
119120
CONFIG_SCSI=y
121+
CONFIG_BLK_DEV_SD=y
120122
CONFIG_MD=y
121123
CONFIG_BLK_DEV_DM=y
122124
CONFIG_NETDEVICES=y
@@ -203,6 +205,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
203205
CONFIG_REGULATOR_MAX77XXX=y
204206
CONFIG_REGULATOR_S2MPS11=y
205207
CONFIG_MEDIA_SUPPORT=m
208+
CONFIG_MEDIA_CAMERA_SUPPORT=y
206209
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
207210
CONFIG_MEDIA_RC_SUPPORT=y
208211
CONFIG_RC_DEVICES=y
@@ -247,6 +250,11 @@ CONFIG_DVB_USB_IT913X=m
247250
CONFIG_DVB_USB_LME2510=m
248251
CONFIG_DVB_USB_MXL111SF=m
249252
CONFIG_DVB_USB_RTL28XXU=m
253+
CONFIG_V4L_MEM2MEM_DRIVERS=y
254+
CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
255+
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
256+
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
257+
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
250258
CONFIG_DRM=y
251259
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
252260
CONFIG_DRM_EXYNOS=y
@@ -267,9 +275,12 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
267275
CONFIG_LOGO=y
268276
CONFIG_SOUND=y
269277
CONFIG_SND=y
278+
CONFIG_SND_VERBOSE_PRINTK=y
279+
CONFIG_SND_DEBUG=y
280+
CONFIG_SND_DEBUG_VERBOSE=y
270281
CONFIG_SND_SOC=y
271282
CONFIG_SND_SOC_SAMSUNG=y
272-
CONFIG_SND_SOC_SAMSUNG_HDMI_AUDIO=m
283+
CONFIG_SND_SOC_SAMSUNG_HDMI_AUDIO=y
273284
CONFIG_SND_SOC_SMDK_I2S_STUB=y
274285
CONFIG_SND_SOC_EXYNOS_MAX98095=y
275286
CONFIG_HIDRAW=y
@@ -361,6 +372,7 @@ CONFIG_STAGING=y
361372
CONFIG_R8188EU=m
362373
CONFIG_88EU_AP_MODE=y
363374
CONFIG_COMMON_CLK_DEBUG=y
375+
CONFIG_COMMON_CLK_DEBUG_EXTRA=y
364376
CONFIG_PM_DEVFREQ=y
365377
CONFIG_DEVFREQ_GOV_PERFORMANCE=y
366378
CONFIG_DEVFREQ_GOV_POWERSAVE=y

‎drivers/clk/Kconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ config COMMON_CLK_DEBUG
3333
clk_flags, clk_prepare_count, clk_enable_count &
3434
clk_notifier_count.
3535

36+
config COMMON_CLK_DEBUG_EXTRA
37+
bool "Extra features for the clock tree DebugFS"
38+
depends on COMMON_CLK_DEBUG
39+
---help---
40+
Adds one write-one file named change_rate to each
41+
directory, allowing the function clk_set_rate to
42+
be called.
43+
3644
config COMMON_CLK_WM831X
3745
tristate "Clock driver for WM831x/2x PMICs"
3846
depends on MFD_WM831X

‎drivers/clk/clk.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,16 @@ static const struct file_operations clk_dump_fops = {
226226
.release = single_release,
227227
};
228228

229+
#if CONFIG_COMMON_CLK_DEBUG_EXTRA
230+
static int debugfs_clk_set_rate(void *data, u64 val)
231+
{
232+
struct clk *clk = (struct clk *) data;
233+
return clk_set_rate(clk, (u32) val);
234+
}
235+
236+
DEFINE_SIMPLE_ATTRIBUTE(fops_clk_rate_wo, NULL, debugfs_clk_set_rate, "%llu\n");
237+
#endif /* CONFIG_COMMON_CLK_DEBUG_EXTRA */
238+
229239
/* caller must hold prepare_lock */
230240
static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry)
231241
{
@@ -248,6 +258,12 @@ static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry)
248258
if (!d)
249259
goto err_out;
250260

261+
#if CONFIG_COMMON_CLK_DEBUG_EXTRA
262+
d = debugfs_create_file("change_rate", S_IWUGO, clk->dentry, clk, &fops_clk_rate_wo);
263+
if (!d)
264+
goto err_out;
265+
#endif
266+
251267
d = debugfs_create_x32("clk_flags", S_IRUGO, clk->dentry,
252268
(u32 *)&clk->flags);
253269
if (!d)

‎drivers/clk/samsung/clk-exynos4.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,11 +1100,13 @@ static void __init exynos4_clk_init(struct device_node *np,
11001100
if (exynos4_soc == EXYNOS4210)
11011101
samsung_clk_init(np, reg_base, nr_clks,
11021102
exynos4_clk_regs, ARRAY_SIZE(exynos4_clk_regs),
1103-
exynos4210_clk_save, ARRAY_SIZE(exynos4210_clk_save));
1103+
exynos4210_clk_save, ARRAY_SIZE(exynos4210_clk_save),
1104+
NULL, NULL, NULL);
11041105
else
11051106
samsung_clk_init(np, reg_base, nr_clks,
11061107
exynos4_clk_regs, ARRAY_SIZE(exynos4_clk_regs),
1107-
exynos4x12_clk_save, ARRAY_SIZE(exynos4x12_clk_save));
1108+
exynos4x12_clk_save, ARRAY_SIZE(exynos4x12_clk_save),
1109+
NULL, NULL, NULL);
11081110

11091111
samsung_clk_of_register_fixed_ext(exynos4_fixed_rate_ext_clks,
11101112
ARRAY_SIZE(exynos4_fixed_rate_ext_clks),

‎drivers/clk/samsung/clk-exynos5250.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ static void __init exynos5250_clk_init(struct device_node *np)
563563

564564
samsung_clk_init(np, reg_base, nr_clks,
565565
exynos5250_clk_regs, ARRAY_SIZE(exynos5250_clk_regs),
566-
NULL, 0);
566+
NULL, 0, NULL, NULL, NULL);
567567
samsung_clk_of_register_fixed_ext(exynos5250_fixed_rate_ext_clks,
568568
ARRAY_SIZE(exynos5250_fixed_rate_ext_clks),
569569
ext_clk_match);

0 commit comments

Comments
 (0)