disable i2c1

hc

2024-05-11 645e752c5a84baeb21015cdc85fc05b7d16312c8

 kernel/arch/arm/boot/dts/tegra30-cardhu.dtsi
..
..
@@ -360,7 +360,7 @@
360
360
 		status = "okay";
361
361
 		spi-max-frequency = <25000000>;
362
362
 		spi-flash@1 {
363
-			compatible = "winbond,w25q32";
363
+			compatible = "winbond,w25q32", "jedec,spi-nor";
364
364
 			reg = <1>;
365
365
 			spi-max-frequency = <20000000>;
366
366
 		};
..
..
@@ -384,7 +384,7 @@
384
384
 		};
385
385
 	};
386
386
 
387
-	sdhci@78000000 {
387
+	mmc@78000000 {
388
388
 		status = "okay";
389
389
 		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
390
390
 		wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
..
..
@@ -392,7 +392,7 @@
392
392
 		bus-width = <4>;
393
393
 	};
394
394
 
395
-	sdhci@78000600 {
395
+	mmc@78000600 {
396
396
 		status = "okay";
397
397
 		bus-width = <8>;
398
398
 		non-removable;
..
..
@@ -418,21 +418,14 @@
418
418
 		default-brightness-level = <6>;
419
419
 	};
420
420
 
421
-	clocks {
422
-		compatible = "simple-bus";
423
-		#address-cells = <1>;
424
-		#size-cells = <0>;
425
-
426
-		clk32k_in: clock@0 {
427
-			compatible = "fixed-clock";
428
-			reg = <0>;
429
-			#clock-cells = <0>;
430
-			clock-frequency = <32768>;
431
-		};
421
+	clk32k_in: clock@0 {
422
+		compatible = "fixed-clock";
423
+		clock-frequency = <32768>;
424
+		#clock-cells = <0>;
432
425
 	};
433
426
 
434
427
 	panel: panel {
435
-		compatible = "chunghwa,claa101wb01", "simple-panel";
428
+		compatible = "chunghwa,claa101wb01";
436
429
 		ddc-i2c-bus = <&panelddc>;
437
430
 
438
431
 		power-supply = <&vdd_pnl1_reg>;
..
..
@@ -441,158 +434,139 @@
441
434
 		backlight = <&backlight>;
442
435
 	};
443
436
 
444
-	regulators {
445
-		compatible = "simple-bus";
446
-		#address-cells = <1>;
447
-		#size-cells = <0>;
437
+	vdd_ac_bat_reg: regulator@0 {
438
+		compatible = "regulator-fixed";
439
+		regulator-name = "vdd_ac_bat";
440
+		regulator-min-microvolt = <5000000>;
441
+		regulator-max-microvolt = <5000000>;
442
+		regulator-always-on;
443
+	};
448
444
 
449
-		vdd_ac_bat_reg: regulator@0 {
450
-			compatible = "regulator-fixed";
451
-			reg = <0>;
452
-			regulator-name = "vdd_ac_bat";
453
-			regulator-min-microvolt = <5000000>;
454
-			regulator-max-microvolt = <5000000>;
455
-			regulator-always-on;
456
-		};
445
+	cam_1v8_reg: regulator@1 {
446
+		compatible = "regulator-fixed";
447
+		regulator-name = "cam_1v8";
448
+		regulator-min-microvolt = <1800000>;
449
+		regulator-max-microvolt = <1800000>;
450
+		enable-active-high;
451
+		gpio = <&gpio TEGRA_GPIO(BB, 4) GPIO_ACTIVE_HIGH>;
452
+		vin-supply = <&vio_reg>;
453
+	};
457
454
 
458
-		cam_1v8_reg: regulator@1 {
459
-			compatible = "regulator-fixed";
460
-			reg = <1>;
461
-			regulator-name = "cam_1v8";
462
-			regulator-min-microvolt = <1800000>;
463
-			regulator-max-microvolt = <1800000>;
464
-			enable-active-high;
465
-			gpio = <&gpio TEGRA_GPIO(BB, 4) GPIO_ACTIVE_HIGH>;
466
-			vin-supply = <&vio_reg>;
467
-		};
455
+	cp_5v_reg: regulator@2 {
456
+		compatible = "regulator-fixed";
457
+		regulator-name = "cp_5v";
458
+		regulator-min-microvolt = <5000000>;
459
+		regulator-max-microvolt = <5000000>;
460
+		regulator-boot-on;
461
+		regulator-always-on;
462
+		enable-active-high;
463
+		gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
464
+	};
468
465
 
469
-		cp_5v_reg: regulator@2 {
470
-			compatible = "regulator-fixed";
471
-			reg = <2>;
472
-			regulator-name = "cp_5v";
473
-			regulator-min-microvolt = <5000000>;
474
-			regulator-max-microvolt = <5000000>;
475
-			regulator-boot-on;
476
-			regulator-always-on;
477
-			enable-active-high;
478
-			gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
479
-		};
466
+	emmc_3v3_reg: regulator@3 {
467
+		compatible = "regulator-fixed";
468
+		regulator-name = "emmc_3v3";
469
+		regulator-min-microvolt = <3300000>;
470
+		regulator-max-microvolt = <3300000>;
471
+		regulator-always-on;
472
+		regulator-boot-on;
473
+		enable-active-high;
474
+		gpio = <&gpio TEGRA_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
475
+		vin-supply = <&sys_3v3_reg>;
476
+	};
480
477
 
481
-		emmc_3v3_reg: regulator@3 {
482
-			compatible = "regulator-fixed";
483
-			reg = <3>;
484
-			regulator-name = "emmc_3v3";
485
-			regulator-min-microvolt = <3300000>;
486
-			regulator-max-microvolt = <3300000>;
487
-			regulator-always-on;
488
-			regulator-boot-on;
489
-			enable-active-high;
490
-			gpio = <&gpio TEGRA_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
491
-			vin-supply = <&sys_3v3_reg>;
492
-		};
478
+	modem_3v3_reg: regulator@4 {
479
+		compatible = "regulator-fixed";
480
+		regulator-name = "modem_3v3";
481
+		regulator-min-microvolt = <3300000>;
482
+		regulator-max-microvolt = <3300000>;
483
+		enable-active-high;
484
+		gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
485
+	};
493
486
 
494
-		modem_3v3_reg: regulator@4 {
495
-			compatible = "regulator-fixed";
496
-			reg = <4>;
497
-			regulator-name = "modem_3v3";
498
-			regulator-min-microvolt = <3300000>;
499
-			regulator-max-microvolt = <3300000>;
500
-			enable-active-high;
501
-			gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
502
-		};
487
+	pex_hvdd_3v3_reg: regulator@5 {
488
+		compatible = "regulator-fixed";
489
+		regulator-name = "pex_hvdd_3v3";
490
+		regulator-min-microvolt = <3300000>;
491
+		regulator-max-microvolt = <3300000>;
492
+		enable-active-high;
493
+		gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
494
+		vin-supply = <&sys_3v3_reg>;
495
+	};
503
496
 
504
-		pex_hvdd_3v3_reg: regulator@5 {
505
-			compatible = "regulator-fixed";
506
-			reg = <5>;
507
-			regulator-name = "pex_hvdd_3v3";
508
-			regulator-min-microvolt = <3300000>;
509
-			regulator-max-microvolt = <3300000>;
510
-			enable-active-high;
511
-			gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
512
-			vin-supply = <&sys_3v3_reg>;
513
-		};
497
+	vdd_cam1_ldo_reg: regulator@6 {
498
+		compatible = "regulator-fixed";
499
+		regulator-name = "vdd_cam1_ldo";
500
+		regulator-min-microvolt = <2800000>;
501
+		regulator-max-microvolt = <2800000>;
502
+		enable-active-high;
503
+		gpio = <&gpio TEGRA_GPIO(R, 6) GPIO_ACTIVE_HIGH>;
504
+		vin-supply = <&sys_3v3_reg>;
505
+	};
514
506
 
515
-		vdd_cam1_ldo_reg: regulator@6 {
516
-			compatible = "regulator-fixed";
517
-			reg = <6>;
518
-			regulator-name = "vdd_cam1_ldo";
519
-			regulator-min-microvolt = <2800000>;
520
-			regulator-max-microvolt = <2800000>;
521
-			enable-active-high;
522
-			gpio = <&gpio TEGRA_GPIO(R, 6) GPIO_ACTIVE_HIGH>;
523
-			vin-supply = <&sys_3v3_reg>;
524
-		};
507
+	vdd_cam2_ldo_reg: regulator@7 {
508
+		compatible = "regulator-fixed";
509
+		regulator-name = "vdd_cam2_ldo";
510
+		regulator-min-microvolt = <2800000>;
511
+		regulator-max-microvolt = <2800000>;
512
+		enable-active-high;
513
+		gpio = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
514
+		vin-supply = <&sys_3v3_reg>;
515
+	};
525
516
 
526
-		vdd_cam2_ldo_reg: regulator@7 {
527
-			compatible = "regulator-fixed";
528
-			reg = <7>;
529
-			regulator-name = "vdd_cam2_ldo";
530
-			regulator-min-microvolt = <2800000>;
531
-			regulator-max-microvolt = <2800000>;
532
-			enable-active-high;
533
-			gpio = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
534
-			vin-supply = <&sys_3v3_reg>;
535
-		};
517
+	vdd_cam3_ldo_reg: regulator@8 {
518
+		compatible = "regulator-fixed";
519
+		regulator-name = "vdd_cam3_ldo";
520
+		regulator-min-microvolt = <3300000>;
521
+		regulator-max-microvolt = <3300000>;
522
+		enable-active-high;
523
+		gpio = <&gpio TEGRA_GPIO(S, 0) GPIO_ACTIVE_HIGH>;
524
+		vin-supply = <&sys_3v3_reg>;
525
+	};
536
526
 
537
-		vdd_cam3_ldo_reg: regulator@8 {
538
-			compatible = "regulator-fixed";
539
-			reg = <8>;
540
-			regulator-name = "vdd_cam3_ldo";
541
-			regulator-min-microvolt = <3300000>;
542
-			regulator-max-microvolt = <3300000>;
543
-			enable-active-high;
544
-			gpio = <&gpio TEGRA_GPIO(S, 0) GPIO_ACTIVE_HIGH>;
545
-			vin-supply = <&sys_3v3_reg>;
546
-		};
527
+	vdd_com_reg: regulator@9 {
528
+		compatible = "regulator-fixed";
529
+		regulator-name = "vdd_com";
530
+		regulator-min-microvolt = <3300000>;
531
+		regulator-max-microvolt = <3300000>;
532
+		regulator-always-on;
533
+		regulator-boot-on;
534
+		enable-active-high;
535
+		gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
536
+		vin-supply = <&sys_3v3_reg>;
537
+	};
547
538
 
548
-		vdd_com_reg: regulator@9 {
549
-			compatible = "regulator-fixed";
550
-			reg = <9>;
551
-			regulator-name = "vdd_com";
552
-			regulator-min-microvolt = <3300000>;
553
-			regulator-max-microvolt = <3300000>;
554
-			regulator-always-on;
555
-			regulator-boot-on;
556
-			enable-active-high;
557
-			gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
558
-			vin-supply = <&sys_3v3_reg>;
559
-		};
539
+	vdd_fuse_3v3_reg: regulator@10 {
540
+		compatible = "regulator-fixed";
541
+		regulator-name = "vdd_fuse_3v3";
542
+		regulator-min-microvolt = <3300000>;
543
+		regulator-max-microvolt = <3300000>;
544
+		enable-active-high;
545
+		gpio = <&gpio TEGRA_GPIO(L, 6) GPIO_ACTIVE_HIGH>;
546
+		vin-supply = <&sys_3v3_reg>;
547
+	};
560
548
 
561
-		vdd_fuse_3v3_reg: regulator@10 {
562
-			compatible = "regulator-fixed";
563
-			reg = <10>;
564
-			regulator-name = "vdd_fuse_3v3";
565
-			regulator-min-microvolt = <3300000>;
566
-			regulator-max-microvolt = <3300000>;
567
-			enable-active-high;
568
-			gpio = <&gpio TEGRA_GPIO(L, 6) GPIO_ACTIVE_HIGH>;
569
-			vin-supply = <&sys_3v3_reg>;
570
-		};
549
+	vdd_pnl1_reg: regulator@11 {
550
+		compatible = "regulator-fixed";
551
+		regulator-name = "vdd_pnl1";
552
+		regulator-min-microvolt = <3300000>;
553
+		regulator-max-microvolt = <3300000>;
554
+		regulator-always-on;
555
+		regulator-boot-on;
556
+		enable-active-high;
557
+		gpio = <&gpio TEGRA_GPIO(L, 4) GPIO_ACTIVE_HIGH>;
558
+		vin-supply = <&sys_3v3_reg>;
559
+	};
571
560
 
572
-		vdd_pnl1_reg: regulator@11 {
573
-			compatible = "regulator-fixed";
574
-			reg = <11>;
575
-			regulator-name = "vdd_pnl1";
576
-			regulator-min-microvolt = <3300000>;
577
-			regulator-max-microvolt = <3300000>;
578
-			regulator-always-on;
579
-			regulator-boot-on;
580
-			enable-active-high;
581
-			gpio = <&gpio TEGRA_GPIO(L, 4) GPIO_ACTIVE_HIGH>;
582
-			vin-supply = <&sys_3v3_reg>;
583
-		};
584
-
585
-		vdd_vid_reg: regulator@12 {
586
-			compatible = "regulator-fixed";
587
-			reg = <12>;
588
-			regulator-name = "vddio_vid";
589
-			regulator-min-microvolt = <5000000>;
590
-			regulator-max-microvolt = <5000000>;
591
-			enable-active-high;
592
-			gpio = <&gpio TEGRA_GPIO(T, 0) GPIO_ACTIVE_HIGH>;
593
-			gpio-open-drain;
594
-			vin-supply = <&vdd_5v0_reg>;
595
-		};
561
+	vdd_vid_reg: regulator@12 {
562
+		compatible = "regulator-fixed";
563
+		regulator-name = "vddio_vid";
564
+		regulator-min-microvolt = <5000000>;
565
+		regulator-max-microvolt = <5000000>;
566
+		enable-active-high;
567
+		gpio = <&gpio TEGRA_GPIO(T, 0) GPIO_ACTIVE_HIGH>;
568
+		gpio-open-drain;
569
+		vin-supply = <&vdd_5v0_reg>;
596
570
 	};
597
571
 
598
572
 	sound {
..
..
@@ -615,12 +589,18 @@
615
589
 
616
590
 		nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
617
591
 		nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
618
-			GPIO_ACTIVE_HIGH>;
592
+			GPIO_ACTIVE_LOW>;
619
593
 
620
594
 		clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
621
595
 			 <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
622
-			 <&tegra_car TEGRA30_CLK_EXTERN1>;
596
+			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
623
597
 		clock-names = "pll_a", "pll_a_out0", "mclk";
598
+
599
+		assigned-clocks = <&tegra_car TEGRA30_CLK_EXTERN1>,
600
+				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
601
+
602
+		assigned-clock-parents = <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
603
+					 <&tegra_car TEGRA30_CLK_EXTERN1>;
624
604
 	};
625
605
 
626
606
 	gpio-keys {